This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

@copying patch 4: use @copying


This is the fourth of four patches to use the Texinfo 4.2 @copying
feature.  This patch actually makes the manuals use it, except for
cppinternals.texi (which is still using an old permissive licence
rather than the GFDL, though it's longer than the 300 lines which the
Texinfo manual suggests as an indication of when GNU manuals are short
enough to use permissive licences) and fastjar.texi (since that
directory isn't using the gcc subdirectory configure check on the
makeinfo version; when toplevel is autoconfiscated and that check can
be at toplevel, fastjar.texi can be changed as well).  The cpp and gcj
manuals are also temporarily excluded because of texinfo.tex bugs when
@c or @ignore are used inside @copying; gnat-style.texi has no
statement of its own licence, only that GNAT is GPL.  However, the
libstdc++ porting manual, which has HTML checked in and isn't included
in the build process, is changed.

It passes "make info", "make dvi", "make generated-manpages" and
install.texi2html.  This will be applied to mainline once the previous
patch is in.

gcc:
2002-12-24  Joseph S. Myers  <jsm@polyomino.org.uk>

	* doc/gcc.texi, doc/gccint.texi, doc/install.texi: Use @copying.

gcc/ada:
2002-12-24  Joseph S. Myers  <jsm@polyomino.org.uk>

	* gnat_rm.texi, gnat_ug.texi: Use @copying.
	* gnat_ug_unx.texi, gnat_ug_vms.texi, gnat_ug_vxw.texi,
	gnat_ug_wnt.texi: Regenerate.

gcc/f:
2002-12-24  Joseph S. Myers  <jsm@polyomino.org.uk>

	* g77.texi: Use @copying.

gcc/treelang:
2002-12-24  Joseph S. Myers  <jsm@polyomino.org.uk>

	* treelang.texi: Use @copying.

libstdc++-v3:
2002-12-24  Joseph S. Myers  <jsm@polyomino.org.uk>

	* docs/html/17_intro/porting.texi: Use @copying.
	* docs/html/17_intro/porting.html: Regenerate.

diff -ruN gcc/ada/gnat_rm.texi gcc/ada/gnat_rm.texi
--- gcc/ada/gnat_rm.texi	2002-12-22 22:43:47.000000000 +0000
+++ gcc/ada/gnat_rm.texi	2002-12-23 00:06:27.000000000 +0000
@@ -28,18 +28,8 @@
 @direntry
 * GNAT Reference Manual: (gnat_rm).  Reference Manual for GNU Ada tools.
 @end direntry
-@titlepage
-
-
-@title GNAT Reference Manual
-@subtitle GNAT, The GNU Ada 95 Compiler
-@subtitle GNAT Version for GCC @value{version-GCC}
-@author Ada Core Technologies, Inc.
-
-@page
-@vskip 0pt plus 1filll
-
 
+@copying
 Copyright @copyright{} 1995-2001, Free Software Foundation
 
 Permission is granted to copy, distribute and/or modify this document
@@ -49,7 +39,20 @@
 Front-Cover Texts being ``GNAT Reference Manual'', and with no Back-Cover Texts.
 A copy of the license is included in the section entitled ``GNU
 Free Documentation License''.
+@end copying
+
+@titlepage
+
+
+@title GNAT Reference Manual
+@subtitle GNAT, The GNU Ada 95 Compiler
+@subtitle GNAT Version for GCC @value{version-GCC}
+@author Ada Core Technologies, Inc.
+
+@page
+@vskip 0pt plus 1filll
 
+@insertcopying
 
 @end titlepage
 @ifnottex
@@ -65,16 +68,7 @@
 
 Ada Core Technologies, Inc.
 
-
-Copyright @copyright{} 1995-2001, Free Software Foundation
-
-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 the Invariant Sections being ``GNU Free Documentation License'', with the
-Front-Cover Texts being ``GNAT Reference Manual'', and with no Back-Cover Texts.
-A copy of the license is included in the section entitled ``GNU
-Free Documentation License''.
+@insertcopying
 
 
 @menu
diff -ruN gcc/ada/gnat_ug.texi gcc/ada/gnat_ug.texi
--- gcc/ada/gnat_ug.texi	2002-11-06 22:48:23.000000000 +0000
+++ gcc/ada/gnat_ug.texi	2002-12-23 00:06:27.000000000 +0000
@@ -78,6 +78,31 @@
 @syncodeindex fn cp
 @c %**end of header
 
