diff en/appD-license.xml @ 749:7e7c47481e4f

Oops, this is the real merge for my hg's oddity

--- a/en/appD-license.xml	Fri Mar 20 15:40:06 2009 +0800
+++ b/en/appD-license.xml	Fri Mar 20 16:43:35 2009 +0800
@@ -4,24 +4,24 @@
   <?dbhtml filename="open-publication-license.html"?>
   <title>Open Publication License</title>
 
-  <para>Version 1.0, 8 June 1999</para>
+  <para id="x_638">Version 1.0, 8 June 1999</para>
 
   <sect1>
     <title>Requirements on both unmodified and modified
       versions</title>
 
-    <para>The Open Publication works may be reproduced and distributed
+    <para id="x_639">The Open Publication works may be reproduced and distributed
       in whole or in part, in any medium physical or electronic,
       provided that the terms of this license are adhered to, and that
       this license or an incorporation of it by reference (with any
       options elected by the author(s) and/or publisher) is displayed
       in the reproduction.</para>
 
-    <para>Proper form for an incorporation by reference is as
+    <para id="x_63a">Proper form for an incorporation by reference is as
       follows:</para>
 
     <blockquote>
-      <para>  Copyright (c) <emphasis>year</emphasis> by
+      <para id="x_63b">  Copyright (c) <emphasis>year</emphasis> by
 	<emphasis>author's name or designee</emphasis>. This material
 	may be distributed only subject to the terms and conditions
 	set forth in the Open Publication License,
@@ -30,14 +30,14 @@
 	  url="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</ulink>).</para>
     </blockquote>
 
-    <para>The reference must be immediately followed with any options
+    <para id="x_63c">The reference must be immediately followed with any options
       elected by the author(s) and/or publisher of the document (see
       section <xref linkend="sec.opl.options"/>).</para>
 
-    <para>Commercial redistribution of Open Publication-licensed
+    <para id="x_63d">Commercial redistribution of Open Publication-licensed
       material is permitted.</para>
 
-    <para>Any publication in standard (paper) book form shall require
+    <para id="x_63e">Any publication in standard (paper) book form shall require
       the citation of the original publisher and author. The publisher
       and author's names shall appear on all outer surfaces of the
       book. On all outer surfaces of the book the original publisher's
@@ -48,30 +48,30 @@
   <sect1>
     <title>Copyright</title>
 
-    <para>The copyright to each Open Publication is owned by its
+    <para id="x_63f">The copyright to each Open Publication is owned by its
       author(s) or designee.</para>
 
   </sect1>
   <sect1>
     <title>Scope of license</title>
 
-    <para>The following license terms apply to all Open Publication
+    <para id="x_640">The following license terms apply to all Open Publication
       works, unless otherwise explicitly stated in the
       document.</para>
 
-    <para>Mere aggregation of Open Publication works or a portion of
+    <para id="x_641">Mere aggregation of Open Publication works or a portion of
       an Open Publication work with other works or programs on the
       same media shall not cause this license to apply to those other
       works. The aggregate work shall contain a notice specifying the
       inclusion of the Open Publication material and appropriate
       copyright notice.</para>
 
-    <para><emphasis role="bold">Severability</emphasis>. If any part
+    <para id="x_642"><emphasis role="bold">Severability</emphasis>. If any part
       of this license is found to be unenforceable in any
       jurisdiction, the remaining portions of the license remain in
       force.</para>
 
-    <para><emphasis role="bold">No warranty</emphasis>. Open
+    <para id="x_643"><emphasis role="bold">No warranty</emphasis>. Open
       Publication works are licensed and provided <quote>as is</quote>
       without warranty of any kind, express or implied, including, but
       not limited to, the implied warranties of merchantability and
@@ -82,25 +82,25 @@
   <sect1>
     <title>Requirements on modified works</title>
 
-    <para>All modified versions of documents covered by this license,
+    <para id="x_644">All modified versions of documents covered by this license,
       including translations, anthologies, compilations and partial
       documents, must meet the following requirements:</para>
 
     <orderedlist>
