diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 6 | ||||
| -rw-r--r-- | doc/gnupg.texi | 2 | ||||
| -rw-r--r-- | doc/gpg-card.texi (renamed from doc/card-tool.texi) | 20 |
3 files changed, 14 insertions, 14 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 19b3825b1..0720dd366 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -69,7 +69,7 @@ nobase_dist_doc_DATA = FAQ DETAILS HACKING DCO TRANSLATE OpenPGP KEYSERVER \ gnupg_TEXINFOS = \ gpg.texi gpgsm.texi gpg-agent.texi scdaemon.texi instguide.texi \ tools.texi debugging.texi glossary.texi contrib.texi gpl.texi \ - sysnotes.texi dirmngr.texi wks.texi card-tool.texi \ + sysnotes.texi dirmngr.texi wks.texi gpg-card.texi \ gnupg-module-overview.svg \ gnupg-card-architecture.fig \ howtos.texi howto-create-a-server-cert.texi @@ -90,12 +90,12 @@ YAT2M_OPTIONS = -I $(srcdir) \ myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \ dirmngr.texi scdaemon.texi tools.texi wks.texi \ - card-tool.texi + gpg-card.texi myman_pages = gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \ watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \ gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 gpgtar.1 \ applygnupgdefaults.8 gpg-wks-client.1 gpg-wks-server.1 \ - dirmngr-client.1 gpg-card-tool.1 + dirmngr-client.1 gpg-card.1 if USE_GPG2_HACK myman_pages += gpg2.1 gpgv2.1 else diff --git a/doc/gnupg.texi b/doc/gnupg.texi index 6210486a0..78d4669da 100644 --- a/doc/gnupg.texi +++ b/doc/gnupg.texi @@ -187,7 +187,7 @@ the administration and the architecture. @cindex trust values @include trust-values.texi -@include card-tool.texi +@include gpg-card.texi @include tools.texi @include wks.texi diff --git a/doc/card-tool.texi b/doc/gpg-card.texi index b84f20721..92bc12362 100644 --- a/doc/card-tool.texi +++ b/doc/gpg-card.texi @@ -13,26 +13,26 @@ tool is an extension of the @option{--edit-key} command available with @command{gpg}. @menu -* gpg-card-tool:: Administrate smart cards. +* gpg-card:: Administrate smart cards. @end menu @c @c GPG-CARD-TOOL @c -@manpage gpg-card-tool.1 -@node gpg-card-tool +@manpage gpg-card.1 +@node gpg-card @section Administrate smart cards. @ifset manverb -.B gpg-card-tool +.B gpg-card \- Administrate Smart Cards @end ifset @mansect synopsis @ifset manverb -.B gpg-card-tool +.B gpg-card .RI [ options ] .br -.B gpg-card-tool +.B gpg-card .RI [ options ] .I command .RI { @@ -42,16 +42,16 @@ tool is an extension of the @option{--edit-key} command available with @end ifset @mansect description -The @command{gpg-card-tool} is used to administrate smart cards and USB +The @command{gpg-card} is used to administrate smart cards and USB tokens. It provides a superset of features from @command{gpg --card-edit} an can be considered a frontend to @command{scdaemon} which is a daemon started by @command{gpg-agent} to handle smart cards. -If @command{gpg-card-tool} is invoked without commands an interactive +If @command{gpg-card} is invoked without commands an interactive mode is used. -If @command{gpg-card-tool} is invoked with one or more commands the +If @command{gpg-card} is invoked with one or more commands the same commands as available in the interactive mode are run from the command line. These commands need to be delimited with a double-dash. If a double-dash or a shell specific character is required as part of @@ -66,7 +66,7 @@ COMMAND}. @mansect options @noindent -@command{gpg-card-tool} understands these options: +@command{gpg-card} understands these options: @table @gnupgtabopt |