From 6ca0f822b8e26165f15b1eb5308f04f913c43347 Mon Sep 17 00:00:00 2001
From: emmajane <>
Date: Tue, 27 Jan 2004 21:52:44 +0000
Subject: [PATCH] Moved the licensing information up a section level.

---
 .../LDP-Author-Guide/LDP-Author-Guide.xml     | 14 +++-
 .../LDP-Author-Guide/ag-distribute.xml        | 75 ++++++++-----------
 2 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/LDP/guide/docbook/LDP-Author-Guide/LDP-Author-Guide.xml b/LDP/guide/docbook/LDP-Author-Guide/LDP-Author-Guide.xml
index 5246a110..e08c7351 100644
--- a/LDP/guide/docbook/LDP-Author-Guide/LDP-Author-Guide.xml
+++ b/LDP/guide/docbook/LDP-Author-Guide/LDP-Author-Guide.xml
@@ -116,7 +116,7 @@ what's on the LDP web site as I'm currently *gasp* offline. -->
 <book id="index">
   <bookinfo>
     <title>LDP Author Guide</title>
-    <pubdate>2004-01-06</pubdate>
+    <pubdate>2004-01-27</pubdate>
     <author>
       <firstname>Mark</firstname>
       <othername>F.</othername>
@@ -162,6 +162,14 @@ what's on the LDP web site as I'm currently *gasp* offline. -->
     </abstract>
 	 
     <revhistory>
+	 	<revision>
+		<revnumber>4.1</revnumber>
+		<date>2004-01-27</date>
+		<authorinitials>ejh</authorinitials>
+		<revremark>Moved the license requirements up a section level.</revremark>
+		</revision>
+
+	<!--
 	 	<revision>
 		<revnumber>4.0.11</revnumber>
 		<date>2004-01-04</date>
@@ -251,8 +259,8 @@ what's on the LDP web site as I'm currently *gasp* offline. -->
 		elements into place (a floating date until the final version is
 		ready).</revremark>
       </revision>
-<!--
-      <revision>
+      
+		<revision>
         <revnumber>3.15</revnumber>
         <date>2002-12-16</date>
         <authorinitials>gjf</authorinitials>
diff --git a/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml b/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml
index 77bf7496..a272e813 100644
--- a/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml
+++ b/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml
@@ -88,70 +88,62 @@
 	</variablelist>
 </section>
 
-<section id="document-components">
-    <title>Document Components</title>
-		
-	<para>
-		In addition to the main text of your document, there are a few
-		additional sections you will need to add to your document before it
-		can be distributed.
-	</para>
-	
-	 <section id="doc-copyright">
-      <title>Copyright and Licensing issues</title>
+<section id="doc-licensing">
+      <title>Licensing and Copyright</title>
       <para> In order for a document to be accepted by the LDP,
       it must be licensed and conform to the <quote>LICENSE
-		REQUIREMENTS</quote>
-      section of the LDP Manifesto located at <ulink
+		REQUIREMENTS</quote> section of the LDP Manifesto located at <ulink
       url="http://www.tldp.org/manifesto.html">http://www.tldp.org/manifesto.html</ulink>.
-      As an author, you may retain the copyright and add other
-      restrictions (for example: require approval for any translations or
-      derivative works). </para>
+		</para>
 
-      <note><title>Get a copy of the license</title><para> We recommend using the <ulink 
+      <para> We recommend using the <ulink 
       url="http://www.gnu.org/copyleft/fdl.html">GNU Free Documentation 
-      License (GFDL)</ulink>. If 
-      you choose, you can get DocBook markups of both the GNU GPL
+      License (GFDL)</ulink>, one of the <ulink
+		url="http://www.creativecommons.org/license">Creative Commons
+		Licenses</ulink>, or the LDP license (currently under review). The 
+		full text of the license must be included in your document, including 
+		the title and version of the license you are using. The LDP will not
+		accept new documents that do not meet licensing requirements.</para>
+		
+		<para>You can get DocBook markups of both the GNU GPL
       and the GNU FDL from <ulink url="http://developer.gnome.org/projects/gdp/licenses.html">
       the GNOME Documentation Project</ulink>.  You can then merely
       include the license in its entirety in your document. A
 		DocBook-formatted copy of the license is available in
 		<xref linkend="templates"/>.
-		</para></note>
-      
-      <para>If you choose to use a boilerplate copyright, simply copy it
-      into your source code under a section called <quote>Copyright
-      and Licenses</quote> or similar. Also include a copyright
-      statement of your own (since you still own it). If you are a new
-      maintainer of an already-existing HOWTO, you must include the
-      previous copyright statements of the previous author(s) and the
-      dates they maintained that document. </para> 
-
+		</para>
+		
 		<para>
 			For more information about open source documentation and
 			licensing, please check <xref linkend="ref-licenses" />.
 		</para>
-
-		<tip><title>Share and enjoy</title><para>
-      If your HOWTO includes bits of source code that you want others to use,
-      you may choose to release the source code under GPL.</para></tip>
-
-		<para>
-			For a more complete list of licenses, please check out the
-			resources section: <xref linkend="ref-licenses" />.
-		</para>
-    </section>
-
+		
+		<section id="doc-copyright">
+		<title>Copyright</title>
+      <para>As an author, you may retain the copyright and add other
+      restrictions (for example: require approval for any translations or
+      derivative works). If you are a new
+      maintainer of an already-existing HOWTO, you must include the
+      previous copyright statements of the previous author(s) and the
+      dates they maintained that document. </para>
+		</section>
+	 
 	 <section id="doc-disclaimer">
 		<title>Disclaimer</title>
 		<para>If you would like to include a disclaimer, you may choose
 		to use the following:</para>
-
 		<blockquote>
 		&disclaimer;
 		</blockquote>
 	 </section>
 
+	<section id="doc-sourcecode">
+		<title>Licensing source code</title>
+      <para>If your HOWTO includes bits of source code that you want others to use,
+      you may choose to release the source code under GPL.</para>
+	</section>
+</section>
+
 <section id="crediting-ack">
 	<title>Acknowledgments</title>
 
@@ -195,7 +187,6 @@
 	<note><title>Acknowledgments translated in DocBook</title><para>For more information on how to add these credits using DocBook
 		please read <xref linkend="metadata-markup" />
 	</para></note>
-	</section>
 </section>
 
 <section id="ag-review">