unofficial mirror of libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Florian Weimer via Libc-alpha <libc-alpha@sourceware.org>
To: libc-alpha@sourceware.org
Subject: [PATCH] manual: Show copyright information not just in the printed manual
Date: Mon, 25 May 2020 14:10:13 +0200	[thread overview]
Message-ID: <878shgxlju.fsf@oldenburg2.str.redhat.com> (raw)

@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 redudant with the
following line.

---
 manual/libc.texinfo | 20 +++++++++++---------
 1 file 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


             reply	other threads:[~2020-05-25 12:10 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-25 12:10 Florian Weimer via Libc-alpha [this message]
2020-06-04  9:54 ` [PATCH] manual: Show copyright information not just in the printed manual Florian Weimer via Libc-alpha
2020-07-02 17:53 ` Carlos O'Donell via Libc-alpha

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/libc/involved.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=878shgxlju.fsf@oldenburg2.str.redhat.com \
    --to=libc-alpha@sourceware.org \
    --cc=fweimer@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).