[svn] GnuPG - r4655 - branches/STABLE-BRANCH-1-4/doc
svn author wk
cvs at cvs.gnupg.org
Wed Dec 12 19:55:53 CET 2007
Author: wk
Date: 2007-12-12 19:55:52 +0100 (Wed, 12 Dec 2007)
New Revision: 4655
Modified:
branches/STABLE-BRANCH-1-4/doc/ChangeLog
branches/STABLE-BRANCH-1-4/doc/gpg.texi
branches/STABLE-BRANCH-1-4/doc/specify-user-id.texi
branches/STABLE-BRANCH-1-4/doc/yat2m.c
Log:
Type fixes and @samp{} fix. From gnupg-2.
Modified: branches/STABLE-BRANCH-1-4/doc/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/doc/ChangeLog 2007-12-12 18:26:25 UTC (rev 4654)
+++ branches/STABLE-BRANCH-1-4/doc/ChangeLog 2007-12-12 18:55:52 UTC (rev 4655)
@@ -1,3 +1,8 @@
+2007-12-12 Werner Koch <wk at g10code.com>
+
+ * gpg.texi, specify-user-id.texi: Update from gnupg-2.
+ * yat2m.c: Update from gnupg-2.
+
2007-10-27 David Shaw <dshaw at jabberwocky.com>
* gpg.texi: Update from gnupg-2.
Modified: branches/STABLE-BRANCH-1-4/doc/gpg.texi
===================================================================
--- branches/STABLE-BRANCH-1-4/doc/gpg.texi 2007-12-12 18:26:25 UTC (rev 4654)
+++ branches/STABLE-BRANCH-1-4/doc/gpg.texi 2007-12-12 18:55:52 UTC (rev 4655)
@@ -113,7 +113,7 @@
@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 @@
@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 @@
@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 @@
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 @@
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.
+ at 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 @@
@include specify-user-id.texi
@end ifset
- at mansect return vaue
+ at mansect return value
@chapheading RETURN VALUE
The program returns 0 if everything was fine, 1 if at least
Modified: branches/STABLE-BRANCH-1-4/doc/specify-user-id.texi
===================================================================
--- branches/STABLE-BRANCH-1-4/doc/specify-user-id.texi 2007-12-12 18:26:25 UTC (rev 4654)
+++ branches/STABLE-BRANCH-1-4/doc/specify-user-id.texi 2007-12-12 18:55:52 UTC (rev 4655)
@@ -12,8 +12,8 @@
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 @@
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 @@
@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
Modified: branches/STABLE-BRANCH-1-4/doc/yat2m.c
===================================================================
--- branches/STABLE-BRANCH-1-4/doc/yat2m.c 2007-12-12 18:26:25 UTC (rev 4654)
+++ branches/STABLE-BRANCH-1-4/doc/yat2m.c 2007-12-12 18:55:52 UTC (rev 4655)
@@ -449,7 +449,7 @@
{ "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 @@
finish_page (void)
{
FILE *fp;
- section_buffer_t sect;
+ section_buffer_t sect = NULL;
int idx;
const char *s;
int i;
More information about the Gnupg-commits
mailing list