The GNU Free Documentation License should be at the end of the guide (in an appendix), not at the begining.

Also, add the version number of the guide to the front page.

6 files changed, 22 insertions, 24 deletions

diff --git a/docs/sgml/Bugzilla-Guide.sgml b/docs/sgml/Bugzilla-Guide.sgml
index c75685a14..c2b7a6e75 100644
--- a/docs/sgml/Bugzilla-Guide.sgml
+++ b/docs/sgml/Bugzilla-Guide.sgml
@@ -39,7 +39,7 @@
 
 <!ENTITY bz "http://www.bugzilla.org/">
 <!ENTITY bzg-auth "The Bugzilla Team">
-<!ENTITY bzg-bugs "<ulink url='http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla&amp;component=Documentation'>Bugzilla</ulink>">
+<!ENTITY bzg-bugs "<ulink url='http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla&amp;component=Documentation'>Bugzilla Documentation</ulink>">
 <!ENTITY mysql "http://www.mysql.com/">
 <!ENTITY newest-perl-ver "5.8">
 
@@ -107,6 +107,8 @@ try to avoid clutter and feel free to waste space in the code to make it more re
       </author>
     </authorgroup>
 
+    <edition>&bz-ver; <![%bz-devel;[Development ]]>Release</edition>
+
     <pubdate>&bz-date;</pubdate>
 
     <abstract>
@@ -121,8 +123,7 @@ try to avoid clutter and feel free to waste space in the code to make it more re
       <para>  
 	      This documentation is maintained in DocBook 4.1.2 XML format.
         Changes are best submitted as plain text or SGML diffs, attached
-        to a bug filed in
-        <ulink url="http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla&amp;component=Documentation">mozilla.org's Bugzilla</ulink>.
+        to a bug filed in the &bzg-bugs; compontent.
       </para>
       <![%bz-devel;[
         <para>This is a development version of this guide.  Information in it
@@ -172,6 +173,9 @@ try to avoid clutter and feel free to waste space in the code to make it more re
 <!-- Appendix: Major Bugzilla Variants -->
 &variants;
 
+<!-- Appendix: GNU Free Documentation License -->
+&gfdl;
+
 <!-- Glossary -->
 &glossary;
 
diff --git a/docs/sgml/about.sgml b/docs/sgml/about.sgml
index 219d529e1..9ea766a53 100644
--- a/docs/sgml/about.sgml
+++ b/docs/sgml/about.sgml
@@ -7,14 +7,14 @@
   <section id="copyright">
     <title>Copyright Information</title>
     <blockquote>
-      <attribution>Copyright (c) 2000-2002 Matthew P. Barnson and &bzg-auth;</attribution>
+      <attribution>Copyright (c) 2000-2003 Matthew P. Barnson and &bzg-auth;</attribution>
       <para>
 	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, no
 	Front-Cover Texts, and  with no Back-Cover Texts.  A copy of
-	the license is included below.
+	the license is included in <xref linkend="gfdl"/>.
       </para>
     </blockquote>
     <para>
@@ -22,11 +22,6 @@
       copyright, or publishing this document in non-electronic form,
       please contact &bzg-auth;. 
     </para>
-
-
-    <!-- The GNU Free Documentation License -->
-    &gfdl;
-
   </section>
 
   <section id="disclaimer">
diff --git a/docs/sgml/gfdl.sgml b/docs/sgml/gfdl.sgml
index 047646411..fdfdb4bc5 100644
--- a/docs/sgml/gfdl.sgml
+++ b/docs/sgml/gfdl.sgml
@@ -1,5 +1,5 @@
 <!-- <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
-<section id="gfdl">
+<appendix id="gfdl">
   <title>GNU Free Documentation License</title>
 
 <!-- - GNU Project - Free Software Foundation (FSF) -->
@@ -423,7 +423,7 @@
     software license, such as the GNU General Public License, to permit their
     use in free software.</para>
   </section>
-</section>
+</appendix>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/docs/xml/Bugzilla-Guide.xml b/docs/xml/Bugzilla-Guide.xml
index c75685a14..c2b7a6e75 100644
--- a/docs/xml/Bugzilla-Guide.xml
+++ b/docs/xml/Bugzilla-Guide.xml
@@ -39,7 +39,7 @@
 
 <!ENTITY bz "http://www.bugzilla.org/">
 <!ENTITY bzg-auth "The Bugzilla Team">
-<!ENTITY bzg-bugs "<ulink url='http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla&amp;component=Documentation'>Bugzilla</ulink>">
+<!ENTITY bzg-bugs "<ulink url='http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla&amp;component=Documentation'>Bugzilla Documentation</ulink>">
 <!ENTITY mysql "http://www.mysql.com/">
 <!ENTITY newest-perl-ver "5.8">
 
@@ -107,6 +107,8 @@ try to avoid clutter and feel free to waste space in the code to make it more re
       </author>
     </authorgroup>
 
+    <edition>&bz-ver; <![%bz-devel;[Development ]]>Release</edition>
+
     <pubdate>&bz-date;</pubdate>
 
     <abstract>
@@ -121,8 +123,7 @@ try to avoid clutter and feel free to waste space in the code to make it more re
       <para>  
 	      This documentation is maintained in DocBook 4.1.2 XML format.
         Changes are best submitted as plain text or SGML diffs, attached
-        to a bug filed in
-        <ulink url="http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla&amp;component=Documentation">mozilla.org's Bugzilla</ulink>.
+        to a bug filed in the &bzg-bugs; compontent.
       </para>
       <![%bz-devel;[
         <para>This is a development version of this guide.  Information in it
@@ -172,6 +173,9 @@ try to avoid clutter and feel free to waste space in the code to make it more re
 <!-- Appendix: Major Bugzilla Variants -->
 &variants;
 
+<!-- Appendix: GNU Free Documentation License -->
+&gfdl;
+
 <!-- Glossary -->
 &glossary;
 
diff --git a/docs/xml/about.xml b/docs/xml/about.xml
index 219d529e1..9ea766a53 100644
--- a/docs/xml/about.xml
+++ b/docs/xml/about.xml
@@ -7,14 +7,14 @@
   <section id="copyright">
     <title>Copyright Information</title>
     <blockquote>
-      <attribution>Copyright (c) 2000-2002 Matthew P. Barnson and &bzg-auth;</attribution>
+      <attribution>Copyright (c) 2000-2003 Matthew P. Barnson and &bzg-auth;</attribution>
       <para>
 	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, no
 	Front-Cover Texts, and  with no Back-Cover Texts.  A copy of
-	the license is included below.
+	the license is included in <xref linkend="gfdl"/>.
       </para>
     </blockquote>
     <para>
@@ -22,11 +22,6 @@
       copyright, or publishing this document in non-electronic form,
       please contact &bzg-auth;. 
     </para>
-
-
-    <!-- The GNU Free Documentation License -->
-    &gfdl;
-
   </section>
 
   <section id="disclaimer">
diff --git a/docs/xml/gfdl.xml b/docs/xml/gfdl.xml
index 047646411..fdfdb4bc5 100644
--- a/docs/xml/gfdl.xml
+++ b/docs/xml/gfdl.xml
@@ -1,5 +1,5 @@
 <!-- <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
-<section id="gfdl">
+<appendix id="gfdl">
   <title>GNU Free Documentation License</title>
 
 <!-- - GNU Project - Free Software Foundation (FSF) -->
@@ -423,7 +423,7 @@
     software license, such as the GNU General Public License, to permit their
     use in free software.</para>
   </section>
-</section>
+</appendix>
 
 <!-- Keep this comment at the end of the file
 Local variables: