Use canonical FSF .texi files for LGPL and FDL texts.
This commit is contained in:
Roland McGrath
parent
f16846a5f2
commit
069e52f836
16
ChangeLog
16
ChangeLog
|
|
@ -1,3 +1,19 @@
|
|||
2011-06-06 Roland McGrath <roland@hack.frob.com>
|
||||
|
||||
[BZ #12849]
|
||||
* manual/fdl-1.1.texi: New file, verbatim from:
|
||||
http://www.gnu.org/licenses/old-licenses/fdl-1.1.texi
|
||||
* manual/lgpl-2.1.texi: New file, verbatim from:
|
||||
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.texi
|
||||
* manual/Makefile (licenses): New variable, list those new file names.
|
||||
(texis): Use it.
|
||||
(chapters.% top-menu.%): Include $(licenses) with $(appendices).
|
||||
|
||||
* manual/fdl.texi: File removed.
|
||||
* manual/lesser.texi: File removed.
|
||||
* manual/libc.texinfo (Copying, Documentation License):
|
||||
Use new @include file names, put @appendix directive before @include.
|
||||
|
||||
2011-06-04 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
[BZ #12841]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright (C) 1992-1999,2000,2001,2002,2003,2004,2006
|
||||
# Copyright (C) 1992-1999,2000,2001,2002,2003,2004,2006,2011
|
||||
# Free Software Foundation, Inc.
|
||||
# This file is part of the GNU C Library.
|
||||
|
||||
|
|
@ -59,11 +59,11 @@ chapters = $(addsuffix .texi, \
|
|||
resource setjmp signal startup process job nss \
|
||||
users sysinfo conf crypt debug)
|
||||
add-chapters = $(wildcard $(foreach d, $(add-ons), ../$d/$d.texi))
|
||||
appendices = lang.texi header.texi install.texi maint.texi contrib.texi \
|
||||
freemanuals.texi
|
||||
appendices = lang.texi header.texi install.texi maint.texi contrib.texi
|
||||
licenses = freemanuals.texi lgpl-2.1.texi fdl-1.1.texi
|
||||
|
||||
-include texis
|
||||
texis: texis.awk $(chapters) $(add-chapters) $(appendices) lesser.texi fdl.texi
|
||||
texis: texis.awk $(chapters) $(add-chapters) $(appendices) $(licenses)
|
||||
$(AWK) -f $^ > $@.T
|
||||
mv -f $@.T $@
|
||||
|
||||
|
|
@ -73,7 +73,9 @@ examples = $(filter-out $(foreach d, $(add-ons), ../$d/%.c.texi), \
|
|||
|
||||
# Kludge: implicit rule so Make knows the one command does it all.
|
||||
chapters.% top-menu.%: libc-texinfo.sh $(texis) Makefile
|
||||
AWK=$(AWK) $(SHELL) $< '$(chapters)' '$(add-chapters)' '$(appendices)'
|
||||
AWK=$(AWK) $(SHELL) $< '$(chapters)' \
|
||||
'$(add-chapters)' \
|
||||
'$(appendices) $(licenses)'
|
||||
|
||||
libc.dvi libc.pdf libc.info: chapters.texi top-menu.texi dir-add.texi \
|
||||
libm-err.texi
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
|
||||
@appendix GNU Free Documentation License
|
||||
|
||||
@cindex FDL, GNU Free Documentation License
|
||||
@c The GNU Free Documentation License.
|
||||
@center Version 1.1, March 2000
|
||||
|
||||
@c This file is intended to be included within another document,
|
||||
@c hence no sectioning command or @node.
|
||||
|
||||
@display
|
||||
Copyright @copyright{} 2000 Free Software Foundation, Inc.
|
||||
59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
|
||||
51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
|
@ -399,4 +399,3 @@ to permit their use in free software.
|
|||
@c Local Variables:
|
||||
@c ispell-local-pdict: "ispell-dict"
|
||||
@c End:
|
||||
|
||||
|
|
@ -1,16 +1,12 @@
|
|||
@ifset lgpl-appendix
|
||||
@appendix GNU Lesser General Public License
|
||||
@end ifset
|
||||
@ifclear lgpl-appendix
|
||||
@unnumbered GNU Lesser General Public License
|
||||
@end ifclear
|
||||
|
||||
@cindex LGPL, Lesser General Public License
|
||||
@c The GNU Lesser General Public License.
|
||||
@center Version 2.1, February 1999
|
||||
|
||||
@c This file is intended to be included within another document,
|
||||
@c hence no sectioning command or @node.
|
||||
|
||||
@display
|
||||
Copyright @copyright{} 1991, 1999 Free Software Foundation, Inc.
|
||||
59 Temple Place -- Suite 330, Boston, MA 02111-1307, USA
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
|
@ -20,7 +16,7 @@ as the successor of the GNU Library Public License, version 2, hence the
|
|||
version number 2.1.]
|
||||
@end display
|
||||
|
||||
@appendixsubsec Preamble
|
||||
@subheading Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
|
|
@ -122,13 +118,7 @@ modification follow. Pay close attention to the difference between a
|
|||
former contains code derived from the library, whereas the latter must
|
||||
be combined with the library in order to run.
|
||||
|
||||
@iftex
|
||||
@appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
@end iftex
|
||||
@ifinfo
|
||||
@center GNU LESSER GENERAL PUBLIC LICENSE
|
||||
@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
@end ifinfo
|
||||
@subheading TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
@enumerate 0
|
||||
@item
|
||||
|
|
@ -480,12 +470,7 @@ decision will be guided by the two goals of preserving the free status
|
|||
of all derivatives of our free software and of promoting the sharing
|
||||
and reuse of software generally.
|
||||
|
||||
@iftex
|
||||
@heading NO WARRANTY
|
||||
@end iftex
|
||||
@ifinfo
|
||||
@center NO WARRANTY
|
||||
@end ifinfo
|
||||
@center @b{NO WARRANTY}
|
||||
|
||||
@item
|
||||
BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
|
||||
|
|
@ -511,15 +496,10 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
|||
DAMAGES.
|
||||
@end enumerate
|
||||
|
||||
@iftex
|
||||
@heading END OF TERMS AND CONDITIONS
|
||||
@end iftex
|
||||
@ifinfo
|
||||
@center END OF TERMS AND CONDITIONS
|
||||
@end ifinfo
|
||||
@subheading END OF TERMS AND CONDITIONS
|
||||
|
||||
@page
|
||||
@appendixsubsec How to Apply These Terms to Your New Libraries
|
||||
@subheading How to Apply These Terms to Your New Libraries
|
||||
|
||||
If you develop a new library, and you want it to be of the greatest
|
||||
possible use to the public, we recommend making it free software that
|
||||
|
|
@ -548,7 +528,7 @@ Lesser General Public License for more details.
|
|||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||
USA.
|
||||
@end smallexample
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ This is Edition @value{EDITION}, last updated @value{UPDATED},
|
|||
of @cite{The GNU C Library Reference Manual}, for version @value{VERSION}.
|
||||
|
||||
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
|
||||
2003, 2007, 2008, 2010 Free Software Foundation, Inc.
|
||||
2003, 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
|
||||
|
||||
Permission is granted to copy, distribute and/or modify this document
|
||||
under the terms of the GNU Free Documentation License, Version 1.3 or
|
||||
|
|
@ -96,12 +96,14 @@ of the GNU C Library.
|
|||
@node Free Manuals, Copying, Contributors, Top
|
||||
@include freemanuals.texi
|
||||
|
||||
@set lgpl-appendix
|
||||
@node Copying, Documentation License, Free Manuals, Top
|
||||
@include lesser.texi
|
||||
@appendix GNU Lesser General Public License
|
||||
@include lgpl-2.1.texi
|
||||
|
||||
@node Documentation License, Concept Index, Copying, Top
|
||||
@include fdl.texi
|
||||
@appendix GNU Free Documentation License
|
||||
@cindex FDL, GNU Free Documentation License
|
||||
@include fdl-1.1.texi
|
||||
|
||||
@node Concept Index, Type Index, Documentation License, Top
|
||||
@unnumbered Concept Index
|
||||
|
|
|
|||
Loading…
Reference in New Issue