Preparing 1.9.17V1-9-17

1 files changed, 11 insertions, 30 deletions

diff --git a/README b/README
index 7bb83f1f2..28637c1fb 100644
--- a/README
+++ b/README
@@ -3,16 +3,17 @@
                        Version 1.9.x
 
 
-GnuPG 1.9 is the future version of GnuPG; it is based on the gnupg-1.3
+GnuPG 1.9 is the future version of GnuPG; it is based on some gnupg-1.3
 code and the previous newpg package.  It will eventually lead to a
-GnuPG 2.0 release.  Note that GnuPG 1.3 and 1.9 are not always in sync
-and thus features and bug fixes done in 1.3 are not necessary
+GnuPG 2.0 release.  Note that GnuPG 1.4 and 1.9 are not always in sync
+and thus features and bug fixes done in 1.4 are not necessary
 available in 1.9.
 
 You should use this GnuPG version if you want to use the gpg-agent or
 gpgsm (the S/MIME variant of gpg).  Note that the gpg-agent is also
-helpful when using the standard gpg versions (1.3.x as well as some of
-the old 1.2.x).
+helpful when using the standard gpg versions (1.4.x as well as some of
+the old 1.2.x).  There are no problems installing 1.4 and 1.9
+alongside; in act we suggest to do this.
 
 
 BUILD INSTRUCTIONS
@@ -64,6 +65,9 @@ and options given below.  See also the section `SMARTCARD INTRO'.
 COMMANDS
 ========
 
+See the info documentation ("info gnupg") for a full list of commands
+and options.
+
 gpgsm:
 ------
 
@@ -79,25 +83,6 @@ gpgsm:
    prepended before each block.
 
 
-gpg2: (Note that these card commands are also available with gpg 1.3.x)
------
-
---card-status
-
-   Show information pertaining smartcards implementing the OpenPGP
-   application.
-
---change-pin
-
-   Offers a menu to change the PIN of OpenPGP smartcards and to reset
-   the retry counters.
-
---card-edit
-
-   Offers a menu to change any data object on the card and to generate
-   the keys. 
-
-
 OPTIONS
 =======
 
@@ -480,10 +465,8 @@ SMARTCARD INTRO
 ===============
 
 GPG, the OpenPGP part of GnuPG, supports the OpenPGP smartcard
-(surprise!); see http://g10code.com/p-card.html.
-
-[Fixme: We need to explain this further]
-
+(surprise!); see http://g10code.com/p-card.html and
+http://www.gnupg.org/documentation/howtos.html#GnuPG-cardHOWTO .
 
 GPGSM, the CMS (S/MIME) part of GnuPG, supports two kinds of
 smartcards.  The most flexible way is to use PKCS#15 compliant cards,
@@ -512,8 +495,6 @@ For selecting the driver, see the options of scdaemon.  A useful
 debugging flag is "--debug 2048" showing the communication between
 scdaemon and the reader.
 
-[fixme: write more stuff]
-