[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-207-gff61152
by Werner Koch
cvs at cvs.gnupg.org
Fri Apr 19 12:19:35 CEST 2013
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 ff6115227a1ced14e2fb3d160a12181b9dfbc502 (commit)
from 96fc29950a8508e936ad4546617d91a40226639e (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 ff6115227a1ced14e2fb3d160a12181b9dfbc502
Author: Werner Koch <wk at gnupg.org>
Date: Thu Apr 18 14:40:43 2013 +0200
doc: Formatting fixes.
* doc/Makefile.am (.fig.jpg): Correct to use -L jpeg.
* doc/gpg.texi: Fix cross reference for --options.
* doc/gpgsm.texi: Likewise.
* doc/gpl.texi: Fix enumerate and re-indent examples.
--
Reported-by: Ian Abbott
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/THANKS b/THANKS
index 5bde9f3..d366707 100644
--- a/THANKS
+++ b/THANKS
@@ -105,6 +105,7 @@ Holger Smolinski smolinsk at de.ibm.com
Holger Trapp Holger.Trapp at informatik.tu-chemnitz.de
Hugh Daniel hugh at toad.com
Huy Le huyle at ugcs.caltech.edu
+Ian Abbott abbotti at mev.co.uk
Ian McKellar imckellar at harvestroad.com.au
Ingo Klöcker kloecker at kde.org
Ivo Timmermans itimmermans at bigfoot.com
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 17d5997..4d6d475 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -88,7 +88,7 @@ yat2m: yat2m.c
fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@
.fig.jpg:
- fig2dev -L jpg `test -f '$<' || echo '$(srcdir)/'`$< $@
+ fig2dev -L jpeg `test -f '$<' || echo '$(srcdir)/'`$< $@
.fig.eps:
fig2dev -L eps `test -f '$<' || echo '$(srcdir)/'`$< $@
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 7194112..cec4581 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1293,9 +1293,7 @@ encoded in the character set as specified by
@option{--display-charset}. These options affect all following
arguments. Both options may be used multiple times.
- at ifset gpgone
- at anchor{option --options}
- at end ifset
+ at anchor{gpg-option --options}
@item --options @code{file}
@opindex options
Read options from @code{file} and do not try to read them from the
@@ -2929,7 +2927,7 @@ current home directory (@pxref{option --homedir}).
This is the standard configuration file read by @command{@gpgname} on
startup. It may contain any valid long option; the leading two dashes
may not be entered and the option may not be abbreviated. This default
- name may be changed on the command line (@pxref{option --options}).
+ name may be changed on the command line (@pxref{gpg-option --options}).
You should backup this file.
@end table
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index bdb0378..6a84391 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -319,6 +319,7 @@ in the option file.
@table @gnupgtabopt
+ at anchor{gpgsm-option --options}
@item --options @var{file}
@opindex options
Reads configuration from @var{file} instead of from the default
@@ -760,8 +761,8 @@ current home directory (@pxref{option --homedir}).
This is the standard configuration file read by @command{gpgsm} on
startup. It may contain any valid long option; the leading two dashes
may not be entered and the option may not be abbreviated. This default
-name may be changed on the command line (@pxref{option
- --options}). You should backup this file.
+name may be changed on the command line (@pxref{gpgsm-option --options}).
+You should backup this file.
@item policies.txt
diff --git a/doc/gpl.texi b/doc/gpl.texi
index 7f9a48a..d13e9e4 100644
--- a/doc/gpl.texi
+++ b/doc/gpl.texi
@@ -228,7 +228,7 @@ terms of section 4, provided that you also meet all of these
conditions:
@enumerate a
- at item
+ at item
The work must carry prominent notices stating that you modified it,
and giving a relevant date.
@@ -659,12 +659,15 @@ an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
+ at end enumerate
+
@iftex
@heading END OF TERMS AND CONDITIONS
@end iftex
@ifinfo
@center END OF TERMS AND CONDITIONS
@end ifinfo
+
@unnumberedsec How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
@@ -675,9 +678,11 @@ terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
-the ``copyright'' line and a pointer to where the full notice is found.
- at smallexample
- at var{one line to give the program's name and a brief idea of what it does.}
+the ``copyright'' line and a pointer to where the full notice is
+found.
+
+ at example
+ at var{one line to give the program's name and a brief idea of what it does.}
Copyright (C) @var{year} @var{name of author}
This program is free software: you can redistribute it and/or modify
@@ -692,17 +697,21 @@ General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see @url{http://www.gnu.org/licenses/}.
- at end smallexample
+ at end example
+ at noindent
Also add information on how to contact you by electronic and paper mail.
+ at noindent
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
@smallexample
- at var{program} Copyright (C) @var{year} @var{name of author}
-This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
-This is free software, and you are welcome to redistribute it under certain conditions; type @samp{show c} for details.
+ at var{program} Copyright (C) @var{year} @var{name of author}
+This program comes with ABSOLUTELY NO WARRANTY; for details
+type @samp{show w}. This is free software, and you are
+welcome to redistribute it under certain conditions;
+type @samp{show c} for details.
@end smallexample
The hypothetical commands @samp{show w} and @samp{show c} should show
@@ -721,5 +730,3 @@ library, you may consider it more useful to permit linking proprietary
applications with the library. If this is what you want to do, use
the GNU Lesser General Public License instead of this License. But
first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
-
- at end enumerate
-----------------------------------------------------------------------
Summary of changes:
THANKS | 1 +
doc/Makefile.am | 2 +-
doc/gpg.texi | 6 ++----
doc/gpgsm.texi | 5 +++--
doc/gpl.texi | 27 +++++++++++++++++----------
5 files changed, 24 insertions(+), 17 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list