[git] GnuPG - branch, master, updated. gnupg-2.2.7-354-g6c581cc
by Werner Koch
cvs at cvs.gnupg.org
Wed Feb 6 10:37:09 CET 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 6c581cc468d7a1b860632b7a465d71224c6e4999 (commit)
from e9e876cb5572670322aa1d3462d64c75c03974d9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6c581cc468d7a1b860632b7a465d71224c6e4999
Author: Werner Koch <wk at gnupg.org>
Date: Wed Feb 6 10:37:03 2019 +0100
doc: Add basic man page for the gpg-card-tool.
--
diff --git a/doc/Makefile.am b/doc/Makefile.am
index cb69cd9..19b3825 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 \
+ sysnotes.texi dirmngr.texi wks.texi card-tool.texi \
gnupg-module-overview.svg \
gnupg-card-architecture.fig \
howtos.texi howto-create-a-server-cert.texi
@@ -89,12 +89,13 @@ YAT2M_OPTIONS = -I $(srcdir) \
--release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.2"
myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \
- dirmngr.texi scdaemon.texi tools.texi wks.texi
+ dirmngr.texi scdaemon.texi tools.texi wks.texi \
+ card-tool.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
+ dirmngr-client.1 gpg-card-tool.1
if USE_GPG2_HACK
myman_pages += gpg2.1 gpgv2.1
else
diff --git a/doc/card-tool.texi b/doc/card-tool.texi
new file mode 100644
index 0000000..b84f207
--- /dev/null
+++ b/doc/card-tool.texi
@@ -0,0 +1,126 @@
+ at c card-tool.texi - man page for gpg-card-tool
+ at c Copyright (C) 2019 g10 Code GmbH
+ at c This is part of the GnuPG manual.
+ at c For copying conditions, see the file GnuPG.texi.
+
+ at include defs.inc
+
+ at node Smart Card Tool
+ at chapter Smart Card Tool
+
+GnuPG comes with tool to administrate smart cards and USB tokens. This
+tool is an extension of the @option{--edit-key} command available with
+ at command{gpg}.
+
+ at menu
+* gpg-card-tool:: Administrate smart cards.
+ at end menu
+
+ at c
+ at c GPG-CARD-TOOL
+ at c
+ at manpage gpg-card-tool.1
+ at node gpg-card-tool
+ at section Administrate smart cards.
+ at ifset manverb
+.B gpg-card-tool
+\- Administrate Smart Cards
+ at end ifset
+
+ at mansect synopsis
+ at ifset manverb
+.B gpg-card-tool
+.RI [ options ]
+.br
+.B gpg-card-tool
+.RI [ options ]
+.I command
+.RI {
+.B --
+.I command
+.RI }
+ at end ifset
+
+ at mansect description
+The @command{gpg-card-tool} 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
+mode is used.
+
+If @command{gpg-card-tool} 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
+a command the entire command needs to be put in quotes. If one of
+those commands returns an error the remaining commands are mot anymore
+run unless the command was prefixed with a single dash.
+
+A list of commands is available by using the command @code{help} and a
+detailed description of each command is printed by using @code{help
+COMMAND}.
+
+
+ at mansect options
+ at noindent
+ at command{gpg-card-tool} understands these options:
+
+ at table @gnupgtabopt
+
+ at item --with-colons
+ at opindex with-colons
+This option has currently no effect.
+
+ at item --status-fd @var{n}
+ at opindex status-fd
+Write special status strings to the file descriptor @var{n}. This
+program returns only the status messages SUCCESS or FAILURE which are
+helpful when the caller uses a double fork approach and can't easily
+get the return code of the process.
+
+ at item --verbose
+ at opindex verbose
+Enable extra informational output.
+
+ at item --quiet
+ at opindex quiet
+Disable almost all informational output.
+
+ at item --version
+ at opindex version
+Print version of the program and exit.
+
+ at item --help
+ at opindex help
+Display a brief help page and exit.
+
+ at item --no-autostart
+ at opindex no-autostart
+Do not start the gpg-agent if it has not yet been started and its
+service is required. This option is mostly useful on machines where
+the connection to gpg-agent has been redirected to another machines.
+
+ at item --agent-program @var{file}
+ at opindex agent-program
+Specify the agent program to be started if none is running. The
+default value is determined by running @command{gpgconf} with the
+option @option{--list-dirs}.
+
+ at item --gpg-program @var{file}
+ at opindex gpg-program
+Specify a non-default gpg binary to be used by certain commands.
+
+ at item --gpgsm-program @var{file}
+ at opindex gpgsm-program
+Specify a non-default gpgsm binary to be used by certain commands.
+
+ at end table
+
+
+ at mansect see also
+ at ifset isman
+ at command{scdaemon}(1)
+ at end ifset
diff --git a/doc/gnupg.texi b/doc/gnupg.texi
index 3364148..6210486 100644
--- a/doc/gnupg.texi
+++ b/doc/gnupg.texi
@@ -142,15 +142,16 @@ the administration and the architecture.
* Specify a User ID:: How to Specify a User Id.
* Trust Values:: How GnuPG displays trust values.
-* Helper Tools:: Description of small helper tools
-* Web Key Service:: Tools for the Web Key Service
+* Smart Card Tool:: Tool to administrate smart cards.
+* Helper Tools:: Description of small helper tools.
+* Web Key Service:: Tools for the Web Key Service.
* Howtos:: How to do certain things.
* System Notes:: Notes pertaining to certain OSes.
-* Debugging:: How to solve problems
+* Debugging:: How to solve problems.
* Copying:: GNU General Public License says
- how you can copy and share GnuPG
+ how you can copy and share GnuPG.
* Contributors:: People who have contributed to GnuPG.
* Glossary:: Short description of terms used.
@@ -186,6 +187,7 @@ the administration and the architecture.
@cindex trust values
@include trust-values.texi
+ at include card-tool.texi
@include tools.texi
@include wks.texi
@@ -237,5 +239,3 @@ the administration and the architecture.
@bye
-
-
-----------------------------------------------------------------------
Summary of changes:
doc/Makefile.am | 7 +--
doc/card-tool.texi | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++
doc/gnupg.texi | 12 ++---
3 files changed, 136 insertions(+), 9 deletions(-)
create mode 100644 doc/card-tool.texi
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list