aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2012-04-10 20:37:56 +0000
committernils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2012-04-10 20:37:56 +0000
commitffd051efef48b318e56425340054409d66fb425d (patch)
tree095ecfe9d192e8869a8c69d4a58248a9eedb586b
parentmerge with 0.3.2 (diff)
downloadgpg4usb-ffd051efef48b318e56425340054409d66fb425d.tar.gz
gpg4usb-ffd051efef48b318e56425340054409d66fb425d.zip
updated README
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@881 34ebc366-c3a9-4b3c-9f84-69acf7962910
-rw-r--r--README15
-rw-r--r--release/README4
2 files changed, 9 insertions, 10 deletions
diff --git a/README b/README
index 9cce610..ac1ed34 100644
--- a/README
+++ b/README
@@ -19,16 +19,11 @@ For retrieving the source checkout http://cpunk.de/svn/src/ .
HOWTO USE
---------
-1. Unzip gpg4usblib.zip on your usb-stick.
+1. Unzip gpg4usb.zip on your usb-stick.
2. start programm with start_windows.exe or start_linux (depending on your os)
3. import your private key and some public keys
4. enjoy portable encryption ;-)
-UPDATING FROM OLDER VERSION
----------------------------
-You can continue using your already imported Keys by overwriting the directory
-keydb from the new version with the directory keydb of your old copy.
-
CONTACT
-------
If you have any questions and/or suggestions contact us at
@@ -38,9 +33,9 @@ Our homepage is located at http://gpg4usb.cpunk.de .
LICENSES
--------
-gpg4usblib itself is licensed under the GPL (see COPYING).
+gpg4usb itself is licensed under the GPLv3 (see COPYING).
-There are some libries and the gpg-binary included in the zip-file / a static
+There are some libraries and the gpg-binary included in the zip-file / a static
gpg-build which (may) have different licenses, for more information check
their homepages. You can also obtain the sources from there.
@@ -48,3 +43,7 @@ GPG: http://gnupg.org/
QT: http://trolltech.no/ , http://trolltech.no/downloads/opensource
Iconset used is Nuvola (http://icon-king.com/?p=15), which has a LGPL License
+
+The key image in the wizard (keys12.jpg) is a croped version of
+http://www.flickr.com/photos/laureenp/6141822934/, which is licensed cc by-nc-sa.
+Our derived work is also cc by-nc-sa
diff --git a/release/README b/release/README
index 7b14c80..ac1ed34 100644
--- a/release/README
+++ b/release/README
@@ -19,7 +19,7 @@ For retrieving the source checkout http://cpunk.de/svn/src/ .
HOWTO USE
---------
-1. Unzip gpg4usblib.zip on your usb-stick.
+1. Unzip gpg4usb.zip on your usb-stick.
2. start programm with start_windows.exe or start_linux (depending on your os)
3. import your private key and some public keys
4. enjoy portable encryption ;-)
@@ -35,7 +35,7 @@ LICENSES
--------
gpg4usb itself is licensed under the GPLv3 (see COPYING).
-There are some libries and the gpg-binary included in the zip-file / a static
+There are some libraries and the gpg-binary included in the zip-file / a static
gpg-build which (may) have different licenses, for more information check
their homepages. You can also obtain the sources from there.