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]

FSF address: Import changes from fdl.texi and gpl.texi


This imports fdl.texi and gpl.texi from http://www.fsf.org/licensing/licenses/index_html.

Unfortunately, our versions are modifications from the canonical versions, mostly to allow the generation of man pages from those files.

This patch attempts to merge in the changes. It passes "make info man". But "make dvi" does not seem to be working on my box with or without this patch. I'll verify it works on another box before committing.

OK to install?


2005-06-27  Kelley Cook  <kcook@gcc.gnu.org>

	* doc/include/fdl.texi: Merge in changes from upstream.
	* doc/include/gpl.texi: Likewise.

diff -prud /home/kcook34/gcc-orig/gcc/doc/include/fdl.texi ./fdl.texi
--- /home/kcook34/gcc-orig/gcc/doc/include/fdl.texi	2005-06-27 12:27:39.621784700 -0400
+++ ./fdl.texi	2005-06-27 12:51:32.673559700 -0400
@@ -6,8 +6,8 @@
 gpl(7), fsf-funding(7).
 @c man end
 @c man begin COPYRIGHT
-Copyright @copyright{} 2000 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@@ -37,7 +37,7 @@ of this license document, but changing i
 
 @display
 Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@@ -374,7 +374,7 @@ and independent documents or works, in o
 distribution medium, is called an ``aggregate'' if the copyright
 resulting from the compilation is not used to limit the legal rights
 of the compilation's users beyond what the individual works permit.
-When the Document is included an aggregate, this License does not
+When the Document is included in an aggregate, this License does not
 apply to the other works in the aggregate which are not themselves
 derivative works of the Document.
 
@@ -396,7 +396,7 @@ permission from their copyright holders,
 translations of some or all Invariant Sections in addition to the
 original versions of these Invariant Sections.  You may include a
 translation of this License, and all the license notices in the
-Document, and any Warrany Disclaimers, provided that you also include
+Document, and any Warranty Disclaimers, provided that you also include
 the original English version of this License and the original versions
 of those notices and disclaimers.  In case of a disagreement between
 the translation and the original version of this License or a notice
@@ -450,8 +450,8 @@ license notices just after the title pag
   Permission is granted to copy, distribute and/or modify this document
   under the terms of the GNU Free Documentation License, Version 1.2
   or any later version published by the Free Software Foundation;
-  with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-  A copy of the license is included in the section entitled ``GNU
+  with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+  Texts.  A copy of the license is included in the section entitled ``GNU
   Free Documentation License''.
 @end group
 @end smallexample
diff -prud /home/kcook34/gcc-orig/gcc/doc/include/gpl.texi ./gpl.texi
--- /home/kcook34/gcc-orig/gcc/doc/include/gpl.texi	2005-06-27 12:21:19.683835100 -0400
+++ ./gpl.texi	2005-06-27 14:37:46.531851000 -0400
@@ -7,7 +7,7 @@ gfdl(7), fsf-funding(7).
 @c man end
 @c man begin COPYRIGHT
 Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@@ -18,9 +18,11 @@ of this license document, but changing i
 @unnumbered GNU GENERAL PUBLIC LICENSE
 @center Version 2, June 1991
 
+@c This file is intended to be included in another file.
+
 @display
 Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@@ -77,7 +79,7 @@ patent must be licensed for everyone's f
 modification follow.
 
 @iftex
-@unnumberedsec TERMS AND CONDITIONS FOR COPYING,@*DISTRIBUTION AND MODIFICATION
+@unnumberedsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 @end iftex
 @ifnottex
 @center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -339,7 +341,7 @@ POSSIBILITY OF SUCH DAMAGES.
 @end ifnottex
 
 @page
-@unnumberedsec How to Apply These Terms to Your New Programs
+@unnumberedsec Appendix: How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -365,8 +367,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICU
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 @end smallexample
 
 Also add information on how to contact you by electronic and paper mail.
@@ -392,13 +394,13 @@ You should also get your employer (if yo
 school, if any, to sign a ``copyright disclaimer'' for the program, if
 necessary.  Here is a sample; alter the names:
 
-@smallexample
+@example
 Yoyodyne, Inc., hereby disclaims all copyright interest in the program
 `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
 @var{signature of Ty Coon}, 1 April 1989
 Ty Coon, President of Vice
-@end smallexample
+@end example
 
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may

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