aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-02-24 12:53:25 -0800
committerRoland McGrath <roland@hack.frob.com>2012-02-24 12:53:25 -0800
commit74981cc52d3699f2cc2818af604f9101711ceb80 (patch)
tree47c80befc96c4f27f9d3230cadddb324df127208
parent7bb764bcb177f580e9f676680423ed3ddb13d8e7 (diff)
downloadglibc-74981cc52d3699f2cc2818af604f9101711ceb80.zip
glibc-74981cc52d3699f2cc2818af604f9101711ceb80.tar.gz
glibc-74981cc52d3699f2cc2818af604f9101711ceb80.tar.bz2
BZ#13738: Parameterize and fix mention of FDL version in manual.
-rw-r--r--ChangeLog7
-rw-r--r--manual/libc.texinfo18
2 files changed, 17 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ade4f1..8af4604 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-24 Roland McGrath <roland@hack.frob.com>
+
+ [BZ #13738]
+ * manual/libc.texinfo (FDL_VERSION): New @set.
+ Use it for mention of FDL in cover text.
+ (Documentation License): Use it in @include file name.
+
2012-02-22 Joseph Myers <joseph@codesourcery.com>
Roland McGrath <roland@hack.frob.com>
diff --git a/manual/libc.texinfo b/manual/libc.texinfo
index 2fc3fb9..13a2b0d 100644
--- a/manual/libc.texinfo
+++ b/manual/libc.texinfo
@@ -23,6 +23,8 @@
@set UPDATED 2011-07-19
@set ISBN 1-882114-55-8
+@set FDL_VERSION 1.1
+
@copying
This file documents the GNU C library.
@@ -32,13 +34,13 @@ of @cite{The GNU C Library Reference Manual}, for version @value{VERSION}.
Copyright @copyright{} 1993--2012 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
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``Free Software Needs Free Documentation''
-and ``GNU Lesser General Public License'', the Front-Cover texts being
-``A GNU Manual'', and with the Back-Cover Texts as in (a) below. A
-copy of the license is included in the section entitled "GNU Free
-Documentation License".
+under the terms of the GNU Free Documentation License, Version
+@value{FDL_VERSION} or any later version published by the Free
+Software Foundation; with the Invariant Sections being ``Free Software
+Needs Free Documentation'' and ``GNU Lesser General Public License'',
+the Front-Cover texts being ``A GNU Manual'', and with the Back-Cover
+Texts as in (a) below. A copy of the license is included in the
+section entitled "GNU Free Documentation License".
(a) The FSF's Back-Cover Text is: ``You have the freedom to
copy and modify this GNU manual. Buying copies from the FSF
@@ -100,7 +102,7 @@ of the GNU C Library.
@node Documentation License, Concept Index, Copying, Top
@appendix GNU Free Documentation License
@cindex FDL, GNU Free Documentation License
-@include fdl-1.1.texi
+@include fdl-@value{FDL_VERSION}.texi
@node Concept Index, Type Index, Documentation License, Top
@unnumbered Concept Index