-      <listitem><para>The modified version must be labeled as
+      <listitem><para id="x_645">The modified version must be labeled as
 	  such.</para>
       </listitem>
-      <listitem><para>The person making the modifications must be
+      <listitem><para id="x_646">The person making the modifications must be
 	  identified and the modifications dated.</para>
       </listitem>
-      <listitem><para>Acknowledgement of the original author and
+      <listitem><para id="x_647">Acknowledgement of the original author and
 	  publisher if applicable must be retained according to normal
 	  academic citation practices.</para>
       </listitem>
-      <listitem><para>The location of the original unmodified document
+      <listitem><para id="x_648">The location of the original unmodified document
 	  must be identified.</para>
       </listitem>
-      <listitem><para>The original author's (or authors') name(s) may
+      <listitem><para id="x_649">The original author's (or authors') name(s) may
 	  not be used to assert or imply endorsement of the resulting
 	  document without the original author's (or authors')
 	  permission.</para>
@@ -110,23 +110,23 @@
   <sect1>
     <title>Good-practice recommendations</title>
 
-    <para>In addition to the requirements of this license, it is
+    <para id="x_64a">In addition to the requirements of this license, it is
       requested from and strongly recommended of redistributors
       that:</para>
 
     <orderedlist>
-      <listitem><para>If you are distributing Open Publication works
+      <listitem><para id="x_64b">If you are distributing Open Publication works
 	  on hardcopy or CD-ROM, you provide email notification to the
 	  authors of your intent to redistribute at least thirty days
 	  before your manuscript or media freeze, to give the authors
 	  time to provide updated documents. This notification should
 	  describe modifications, if any, made to the document.</para>
       </listitem>
-      <listitem><para>All substantive modifications (including
+      <listitem><para id="x_64c">All substantive modifications (including
 	  deletions) be either clearly marked up in the document or
 	  else described in an attachment to the document.</para>
       </listitem>
-      <listitem><para>Finally, while it is not mandatory under this
+      <listitem><para id="x_64d">Finally, while it is not mandatory under this
 	  license, it is considered good form to offer a free copy of
 	  any hardcopy and CD-ROM expression of an Open
 	  Publication-licensed work to its author(s).</para>
@@ -136,7 +136,7 @@
   <sect1 id="sec.opl.options">
     <title>License options</title>
 
-    <para>The author(s) and/or publisher of an Open
+    <para id="x_64e">The author(s) and/or publisher of an Open
       Publication-licensed document may elect certain options by
       appending language to the reference to or copy of the license.
       These options are considered part of the license instance and
@@ -144,25 +144,25 @@
       reference) in derived works.</para>
 
     <orderedlist>
-      <listitem><para>To prohibit distribution of substantively
+      <listitem><para id="x_64f">To prohibit distribution of substantively
 	  modified versions without the explicit permission of the
 	  author(s). <quote>Substantive modification</quote> is
 	  defined as a change to the semantic content of the document,
 	  and excludes mere changes in format or typographical
 	  corrections.</para>
       </listitem>
-      <listitem><para>  To accomplish this, add the phrase
+      <listitem><para id="x_650">  To accomplish this, add the phrase
 	  <quote>Distribution of substantively modified versions of
 	    this document is prohibited without the explicit
 	    permission of the copyright holder.</quote> to the license
 	  reference or copy.</para>
       </listitem>
-      <listitem><para>To prohibit any publication of this work or
+      <listitem><para id="x_651">To prohibit any publication of this work or
 	  derivative works in whole or in part in standard (paper)
 	  book form for commercial purposes is prohibited unless prior
 	  permission is obtained from the copyright holder.</para>
       </listitem>
-      <listitem><para>To accomplish this, add the phrase
+      <listitem><para id="x_652">To accomplish this, add the phrase
 	  <quote>Distribution of the work or derivative of the work in
 	    any standard (paper) book form is prohibited unless prior
 	    permission is obtained from the copyright holder.</quote>