summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2011-06-06 15:57:10 -0700
committerRoland McGrath <roland@hack.frob.com>2011-06-06 16:16:55 -0700
commit069e52f8362adc26a6b7ad2b32664a68d0cc7a29 (patch)
tree2f975a032e75ce46f0035507835a2e06a50c32b5 /ChangeLog
parentf16846a5f279b4eb5f80821e8d27ffa73b1a1f7d (diff)
downloadglibc-069e52f8362adc26a6b7ad2b32664a68d0cc7a29.tar.gz
glibc-069e52f8362adc26a6b7ad2b32664a68d0cc7a29.tar.xz
glibc-069e52f8362adc26a6b7ad2b32664a68d0cc7a29.zip
Use canonical FSF .texi files for LGPL and FDL texts.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog16
1 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d9edabe03..269d311c0b 100644
--- a/ChangeLog
+++ b/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]