GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

doc: Update gpl.texi to match version from gnupg

Browse Source 
--

Somehow the doc/gpl.texi from gpgme and gnupg drifted out of sync.
This patch to gpgme's file brings it in line with gnupg's master
branch, and avoids the following errors during make:

./gpl.texi:667: @section seen before @end enumerate
./gpl.texi:724: unmatched `@end enumerate'
./gpl.texi:1: warning: node next `Copying' in menu `Concept Index'
   and in sectioning `Function and Data Index' differ
This commit is contained in:
Daniel Kahn Gillmor 2014-09-06 01:04:07 -04:00 committed by Werner Koch
parent a813c09cc7
commit c32fab44f8
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
doc/gpl.texi
View File

@ -1,4 +1,5 @@
@node Copying @node Copying
@unnumbered GNU General Public License @unnumbered GNU General Public License
@center Version 3, 29 June 2007 @center Version 3, 29 June 2007
@ -11,7 +12,7 @@ Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed. license document, but changing it is not allowed.
@end display @end display
@section Preamble @unnumberedsec Preamble
The GNU General Public License is a free, copyleft license for The GNU General Public License is a free, copyleft license for
software and other kinds of works. software and other kinds of works.
@ -77,7 +78,7 @@ The precise terms and conditions for copying, distribution and
modification follow. modification follow.
@iftex @iftex
@section TERMS AND CONDITIONS @unnumberedsec TERMS AND CONDITIONS
@end iftex @end iftex
@ifinfo @ifinfo
@center TERMS AND CONDITIONS @center TERMS AND CONDITIONS
@ -227,7 +228,7 @@ terms of section 4, provided that you also meet all of these
conditions: conditions:
@enumerate a @enumerate a
@item @item
The work must carry prominent notices stating that you modified it, The work must carry prominent notices stating that you modified it,
and giving a relevant date. and giving a relevant date.
@ -658,13 +659,16 @@ 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
@section 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
possible use to the public, the best way to achieve this is to make it possible use to the public, the best way to achieve this is to make it
@ -674,9 +678,11 @@ 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.
@var{one line to give the program's name and a brief idea of what it does.}
@example
@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}
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
@ -691,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
@ -720,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