hgbook
diff en/appD-license.xml @ 650:7e7c47481e4f
Oops, this is the real merge for my hg's oddity
author | Dongsheng Song <dongsheng.song@gmail.com> |
---|---|
date | Fri Mar 20 16:43:35 2009 +0800 (2009-03-20) |
parents | cfdb601a3c8b |
children | 1c13ed2130a7 |
line diff
1.1 --- a/en/appD-license.xml Thu Mar 12 15:51:39 2009 +0800 1.2 +++ b/en/appD-license.xml Fri Mar 20 16:43:35 2009 +0800 1.3 @@ -4,24 +4,24 @@ 1.4 <?dbhtml filename="open-publication-license.html"?> 1.5 <title>Open Publication License</title> 1.6 1.7 - <para>Version 1.0, 8 June 1999</para> 1.8 + <para id="x_638">Version 1.0, 8 June 1999</para> 1.9 1.10 <sect1> 1.11 <title>Requirements on both unmodified and modified 1.12 versions</title> 1.13 1.14 - <para>The Open Publication works may be reproduced and distributed 1.15 + <para id="x_639">The Open Publication works may be reproduced and distributed 1.16 in whole or in part, in any medium physical or electronic, 1.17 provided that the terms of this license are adhered to, and that 1.18 this license or an incorporation of it by reference (with any 1.19 options elected by the author(s) and/or publisher) is displayed 1.20 in the reproduction.</para> 1.21 1.22 - <para>Proper form for an incorporation by reference is as 1.23 + <para id="x_63a">Proper form for an incorporation by reference is as 1.24 follows:</para> 1.25 1.26 <blockquote> 1.27 - <para> Copyright (c) <emphasis>year</emphasis> by 1.28 + <para id="x_63b"> Copyright (c) <emphasis>year</emphasis> by 1.29 <emphasis>author's name or designee</emphasis>. This material 1.30 may be distributed only subject to the terms and conditions 1.31 set forth in the Open Publication License, 1.32 @@ -30,14 +30,14 @@ 1.33 url="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</ulink>).</para> 1.34 </blockquote> 1.35 1.36 - <para>The reference must be immediately followed with any options 1.37 + <para id="x_63c">The reference must be immediately followed with any options 1.38 elected by the author(s) and/or publisher of the document (see 1.39 section <xref linkend="sec.opl.options"/>).</para> 1.40 1.41 - <para>Commercial redistribution of Open Publication-licensed 1.42 + <para id="x_63d">Commercial redistribution of Open Publication-licensed 1.43 material is permitted.</para> 1.44 1.45 - <para>Any publication in standard (paper) book form shall require 1.46 + <para id="x_63e">Any publication in standard (paper) book form shall require 1.47 the citation of the original publisher and author. The publisher 1.48 and author's names shall appear on all outer surfaces of the 1.49 book. On all outer surfaces of the book the original publisher's 1.50 @@ -48,30 +48,30 @@ 1.51 <sect1> 1.52 <title>Copyright</title> 1.53 1.54 - <para>The copyright to each Open Publication is owned by its 1.55 + <para id="x_63f">The copyright to each Open Publication is owned by its 1.56 author(s) or designee.</para> 1.57 1.58 </sect1> 1.59 <sect1> 1.60 <title>Scope of license</title> 1.61 1.62 - <para>The following license terms apply to all Open Publication 1.63 + <para id="x_640">The following license terms apply to all Open Publication 1.64 works, unless otherwise explicitly stated in the 1.65 document.</para> 1.66 1.67 - <para>Mere aggregation of Open Publication works or a portion of 1.68 + <para id="x_641">Mere aggregation of Open Publication works or a portion of 1.69 an Open Publication work with other works or programs on the 1.70 same media shall not cause this license to apply to those other 1.71 works. The aggregate work shall contain a notice specifying the 1.72 inclusion of the Open Publication material and appropriate 1.73 copyright notice.</para> 1.74 1.75 - <para><emphasis role="bold">Severability</emphasis>. If any part 1.76 + <para id="x_642"><emphasis role="bold">Severability</emphasis>. If any part 1.77 of this license is found to be unenforceable in any 1.78 jurisdiction, the remaining portions of the license remain in 1.79 force.</para> 1.80 1.81 - <para><emphasis role="bold">No warranty</emphasis>. Open 1.82 + <para id="x_643"><emphasis role="bold">No warranty</emphasis>. Open 1.83 Publication works are licensed and provided <quote>as is</quote> 1.84 without warranty of any kind, express or implied, including, but 1.85 not limited to, the implied warranties of merchantability and 1.86 @@ -82,25 +82,25 @@ 1.87 <sect1> 1.88 <title>Requirements on modified works</title> 1.89 1.90 - <para>All modified versions of documents covered by this license, 1.91 + <para id="x_644">All modified versions of documents covered by this license, 1.92 including translations, anthologies, compilations and partial 1.93 documents, must meet the following requirements:</para> 1.94 1.95 <orderedlist> 1.96 - <listitem><para>The modified version must be labeled as 1.97 + <listitem><para id="x_645">The modified version must be labeled as 1.98 such.</para> 1.99 </listitem> 1.100 - <listitem><para>The person making the modifications must be 1.101 + <listitem><para id="x_646">The person making the modifications must be 1.102 identified and the modifications dated.</para> 1.103 </listitem> 1.104 - <listitem><para>Acknowledgement of the original author and 1.105 + <listitem><para id="x_647">Acknowledgement of the original author and 1.106 publisher if applicable must be retained according to normal 1.107 academic citation practices.</para> 1.108 </listitem> 1.109 - <listitem><para>The location of the original unmodified document 1.110 + <listitem><para id="x_648">The location of the original unmodified document 1.111 must be identified.</para> 1.112 </listitem> 1.113 - <listitem><para>The original author's (or authors') name(s) may 1.114 + <listitem><para id="x_649">The original author's (or authors') name(s) may 1.115 not be used to assert or imply endorsement of the resulting 1.116 document without the original author's (or authors') 1.117 permission.</para> 1.118 @@ -110,23 +110,23 @@ 1.119 <sect1> 1.120 <title>Good-practice recommendations</title> 1.121 1.122 - <para>In addition to the requirements of this license, it is 1.123 + <para id="x_64a">In addition to the requirements of this license, it is 1.124 requested from and strongly recommended of redistributors 1.125 that:</para> 1.126 1.127 <orderedlist> 1.128 - <listitem><para>If you are distributing Open Publication works 1.129 + <listitem><para id="x_64b">If you are distributing Open Publication works 1.130 on hardcopy or CD-ROM, you provide email notification to the 1.131 authors of your intent to redistribute at least thirty days 1.132 before your manuscript or media freeze, to give the authors 1.133 time to provide updated documents. This notification should 1.134 describe modifications, if any, made to the document.</para> 1.135 </listitem> 1.136 - <listitem><para>All substantive modifications (including 1.137 + <listitem><para id="x_64c">All substantive modifications (including 1.138 deletions) be either clearly marked up in the document or 1.139 else described in an attachment to the document.</para> 1.140 </listitem> 1.141 - <listitem><para>Finally, while it is not mandatory under this 1.142 + <listitem><para id="x_64d">Finally, while it is not mandatory under this 1.143 license, it is considered good form to offer a free copy of 1.144 any hardcopy and CD-ROM expression of an Open 1.145 Publication-licensed work to its author(s).</para> 1.146 @@ -136,7 +136,7 @@ 1.147 <sect1 id="sec.opl.options"> 1.148 <title>License options</title> 1.149 1.150 - <para>The author(s) and/or publisher of an Open 1.151 + <para id="x_64e">The author(s) and/or publisher of an Open 1.152 Publication-licensed document may elect certain options by 1.153 appending language to the reference to or copy of the license. 1.154 These options are considered part of the license instance and 1.155 @@ -144,25 +144,25 @@ 1.156 reference) in derived works.</para> 1.157 1.158 <orderedlist> 1.159 - <listitem><para>To prohibit distribution of substantively 1.160 + <listitem><para id="x_64f">To prohibit distribution of substantively 1.161 modified versions without the explicit permission of the 1.162 author(s). <quote>Substantive modification</quote> is 1.163 defined as a change to the semantic content of the document, 1.164 and excludes mere changes in format or typographical 1.165 corrections.</para> 1.166 </listitem> 1.167 - <listitem><para> To accomplish this, add the phrase 1.168 + <listitem><para id="x_650"> To accomplish this, add the phrase 1.169 <quote>Distribution of substantively modified versions of 1.170 this document is prohibited without the explicit 1.171 permission of the copyright holder.</quote> to the license 1.172 reference or copy.</para> 1.173 </listitem> 1.174 - <listitem><para>To prohibit any publication of this work or 1.175 + <listitem><para id="x_651">To prohibit any publication of this work or 1.176 derivative works in whole or in part in standard (paper) 1.177 book form for commercial purposes is prohibited unless prior 1.178 permission is obtained from the copyright holder.</para> 1.179 </listitem> 1.180 - <listitem><para>To accomplish this, add the phrase 1.181 + <listitem><para id="x_652">To accomplish this, add the phrase 1.182 <quote>Distribution of the work or derivative of the work in 1.183 any standard (paper) book form is prohibited unless prior 1.184 permission is obtained from the copyright holder.</quote>