1 files changed, 22 insertions, 5 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 80c7f48f5..fe9e0bfbe 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -198,7 +198,7 @@ Make a detached signature.
 @opindex encrypt
 Encrypt data to one or more public keys. This command may be combined
 with @option{--sign} (to sign and encrypt a message),
-@option{--symmetric} (to encrypt a message that can decrypted using a
+@option{--symmetric} (to encrypt a message that can be decrypted using a
 secret key or a passphrase), or @option{--sign} and
 @option{--symmetric} together (for a signed message that can be
 decrypted using a secret key or a passphrase).  @option{--recipient}
@@ -683,6 +683,15 @@ supplied passphrase is used for the new key and the agent does not ask
 for it.  To create a key without any protection @code{--passphrase ''}
 may be used.
 
+To create an OpenPGP key from the keys available on the currently
+inserted smartcard, the special string ``card'' can be used for
+@var{algo}.  If the card features an encryption and a signing key, gpg
+will figure them out and creates an OpenPGP key consisting of the
+usual primary key and one subkey.  This works only with certain
+smartcards.  Note that the interactive @option{--full-gen-key} command
+allows to do the same but with greater flexibility in the selection of
+the smartcard keys.
+
 Note that it is possible to create a primary key and a subkey using
 non-default algorithms by using ``default'' and changing the default
 parameters using the option @option{--default-new-key-algo}.
@@ -1091,7 +1100,7 @@ Directly sign a key from the passphrase without any further user
 interaction.  The @var{fpr} must be the verified primary fingerprint
 of a key in the local keyring. If no @var{names} are given, all
 useful user ids are signed; with given [@var{names}] only useful user
-ids matching one of theses names are signed.  By default, or if a name
+ids matching one of these names are signed.  By default, or if a name
 is prefixed with a '*', a case insensitive substring match is used.
 If a name is prefixed with a '=' a case sensitive exact match is done.
 
@@ -2885,10 +2894,11 @@ however carefully selected to best aid in debugging.
 
 @item --debug @var{flags}
 @opindex debug
-Set debugging flags. All flags are or-ed and @var{flags} may be given
+Set debug flags.  All flags are or-ed and @var{flags} may be given
 in C syntax (e.g. 0x0042) or as a comma separated list of flag names.
 To get a list of all supported flags the single word "help" can be
-used.
+used. This option is only useful for debugging and the behavior may
+change at any time without notice.
 
 @item --debug-all
 @opindex debug-all
@@ -3516,6 +3526,13 @@ file and returns with failure if the configuration file would prevent
 @command{@gpgname} from startup.  Thus it may be used to run a syntax check
 on the configuration file.
 
+@c @item --use-only-openpgp-card
+@c @opindex use-only-openpgp-card
+@c Only access OpenPGP card's and no other cards.  This is a hidden
+@c option which could be used in case an old use case required the
+@c OpenPGP card while several cards are avaiable.  This option might be
+@c removed if it turns out that nobody requires it.
+
 @end table
 
 @c *******************************
@@ -3655,7 +3672,7 @@ files; They all live in the current home directory (@pxref{option
   certificates.  The file name corresponds to the OpenPGP fingerprint of
   the respective key.  It is suggested to backup those certificates and
   if the primary private key is not stored on the disk to move them to
-  an external storage device.  Anyone who can access theses files is
+  an external storage device.  Anyone who can access these files is
   able to revoke the corresponding key.  You may want to print them out.
   You should backup all files in this directory and take care to keep
   this backup closed away.