[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
copyright-notice glitches in Texinfo 4.2 manuals
From: |
Paul Eggert |
Subject: |
copyright-notice glitches in Texinfo 4.2 manuals |
Date: |
Mon, 1 Apr 2002 11:37:52 -0800 (PST) |
Here is a patch to fix some copyright-notice glitches in the Texinfo
4.2 manual.
2002-04-01 Paul Eggert <address@hidden>
* doc/info-stnd.texi, doc/info.texi, doc/texinfo.txi: Spell
out copyright years.
* doc/info.texi: Use @copying rather than the old-fashioned
@ifinfo stuff.
* doc/texinfo.txi: Use @code for the `{}' after address@hidden'.
`,' -> `;' to fix English typo. Use spelled-out copyright
years in examples.
===================================================================
RCS file: doc/info-stnd.texi,v
retrieving revision 4.2
retrieving revision 4.2.0.1
diff -pu -r4.2 -r4.2.0.1
--- doc/info-stnd.texi 2002/03/23 20:38:57 4.2
+++ doc/info-stnd.texi 2002/04/01 19:06:47 4.2.0.1
@@ -14,7 +14,7 @@ This manual is for GNU Info (version @va
a program for viewing documents in Info format (usually created from
Texinfo source files).
-Copyright @copyright{} 1992, 93, 96, 97, 98, 99, 2001, 02
+Copyright @copyright{} 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002
Free Software Foundation, Inc.
@quotation
===================================================================
RCS file: doc/info.texi,v
retrieving revision 4.2
retrieving revision 4.2.0.1
diff -pu -r4.2 -r4.2.0.1
--- doc/info.texi 2002/03/18 09:00:32 4.2
+++ doc/info.texi 2002/04/01 19:06:47 4.2.0.1
@@ -7,20 +7,14 @@
@syncodeindex ky cp
@comment %**end of header
@comment $Id: info.texi,v 1.20 2002/03/18 06:45:49 eliz Exp $
-
address@hidden Texinfo documentation system
address@hidden
-* Info: (info). How to use the documentation browsing system.
address@hidden direntry
-
address@hidden
address@hidden
This file describes how to use Info, the on-line, menu-driven GNU
documentation system.
-Copyright (C) 1989, 92, 96, 97, 98, 99, 2000, 2001, 2002
-Free Software Foundation, Inc.
-
+Copyright @copyright{} 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001,
+2002 Free Software Foundation, Inc.
address@hidden
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1 or
any later version published by the Free Software Foundation; with no
@@ -32,11 +26,15 @@ License'' in the Emacs manual.
(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
this GNU Manual, like GNU software. Copies published by the Free
Software Foundation raise funds for GNU development.''
address@hidden quotation
address@hidden copying
-This document is part of a collection distributed under the GNU Free
-Documentation License. If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
address@hidden Texinfo documentation system
address@hidden
+* Info: (info). How to use the documentation browsing system.
address@hidden direntry
+
address@hidden
@end ifinfo
@titlepage
@@ -46,29 +44,11 @@ license to the document, as described in
@author and the GNU Texinfo community
@page
@vskip 0pt plus 1filll
-Copyright @copyright{} 1989, 92, 93, 96, 97, 98, 99, 2000, 2001
-Free Software Foundation, Inc.
address@hidden
@sp 2
Published by the Free Software Foundation @*
59 Temple Place - Suite 330 @*
Boston, MA 02111-1307, USA.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with 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'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software. Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License. If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
@end titlepage
@ifnottex
@@ -88,6 +68,7 @@ sequence.
To learn advanced Info commands, type @kbd{n} twice. This brings you to
@cite{Info for Experts}, skipping over the `Getting Started' chapter.
@end ifinfo
address@hidden
@end ifnottex
@menu
===================================================================
RCS file: doc/texinfo.txi,v
retrieving revision 4.2
retrieving revision 4.2.0.3
diff -pu -r4.2 -r4.2.0.3
--- doc/texinfo.txi 2002/03/28 16:36:00 4.2
+++ doc/texinfo.txi 2002/04/01 19:13:02 4.2.0.3
@@ -38,8 +38,8 @@ This manual is for GNU Texinfo (version
a documentation system that can produce both online information and a
printed manual from a single source.
-Copyright (C) 1988, 90, 91, 92, 93, 95, 96, 97, 98, 99, 2000, 01, 02
-Free Software Foundation, Inc.
+Copyright @copyright{} 1988, 1990, 1991, 1992, 1993, 1995, 1996, 1997,
+1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -443,7 +443,7 @@ Inserting Ellipsis and Bullets
Inserting @TeX{} and the Copyright Symbol
* tex:: How to insert the @TeX{} logo.
-* copyright symbol:: How to use @code{@@address@hidden@}.
+* copyright symbol:: How to use @code{@@address@hidden@}}.
Glyphs for Examples
@@ -1384,7 +1384,8 @@ which it is distributed. @xref{GNU Samp
@@copying
This is a short example of a complete Texinfo file, version 1.0.
-Copyright @@address@hidden@} 2002 Free Software Foundation, Inc.
+Copyright @@address@hidden@} 1998, 2000, 2001, 2002 Free Software
+Foundation, Inc.
@@end copying
@end group
@end example
@@ -2944,7 +2945,7 @@ law.
@cindex Years, in copyright line
The list of years should include all years in which a version was
completed (even if it was released in a subsequent year). Ranges are
-not allowed, each year must be written out individually, separated by
+not allowed; each year must be written out individually, separated by
commas.
@cindex Copyright owner for FSF works
@@ -9507,7 +9508,7 @@ address@hidden
@menu
* tex:: How to insert the @TeX{} logo.
-* copyright symbol:: How to use @code{@@address@hidden@}.
+* copyright symbol:: How to use @code{@@address@hidden@}}.
@end menu
@@ -9523,7 +9524,7 @@ letters. In Info, it just looks like @s
@node copyright symbol
address@hidden @code{@@address@hidden@} (@copyright{})
address@hidden @code{@@address@hidden@}} (@copyright{})
@findex copyright
Use the @code{@@address@hidden@}} command to generate address@hidden'. In
@@ -15211,7 +15212,7 @@ address@hidden
@item @@address@hidden@}
Generate a copyright symbol. @xref{copyright symbol, ,
address@hidden@@address@hidden
address@hidden@@address@hidden@address@hidden
@ignore
@item @@address@hidden@address@hidden
@@ -16564,7 +16565,8 @@ it for a printed manual.
@@copying
This is a short example of a complete Texinfo file.
-Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright @@address@hidden@} 1998, 2000, 2001, 2002 Free Software
+Foundation, Inc.
@@end copying
@@titlepage
@@ -16711,7 +16713,8 @@ This manual is for GNU Sample
(version @@address@hidden@}, @@address@hidden@}),
which is an example in the Texinfo documentation.
-Copyright @@address@hidden@} 2002 Free Software Foundation, Inc.
+Copyright @@address@hidden@} 1998, 2000, 2001, 2002 Free Software
+Foundation, Inc.
@@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -16987,7 +16990,8 @@ would insert a main or master menu:@refi
@group
@@page
@@vskip 0pt plus 1filll
-Copyright @@address@hidden@} 2002 Free Software Foundation, Inc.
+Copyright @@address@hidden@} 1998, 2000, 2001, 2002 Free Software
+Foundation, Inc.
@@end titlepage
@end group