1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-31 11:41:32 +01:00

Type fixes and @samp{} fix. From gnupg-2.

This commit is contained in:
Werner Koch 2007-12-12 18:55:52 +00:00
parent 81685cc799
commit 556cb2d0c3
4 changed files with 23 additions and 14 deletions

View File

@ -1,3 +1,8 @@
2007-12-12 Werner Koch <wk@g10code.com>
* gpg.texi, specify-user-id.texi: Update from gnupg-2.
* yat2m.c: Update from gnupg-2.
2007-10-27 David Shaw <dshaw@jabberwocky.com>
* gpg.texi: Update from gnupg-2.

View File

@ -113,7 +113,7 @@ Developer information:
@node GPG Commands
@section Commands
Commands are not distinguished from options execpt for the fact that
Commands are not distinguished from options except for the fact that
only one command is allowed.
@command{@gpgname} may be run with no commands, in which case it will
@ -876,7 +876,7 @@ encountered, you can explicitly stop parsing by using the special option
@node GPG Configuration Options
@subsection How to change the configuration
These options are used to change the configuraton and are usually found
These options are used to change the configuration and are usually found
in the option file.
@table @gnupgtabopt
@ -2456,13 +2456,13 @@ listed. @option{--list-config} is only usable with
@item --gpgconf-list
@opindex gpgconf-list
This command is simliar to @option{--list-config} but in general only
This command is similar to @option{--list-config} but in general only
internally used by the @command{gpgconf} tool.
@item --gpgconf-test
@opindex gpgconf-test
This is more or less dummy action. However it parses the configuration
file and returns with failure if the configuraion file would prevent
file and returns with failure if the configuration file would prevent
@command{gpg} from startup. Thus it may be used to run a syntax check
on the configuration file.
@ -2560,7 +2560,7 @@ For existing users the a small
helper script is provided to create these files (@pxref{addgnupghome}).
@end ifclear
For internal purposes @command{@gpgname} creates and maintaines a few other
For internal purposes @command{@gpgname} creates and maintains a few other
files; They all live in in the current home directory (@pxref{option
--homedir}). Only the @command{@gpgname} may modify these files.
@ -2617,6 +2617,10 @@ protocol version which should be set to 1. When starting the gpg-agent
as described in its documentation, this variable is set to the correct
value. The option @option{--gpg-agent-info} can be used to override it.
@item PINENTRY_USER_DATA
This value is passed via gpg-agent to pinentry. It is useful to convey
extra information to a custom pinentry
@item COLUMNS
@itemx LINES
Used to size some displays to the full size of the screen.
@ -2682,7 +2686,7 @@ user for the filename.
@include specify-user-id.texi
@end ifset
@mansect return vaue
@mansect return value
@chapheading RETURN VALUE
The program returns 0 if everything was fine, 1 if at least

View File

@ -12,8 +12,8 @@ This format is deduced from the length of the string and its content or
of its SHA-1 fingerprint. The use of key Ids is just a shortcut, for
all automated processing the fingerprint should be used.
When using @command{gpg} an exclamation mark may be appended to force
using the specified primary or secondary key and not to try and
When using @command{gpg} an exclamation mark (!) may be appended to
force using the specified primary or secondary key and not to try and
calculate which primary or secondary key to use.
The last four lines of the example give the key ID in their long form as
@ -42,8 +42,8 @@ the @code{0x} prefix. Note, that only the 20 byte version fingerprint
is available with @command{gpgsm} (i.e. the SHA-1 hash of the
certificate).
When using @command{gpg} an exclamation mark may be appended to force
using the specified primary or secondary key and not to try and
When using @command{gpg} an exclamation mark (!) may be appended to
force using the specified primary or secondary key and not to try and
calculate which primary or secondary key to use.
The best way to specify a key Id is by using the fingerprint. This
@ -121,8 +121,8 @@ This should return the Root cert of the issuer. See note above.
@item By exact match on serial number and issuer's DN.
This is indicated by a hash mark, followed by the hexadecmal
representation of the serial number, the followed by a slash and the
This is indicated by a hash mark, followed by the hexadecimal
representation of the serial number, then followed by a slash and the
RFC-2253 encoded DN of the issuer. See note above.
@cartouche

View File

@ -449,7 +449,7 @@ proc_texi_cmd (FILE *fp, const char *command, const char *rest, size_t len,
{ "code", 0, "\\fB", "\\fR" },
{ "sc", 0, "\\fB", "\\fR" },
{ "var", 0, "\\fI", "\\fR" },
{ "samp", 0, "\n'", "'\n" },
{ "samp", 0, "'", "'" },
{ "file", 0, "`\\fI","\\fR'" },
{ "env", 0, "`\\fI","\\fR'" },
{ "acronym", 0 },
@ -753,7 +753,7 @@ static void
finish_page (void)
{
FILE *fp;
section_buffer_t sect;
section_buffer_t sect = NULL;
int idx;
const char *s;
int i;