doc: merge HACKING and README-hacking.

[bison.git] / doc / fdl.texi

diff --git a/doc/fdl.texi b/doc/fdl.texi
index 5385f32cb7954cf3e245f15e7f1eccd43ef4fbc9..7b93651f1fa27f7d9232fef5cbd68ebab156be83 100644 (file)
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -1,13 +1,12 @@
-
-@node GNU Free Documentation License
-@appendixsec GNU Free Documentation License
-
-@cindex FDL, GNU Free Documentation License
+@c The GNU Free Documentation License.

 @center Version 1.2, November 2002
 
 @center Version 1.2, November 2002
 

+@c This file is intended to be included within another document,
+@c hence no sectioning command or @node.  
+

 @display
 Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
 @display
 Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.

-59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+51 Franklin St, 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.
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.


@@ -344,7 +343,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.
 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.
 
 apply to the other works in the aggregate which are not themselves
 derivative works of the Document.
 


@@ -366,7 +365,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
 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
 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


@@ -408,7 +407,7 @@ as a draft) by the Free Software Foundation.
 @end enumerate
 
 @page
 @end enumerate
 
 @page

-@appendixsubsec ADDENDUM: How to use this License for your documents
+@heading ADDENDUM: How to use this License for your documents

 
 To use this License in a document you have written, include a copy of
 the License in the document and put the following copyright and
 
 To use this License in a document you have written, include a copy of
 the License in the document and put the following copyright and


@@ -420,14 +419,14 @@ 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;
   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
 
 If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
   Free Documentation License''.
 @end group
 @end smallexample
 
 If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,

-replace the ``with...Texts.'' line with this:
+replace the ``with@dots{}Texts.'' line with this:

 
 @smallexample
 @group
 
 @smallexample
 @group