summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-07-06 11:11:10 +0000
committerintrigeri <intrigeri@boum.org>2015-07-06 11:11:10 +0000
commit73de1c94f798e4cf680162f141483a781e17042d (patch)
tree43b210f270de3d9c18e3019d7e7d75d49d2e8f70
parent6ac3858c70dfcfff3ec48255b1f7bf86763e8efb (diff)
parentd8e5f24139e6c5fce174173be7acc69f2b3c6509 (diff)
Merge branch 'master' into feature/jessietails-installer_4.0
-rw-r--r--AUTHORS1
-rwxr-xr-xliveusb-creator2
2 files changed, 2 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 9e4aef3..594d7f8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,6 +3,7 @@ Developers
Luke Macken <lmacken@redhat.com> (liveusb modules, PyQt interface, etc)
Kushal Das <kushal@fedoraproject.org> (Initial PyQt interface)
Kevin Kofler <kkofler@fedoraproject.org> (KDE integration)
+Tails Developers <tails@boum.org> (Tails installer)
Translators
===========
diff --git a/liveusb-creator b/liveusb-creator
index 24cd2cd..600feb8 100755
--- a/liveusb-creator
+++ b/liveusb-creator
@@ -55,7 +55,7 @@ def parse_args():
help='Calculate the SHA1 of the device')
parser.add_option('-L', '--liveos-checksum', dest='liveos_checksum',
action='store_true', default=False,
- help='Calculate the SHA1 of the device')
+ help='Calculate the SHA1 of the Live OS')
parser.add_option('-H', '--hash', dest='hash',
action='store', metavar='HASH', default='sha1',
help='Use a specific checksum algorithm (default: sha1)')