security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

doc: Formatting fixes.

Browse Source 
* 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@gnupg.org>
This commit is contained in:
Werner Koch 2013-04-18 14:40:43 +02:00
parent 96fc29950a
commit ff6115227a
5 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
THANKS
View File

@ -105,6 +105,7 @@ Holger Smolinski smolinsk at de.ibm.com
Holger Trapp Holger.Trapp at informatik.tu-chemnitz.de Holger Trapp Holger.Trapp at informatik.tu-chemnitz.de
Hugh Daniel hugh at toad.com Hugh Daniel hugh at toad.com
Huy Le huyle at ugcs.caltech.edu Huy Le huyle at ugcs.caltech.edu
Ian Abbott abbotti at mev.co.uk
Ian McKellar imckellar at harvestroad.com.au Ian McKellar imckellar at harvestroad.com.au
Ingo Klöcker kloecker at kde.org Ingo Klöcker kloecker at kde.org
Ivo Timmermans itimmermans at bigfoot.com Ivo Timmermans itimmermans at bigfoot.com

2
doc/Makefile.am
View File

@ -88,7 +88,7 @@ yat2m: yat2m.c
fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@ fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@
.fig.jpg: .fig.jpg:
fig2dev -L jpg `test -f '$<' || echo '$(srcdir)/'`$< $@ fig2dev -L jpeg `test -f '$<' || echo '$(srcdir)/'`$< $@
.fig.eps: .fig.eps:
fig2dev -L eps `test -f '$<' || echo '$(srcdir)/'`$< $@ fig2dev -L eps `test -f '$<' || echo '$(srcdir)/'`$< $@

6
doc/gpg.texi
View File

@ -1293,9 +1293,7 @@ encoded in the character set as specified by
@option{--display-charset}. These options affect all following @option{--display-charset}. These options affect all following
arguments. Both options may be used multiple times. arguments. Both options may be used multiple times.
@ifset gpgone @anchor{gpg-option --options}
@anchor{option --options}
@end ifset
@item --options @code{file} @item --options @code{file}
@opindex options @opindex options
Read options from @code{file} and do not try to read them from the 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 This is the standard configuration file read by @command{@gpgname} on
startup. It may contain any valid long option; the leading two dashes 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 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. You should backup this file.
@end table @end table

5
doc/gpgsm.texi
View File

@ -319,6 +319,7 @@ in the option file.
@table @gnupgtabopt @table @gnupgtabopt
@anchor{gpgsm-option --options}
@item --options @var{file} @item --options @var{file}
@opindex options @opindex options
Reads configuration from @var{file} instead of from the default 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 This is the standard configuration file read by @command{gpgsm} on
startup. It may contain any valid long option; the leading two dashes 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 may not be entered and the option may not be abbreviated. This default
name may be changed on the command line (@pxref{option name may be changed on the command line (@pxref{gpgsm-option --options}).
--options}). You should backup this file. You should backup this file.
@item policies.txt @item policies.txt

21
doc/gpl.texi
View File

@ -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 Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee. copy of the Program in return for a fee.
@end enumerate
@iftex @iftex
@heading END OF TERMS AND CONDITIONS @heading END OF TERMS AND CONDITIONS
@end iftex @end iftex
@ifinfo @ifinfo
@center END OF TERMS AND CONDITIONS @center END OF TERMS AND CONDITIONS
@end ifinfo @end ifinfo
@unnumberedsec How to Apply These Terms to Your New Programs @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 If you develop a new program, and you want it to be of the greatest
@ -675,8 +678,10 @@ terms.
To do so, attach the following notices to the program. It is safest 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 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 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. the ``copyright'' line and a pointer to where the full notice is
@smallexample found.
@example
@var{one line to give the program's name and a brief idea of what it does.} @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} Copyright (C) @var{year} @var{name of author}
@ -692,17 +697,21 @@ General Public License for more details.
You should have received a copy of the GNU General Public License 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/}. along with this program. If not, see @url{http://www.gnu.org/licenses/}.
@end smallexample @end example
@noindent
Also add information on how to contact you by electronic and paper mail. Also add information on how to contact you by electronic and paper mail.
@noindent
If the program does terminal interaction, make it output a short If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode: notice like this when it starts in an interactive mode:
@smallexample @smallexample
@var{program} Copyright (C) @var{year} @var{name of author} @var{program} Copyright (C) @var{year} @var{name of author}
This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}. This program comes with ABSOLUTELY NO WARRANTY; for details
This is free software, and you are welcome to redistribute it under certain conditions; type @samp{show c} 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 @end smallexample
The hypothetical commands @samp{show w} and @samp{show c} should show 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 applications with the library. If this is what you want to do, use
the GNU Lesser General Public License instead of this License. But the GNU Lesser General Public License instead of this License. But
first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}. first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
@end enumerate