1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

doc: fix some Texinfo warnings.

* doc/gpg.texi: Fix syntax and add missing menu entries.
* doc/gpgsm.texi: Fix subsectioning.
--

These five patches fix some warnings from Texinfo 5 by adding some
missing nodes and changing some sections to subsections, and moving an
'@end ifset' to the start of a line.  I also noticed the 'Deprecated
options' subsection didn't appear in the GPG options menu, so I added
it.  (Texinfo never warned about it because it was after the last node
in the menu.)

1) doc/gpg.texi: move '@end ifset' to start of line
2) doc/gpg.texi: Add missing node for 'Compliance options' section.
3) doc/gpg.texi: add node for 'Deprecated options' subsection.
4) doc/gpg.texi: make 'Unattended key generation' a subsection
5) doc/gpgsm.texi: fix subsectioning for Unattended Usage

(all 5 merged into one patch by wk)

(cherry picked from commit 4d67f59a336bfa0ff19fc23209940724196fd886)

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Ian Abbott 2013-04-25 12:00:16 +01:00 committed by Werner Koch
parent 151b78cc26
commit 2c3fc4719b
2 changed files with 12 additions and 8 deletions

View File

@ -926,7 +926,9 @@ behaviour and to change the default configuration.
* GPG Key related Options:: Key related options. * GPG Key related Options:: Key related options.
* GPG Input and Output:: Input and Output. * GPG Input and Output:: Input and Output.
* OpenPGP Options:: OpenPGP protocol specific options. * OpenPGP Options:: OpenPGP protocol specific options.
* Compliance Options:: Compliance options.
* GPG Esoteric Options:: Doing things one usually don't want to do. * GPG Esoteric Options:: Doing things one usually don't want to do.
* Deprecated Options:: Deprecated options.
@end menu @end menu
Long options can be put in an options file (default Long options can be put in an options file (default
@ -2183,6 +2185,7 @@ meaningful if @option{--s2k-mode} is 3.
@c *************************** @c ***************************
@c ******* Compliance ******** @c ******* Compliance ********
@c *************************** @c ***************************
@node Compliance Options
@subsection Compliance options @subsection Compliance options
These options control what GnuPG is compliant to. Only one of these These options control what GnuPG is compliant to. Only one of these
@ -2845,6 +2848,7 @@ on the configuration file.
@c ******************************* @c *******************************
@c ******* Deprecated ************ @c ******* Deprecated ************
@c ******************************* @c *******************************
@node Deprecated Options
@subsection Deprecated options @subsection Deprecated options
@table @gnupgtabopt @table @gnupgtabopt
@ -2990,9 +2994,9 @@ Operation is further controlled by a few environment variables:
@item GPG_AGENT_INFO @item GPG_AGENT_INFO
Used to locate the gpg-agent. Used to locate the gpg-agent.
@ifset gpgone @ifset gpgone
This is only honored when @option{--use-agent} is set. This is only honored when @option{--use-agent} is set.
@end ifset @end ifset
The value consists of 3 colon delimited fields: The first is the path The value consists of 3 colon delimited fields: The first is the path
to the Unix Domain Socket, the second the PID of the gpg-agent and the to the Unix Domain Socket, the second the PID of the gpg-agent and the
protocol version which should be set to 1. When starting the gpg-agent protocol version which should be set to 1. When starting the gpg-agent
@ -3167,8 +3171,8 @@ are almost always required for this.
@end menu @end menu
@node Unattended GPG key generation,,,Unattended Usage of GPG @node Unattended GPG key generation
@section Unattended key generation @subsection Unattended key generation
The command @option{--gen-key} may be used along with the option The command @option{--gen-key} may be used along with the option
@option{--batch} for unattended key generation. The parameters are @option{--batch} for unattended key generation. The parameters are

View File

@ -916,8 +916,8 @@ but may also be used in the standard operation mode by using the
* CSR and certificate creation:: CSR and certificate creation. * CSR and certificate creation:: CSR and certificate creation.
@end menu @end menu
@node Automated signature checking,,,Unattended Usage @node Automated signature checking
@section Automated signature checking @subsection Automated signature checking
It is very important to understand the semantics used with signature It is very important to understand the semantics used with signature
verification. Checking a signature is not as simple as it may sound and verification. Checking a signature is not as simple as it may sound and
@ -960,8 +960,8 @@ this is a missing certificate.
@end table @end table
@node CSR and certificate creation,,,Unattended Usage @node CSR and certificate creation
@section CSR and certificate creation @subsection CSR and certificate creation
@ifclear gpgtwoone @ifclear gpgtwoone
@strong{Please notice}: The immediate creation of certificates is only @strong{Please notice}: The immediate creation of certificates is only