diff options
author | Kelley Cook <kcook@gcc.gnu.org> | 2005-06-28 01:46:41 +0000 |
---|---|---|
committer | R. Kelley Cook <kcook@gcc.gnu.org> | 2005-06-28 01:46:41 +0000 |
commit | 0d44cd2c64966f4605d1b0a17d5be994aee11c99 (patch) | |
tree | 34cfdaad3adb3e22c69543cd338cbd1eb9f63225 /gcc/doc | |
parent | 957973e9212c70d83756efe4da37147bfe3246dd (diff) | |
download | gcc-0d44cd2c64966f4605d1b0a17d5be994aee11c99.zip gcc-0d44cd2c64966f4605d1b0a17d5be994aee11c99.tar.gz gcc-0d44cd2c64966f4605d1b0a17d5be994aee11c99.tar.bz2 |
fdl.texi: Merge in changes from upstream.
2005-06-28 Kelley Cook <kcook@gcc.gnu.org>
* doc/include/fdl.texi: Merge in changes from upstream.
* doc/include/gpl.texi: Likewise.
From-SVN: r101367
Diffstat (limited to 'gcc/doc')
-rw-r--r-- | gcc/doc/include/fdl.texi | 14 | ||||
-rw-r--r-- | gcc/doc/include/gpl.texi | 18 |
2 files changed, 17 insertions, 15 deletions
diff --git a/gcc/doc/include/fdl.texi b/gcc/doc/include/fdl.texi index 2a4da78..7465144 100644 --- a/gcc/doc/include/fdl.texi +++ b/gcc/doc/include/fdl.texi @@ -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 it is not allowed. @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 or on a volume of a storage or 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, but you may include 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 page: 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 --git a/gcc/doc/include/gpl.texi b/gcc/doc/include/gpl.texi index eaff30c..bcb5535 100644 --- a/gcc/doc/include/gpl.texi +++ b/gcc/doc/include/gpl.texi @@ -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 it is not allowed. @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 free use or not licensed at all. 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 PARTICULAR PURPOSE. See the 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 you work as a programmer) or your 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 |