about summary refs log tree commit diff
path: root/manual
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2020-07-03 10:06:24 +0200
committerFlorian Weimer <fweimer@redhat.com>2020-07-03 10:06:24 +0200
commita3f747a912c53a172388a0a0f896cb88ca3549c8 (patch)
tree452b49e0b06708428b6538f605649777479e9f15 /manual
parentc6aac3bf3663709cdefde5f5d5e9e875d607be5e (diff)
downloadglibc-a3f747a912c53a172388a0a0f896cb88ca3549c8.tar.gz
glibc-a3f747a912c53a172388a0a0f896cb88ca3549c8.tar.xz
glibc-a3f747a912c53a172388a0a0f896cb88ca3549c8.zip
manual: Show copyright information not just in the printed manual
@insertcopying was not used at all in the Info and HTML versions.
As a result, the notices that need to be present according to the
GNU Free Documentation License were missing.

This commit shows these notices above the table of contents in the
HTML version, and as part of the Main Menu node in the Info version.

Remove the "This file documents" line because it is redundant with the
following line.

Tested-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'manual')
-rw-r--r--manual/libc.texinfo20
1 files changed, 11 insertions, 9 deletions
diff --git a/manual/libc.texinfo b/manual/libc.texinfo
index 692a8f20b2..9c8df2cba7 100644
--- a/manual/libc.texinfo
+++ b/manual/libc.texinfo
@@ -40,8 +40,6 @@
 @set FDL_VERSION 1.3
 
 @copying
-This file documents @theglibc{}.
-
 This is
 @c Disabled (printed editions, see above).
 @c Edition @value{EDITION} of
@@ -105,20 +103,24 @@ supports it in developing GNU and promoting software freedom.''
 
 @end titlepage
 
+@c @titlepage is only visible in the printed manual.  Show the
+@c copyright information elsewhere in other renderings.  For the HTML
+@c version, it should come above the short table of contents.  In the
+@c Info manual, the option below is used.
+@ifhtml
+@insertcopying
+@end ifhtml
+
 @shortcontents
 @contents
 
 @ifnottex
 @node Top, Introduction, (dir), (dir)
 @top Main Menu
-This is
 @c Disabled (printed editions, see above).
-@c Edition @value{EDITION} of
-@cite{The GNU C Library Reference Manual}, for Version @value{VERSION}
-@ifclear PKGVERSION_DEFAULT
-@value{PKGVERSION}
-@end ifclear
-of @theglibc{}.
+@ifnothtml
+@insertcopying
+@end ifnothtml
 @end ifnottex
 
 @include top-menu.texi