+@copying
+Copyright @copyright{} 1995-2002, Free Software Foundation
+
+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 the Invariant Sections being ``GNU Free Documentation License'', with the
+Front-Cover Texts being
+@ifset vms
+``GNAT User's Guide for OpenVMS Alpha'',
+@end ifset
+@ifset wnt
+``GNAT User's Guide for Windows NT'',
+@end ifset
+@ifset unx
+``GNAT User's Guide for Unix Platforms'',
+@end ifset
+@ifset vxworks
+``GNAT User's Guide for Cross Platforms'',
+@end ifset
+and with no Back-Cover Texts.
+A copy of the license is included in the section entitled ``GNU
+Free Documentation License''.
+@end copying
+
 @titlepage
 
 @ifset vms
@@ -108,28 +133,7 @@
 @page
 @vskip 0pt plus 1filll
 
-Copyright @copyright{} 1995-2002, Free Software Foundation
-
-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 the Invariant Sections being ``GNU Free Documentation License'', with the
-Front-Cover Texts being
-@ifset vms
-``GNAT User's Guide for OpenVMS Alpha'',
-@end ifset
-@ifset wnt
-``GNAT User's Guide for Windows NT'',
-@end ifset
-@ifset unx
-``GNAT User's Guide for Unix Platforms'',
-@end ifset
-@ifset vxworks
-``GNAT User's Guide for Cross Platforms'',
-@end ifset
-and with no Back-Cover Texts.
-A copy of the license is included in the section entitled ``GNU
-Free Documentation License''.
+@insertcopying
 
 @end titlepage
 
@@ -159,28 +163,7 @@
 
 Ada Core Technologies, Inc.
 
-Copyright @copyright{} 1995-2002, Free Software Foundation
-
-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 the Invariant Sections being ``GNU Free Documentation License'', with the
-Front-Cover Texts being
-@ifset vms
-``GNAT User's Guide for OpenVMS Alpha'',
-@end ifset
-@ifset wnt
-``GNAT User's Guide for Windows NT'',
-@end ifset
-@ifset unx
-``GNAT User's Guide for Unix Platforms'',
-@end ifset
-@ifset vxworks
-``GNAT User's Guide for Cross Platforms'',
-@end ifset
-and with no Back-Cover Texts.
-A copy of the license is included in the section entitled ``GNU
-Free Documentation License''.
+@insertcopying
 
 @menu
 * About This Guide::
diff -ruN gcc/doc/gcc.texi gcc/doc/gcc.texi
--- gcc/doc/gcc.texi	2002-09-04 08:48:01.000000000 +0000
+++ gcc/doc/gcc.texi	2002-12-23 11:26:49.000000000 +0000
@@ -60,23 +60,10 @@
 \global\setfont\defbf\ttbshape{10}{\magstep1}
 @end tex
 
-@macro copyrightnotice
+@copying
 Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-@end macro
-@ifnottex
-@dircategory Programming
-@direntry
-* gcc: (gcc).                  The GNU Compiler Collection.
-@end direntry
-This file documents the use of the GNU compilers.
-@sp 1
-Published by the Free Software Foundation@*
-59 Temple Place - Suite 330@*
-Boston, MA 02111-1307 USA
-@sp 1
-@copyrightnotice{}
-@sp 1
+
 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 the
@@ -94,6 +81,20 @@
      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.
+@end copying
+@ifnottex
+@dircategory Programming
+@direntry
+* gcc: (gcc).                  The GNU Compiler Collection.
+@end direntry
+This file documents the use of the GNU compilers.
+@sp 1
+Published by the Free Software Foundation@*
+59 Temple Place - Suite 330@*
+Boston, MA 02111-1307 USA
+@sp 1
+@insertcopying
+@sp 1
 @end ifnottex
 
 @setchapternewpage odd
@@ -108,8 +109,6 @@
 @center for GCC @value{version-GCC}
 @page
 @vskip 0pt plus 1filll
-@copyrightnotice{}
-@sp 2
 For GCC Version @value{version-GCC}@*
 @sp 1
 Published by the Free Software Foundation @*
@@ -122,23 +121,7 @@
 ISBN 1-882114-37-X
 @end ifset
 @sp 1
-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 the
-Invariant Sections being ``GNU General Public License'', the Front-Cover
-texts being (a) (see below), and with the Back-Cover Texts being (b)
-(see below).  A copy of the license is included in the section entitled
-``GNU Free Documentation License''.
-
-(a) The FSF's Front-Cover Text is:
-
-     A GNU Manual
-
-(b) 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.
+@insertcopying
 @end titlepage
 @summarycontents
 @contents
diff -ruN gcc/doc/gccint.texi gcc/doc/gccint.texi
--- gcc/doc/gccint.texi	2002-06-04 09:17:03.000000000 +0000
+++ gcc/doc/gccint.texi	2002-12-23 11:26:57.000000000 +0000
@@ -46,23 +46,10 @@
 \global\setfont\defbf\ttbshape{10}{\magstep1}
 @end tex
 
-@macro copyrightnotice
+@copying
 Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-@end macro
-@ifnottex
-@dircategory Programming
-@direntry
-* gccint: (gccint).            Internals of the GNU Compiler Collection.
-@end direntry
-This file documents the internals of the GNU compilers.
-@sp 1
-Published by the Free Software Foundation@*
-59 Temple Place - Suite 330@*
-Boston, MA 02111-1307 USA
-@sp 1
-@copyrightnotice{}
-@sp 1
+
 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 the
@@ -80,6 +67,19 @@
      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.
+@end copying
+@ifnottex
+@dircategory Programming
+@direntry
+* gccint: (gccint).            Internals of the GNU Compiler Collection.
+@end direntry
+This file documents the internals of the GNU compilers.
+@sp 1
+Published by the Free Software Foundation@*
+59 Temple Place - Suite 330@*
+Boston, MA 02111-1307 USA
+@sp 1
+@insertcopying
 @end ifnottex
 
 @setchapternewpage odd
@@ -94,8 +94,6 @@
 @center for GCC @value{version-GCC}
 @page
 @vskip 0pt plus 1filll
-@copyrightnotice{}
-@sp 2
 For GCC Version @value{version-GCC}@*
 @sp 1
 Published by the Free Software Foundation @*
@@ -108,23 +106,7 @@
 ISBN 1-882114-37-X
 @end ifset
 @sp 1
-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 the
-Invariant Sections being ``GNU General Public License'', the Front-Cover
-texts being (a) (see below), and with the Back-Cover Texts being (b)
-(see below).  A copy of the license is included in the section entitled
-``GNU Free Documentation License''.
-
-(a) The FSF's Front-Cover Text is:
-
-     A GNU Manual
-
-(b) 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.
+@insertcopying
 @end titlepage
 @summarycontents
 @contents
diff -ruN gcc/doc/install.texi gcc/doc/install.texi
--- gcc/doc/install.texi	2002-12-22 17:50:42.000000000 +0000
+++ gcc/doc/install.texi	2002-12-23 00:15:44.000000000 +0000
@@ -58,7 +58,7 @@
 @end ifnothtml
 
 @c Part 2 Summary Description and Copyright
-@macro copyrightnotice
+@copying
 Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 @sp 1
@@ -79,9 +79,9 @@
      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.
-@end macro
+@end copying
 @ifinfo
-@copyrightnotice{}
+@insertcopying
 @end ifinfo
 
 @c Part 3 Titlepage and Copyright
@@ -93,7 +93,7 @@
 @c The following two commands start the copyright page.
 @page
 @vskip 0pt plus 1filll
-@copyrightnotice{}
+@insertcopying
 @end titlepage
 
 @c Part 4 Top node and Master Menu
@@ -197,7 +197,7 @@
 @ifhtml
 @uref{./index.html,,Return to the GCC Installation page}
 
-@copyrightnotice{}
+@insertcopying
 @end ifhtml
 @end ifset
 
diff -ruN gcc/f/g77.texi gcc/f/g77.texi
--- gcc/f/g77.texi	2002-12-22 22:51:58.000000000 +0000
+++ gcc/f/g77.texi	2002-12-23 11:25:17.000000000 +0000
@@ -62,6 +62,29 @@
 @c \global\normaloffset =0.75in
 @c @end tex
 
+@copying
+Copyright @copyright{} @value{copyrights-g77} 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.1 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being ``GNU General Public License'' and ``Funding
+Free Software'', the Front-Cover
+texts being (a) (see below), and with the Back-Cover Texts being (b)
+(see below).  A copy of the license is included in the section entitled
+``GNU Free Documentation License''.
+
+(a) The FSF's Front-Cover Text is:
+
+     A GNU Manual
+
+(b) 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.
+@end copying
+
 @ifinfo
 @dircategory Programming
 @direntry
@@ -87,27 +110,7 @@
 59 Temple Place - Suite 330
 Boston, MA 02111-1307 USA
 
-Copyright (C) @value{copyrights-g77} 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.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``GNU General Public License'' and ``Funding
-Free Software'', the Front-Cover
-texts being (a) (see below), and with the Back-Cover Texts being (b)
-(see below).  A copy of the license is included in the section entitled
-``GNU Free Documentation License''.
-
-(a) The FSF's Front-Cover Text is:
-
-     A GNU Manual
-
-(b) 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.
+@insertcopying
 @end ifinfo
 
 Contributed by James Craig Burley (@email{@value{email-burley}}).
@@ -136,8 +139,6 @@
 @center for version @value{which-g77}
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} @value{copyrights-g77} Free Software Foundation, Inc.
-@sp 2
 For the @value{which-g77} Version*
 @sp 1
 Published by the Free Software Foundation @*
@@ -147,24 +148,7 @@
 @c Printed copies are available for $? each.@*
 @c ISBN ???
 @sp 1
-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 the
-Invariant Sections being ``GNU General Public License'' and ``Funding
-Free Software'', the Front-Cover
-texts being (a) (see below), and with the Back-Cover Texts being (b)
-(see below).  A copy of the license is included in the section entitled
-``GNU Free Documentation License''.
-
-(a) The FSF's Front-Cover Text is:
-
-     A GNU Manual
-
-(b) 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.
+@insertcopying
 @end titlepage
 @summarycontents
 @contents
diff -ruN gcc/treelang/treelang.texi gcc/treelang/treelang.texi
--- gcc/treelang/treelang.texi	2002-12-22 23:23:56.000000000 +0000
+++ gcc/treelang/treelang.texi	2002-12-23 11:38:50.000000000 +0000
@@ -81,6 +81,28 @@
 @c \global\normaloffset =0.75in
 @c @end tex
 
+@copying
+Copyright @copyright{} @value{copyrights-treelang} 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.1 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being ``GNU General Public License'', the Front-Cover
+texts being (a) (see below), and with the Back-Cover Texts being (b)
+(see below).  A copy of the license is included in the section entitled
+``GNU Free Documentation License''.
+
+(a) The FSF's Front-Cover Text is:
+
+     A GNU Manual
+
+(b) 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.
+@end copying
+
 @ifnottex
 @dircategory Programming
 @direntry
@@ -107,25 +129,7 @@
 59 Temple Place - Suite 330
 Boston, MA 02111-1307 USA
 
-Copyright (C) @value{copyrights-treelang} 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.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``GNU General Public License'', the Front-Cover
-texts being (a) (see below), and with the Back-Cover Texts being (b)
-(see below).  A copy of the license is included in the section entitled
-``GNU Free Documentation License''.
-
-(a) The FSF's Front-Cover Text is:
-
-     A GNU Manual
-
-(b) 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.
+@insertcopying
 @end ifnottex
 
 treelang was Contributed by Tim Josling (@email{@value{email-josling}}).
@@ -157,8 +161,6 @@
 @center for version @value{version-treelang}
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} @value{copyrights-treelang} Free Software Foundation, Inc.
-@sp 2
 For the @value{which-treelang} Version*
 @sp 1
 Published by the Free Software Foundation @*
@@ -168,23 +170,7 @@
 @c Printed copies are available for $? each.@*
 @c ISBN ???
 @sp 1
-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 the
-Invariant Sections being ``GNU General Public License'', the Front-Cover
-texts being (a) (see below), and with the Back-Cover Texts being (b)
-(see below).  A copy of the license is included in the section entitled
-``GNU Free Documentation License''.
-
-(a) The FSF's Front-Cover Text is:
-
-     A GNU Manual
-
-(b) 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.
+@insertcopying
 @end titlepage
 @page
 
diff -ruN libstdc++-v3/docs/html/17_intro/porting.texi libstdc++-v3/docs/html/17_intro/porting.texi
--- libstdc++-v3/docs/html/17_intro/porting.texi	2002-11-06 22:50:07.000000000 +0000
+++ libstdc++-v3/docs/html/17_intro/porting.texi	2002-12-23 11:40:36.000000000 +0000
@@ -8,22 +8,7 @@
 @settitle Porting libstdc++-v3
 @setchapternewpage odd
 
-@ifinfo
-This file explains how to port libstdc++-v3 (the GNU C++ library) to 
-a new target.
-
-Copyright (c) 2000, 2001, 2002 Free Software Foundation, Inc.
-@end ifinfo
-
-@c ---------------------------------------------------------------------
-@c Titlepage
-@c ---------------------------------------------------------------------
-
-@titlepage
-@title Porting libstdc++-v3
-@author Mark Mitchell
-@page
-@vskip 0pt plus 1filll
+@copying
 Copyright @copyright{} 2000, 2001, 2002 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -43,6 +28,25 @@
      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.
+@end copying
+
+@ifinfo
+This file explains how to port libstdc++-v3 (the GNU C++ library) to 
+a new target.
+
+@insertcopying
+@end ifinfo
+
+@c ---------------------------------------------------------------------
+@c Titlepage
+@c ---------------------------------------------------------------------
+
+@titlepage
+@title Porting libstdc++-v3
+@author Mark Mitchell
+@page
+@vskip 0pt plus 1filll
+@insertcopying
 @end titlepage
 
 @c ---------------------------------------------------------------------

-- 
Joseph S. Myers
jsm28@cam.ac.uk


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]