Hi all As discussed recently we have now upgraded the license from OPL to cc-by.
During the upgrade I intentionally removed the old IDs and entities to break all existing translations to force them to sync :) -Hannes ---------- Forwarded message ---------- From: Hannes Magnusson <[EMAIL PROTECTED]> Date: Sun, Jul 20, 2008 at 22:14 Subject: [DOC-CVS] cvs: phpdoc /en bookinfo.xml /en/appendices about.xml license.xml /entities global.ent To: [EMAIL PROTECTED] bjori Sun Jul 20 20:14:40 2008 UTC Modified files: /phpdoc/en bookinfo.xml /phpdoc/en/appendices about.xml license.xml /phpdoc/entities global.ent Log: Update license to Creative Commons Attribution 3.0 -- PHP Documentation Commits Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
http://cvs.php.net/viewvc.cgi/phpdoc/en/bookinfo.xml?r1=1.54&r2=1.55&diff_format=u Index: phpdoc/en/bookinfo.xml diff -u phpdoc/en/bookinfo.xml:1.54 phpdoc/en/bookinfo.xml:1.55 --- phpdoc/en/bookinfo.xml:1.54 Tue Jan 1 01:18:33 2008 +++ phpdoc/en/bookinfo.xml Sun Jul 20 20:14:40 2008 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.54 $ --> +<!-- $Revision: 1.55 $ --> <info xmlns="http://docbook.org/ns/docbook"; xml:id="bookinfo"> &frontpage.authors; @@ -16,20 +16,11 @@ <simpara> Copyright © 1997 - 2008 by the PHP Documentation Group. This material may be distributed only subject to the terms and - conditions set forth in the Open Publication License, v1.0 or - later. A copy of the <link linkend="opl.license">Open Publication - License</link> is distributed with this manual, the latest version - is presently available at <link xlink:href="&url.opl;">&url.opl;</link>. - </simpara> - <simpara> - Distribution of substantively modified versions of this document - is prohibited without the explicit permission of the copyright - holder. - </simpara> - <simpara> - 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. + conditions set forth in the Creative Commons Attribution 3.0 + License or later. A copy of the <link linkend="cc.license">Creative + Commons Attribution 3.0 license</link> is distributed with this manual, + the latest version is presently available at + <link xlink:href="&url.cc.by;">&url.cc.by;</link>. </simpara> <simpara> In case you are interested in redistribution or republishing of this document @@ -38,10 +29,6 @@ <link xlink:href="mailto:&email.php.doc.license;";>&email.php.doc.license;</link>. Note that this address is mapped to a publicly archived mailing list. </simpara> - <simpara> - The <xref linkend="internals2.ze1"/> section of the documentation is based on an - initial contribution by Zend Technologies. - </simpara> </legalnotice> </info> http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/about.xml?r1=1.53&r2=1.54&diff_format=u Index: phpdoc/en/appendices/about.xml diff -u phpdoc/en/appendices/about.xml:1.53 phpdoc/en/appendices/about.xml:1.54 --- phpdoc/en/appendices/about.xml:1.53 Fri Apr 11 05:26:42 2008 +++ phpdoc/en/appendices/about.xml Sun Jul 20 20:14:40 2008 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.53 $ --> +<!-- $Revision: 1.54 $ --> <appendix xml:id="about" xmlns="http://docbook.org/ns/docbook"; xmlns:xlink="http://www.w3.org/1999/xlink";> <title>About the manual</title> @@ -101,7 +101,7 @@ <para> For the purposes of license coverage the user-contributed notes are considered part of the PHP manual, and are therefore covered by the - same license that covers this documentation (Open Publication License + same license that covers this documentation (Creative Commons Attribution at the moment). For more details see the <link linkend="copyright">Manual's Copyright</link> page. http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/license.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc/en/appendices/license.xml diff -u phpdoc/en/appendices/license.xml:1.4 phpdoc/en/appendices/license.xml:1.5 --- phpdoc/en/appendices/license.xml:1.4 Tue Jul 3 14:01:51 2007 +++ phpdoc/en/appendices/license.xml Sun Jul 20 20:14:40 2008 @@ -1,179 +1,391 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> -<appendix xml:id="opl.license" xmlns="http://docbook.org/ns/docbook"; xmlns:xlink="http://www.w3.org/1999/xlink";> - <title>Open Publication License</title> - <simpara>v1.0, 8 June 1999</simpara> - <section xml:id="opl.require"> - <title>I. REQUIREMENTS ON BOTH UNMODIFIED AND MODIFIED VERSIONS</title> - <simpara> - 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. +<!-- $Revision: 1.5 $ --> + +<appendix xml:id="cc.license" xmlns="http://docbook.org/ns/docbook"; xmlns:xlink="http://www.w3.org/1999/xlink";> + <title>Creative Commons Attribution 3.0</title> + + <simpara> + THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC + LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER + APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR + COPYRIGHT LAW IS PROHIBITED. + </simpara> + <simpara> + BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY + THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A + CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR + ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + </simpara> + + <simpara><emphasis>1. Definitions</emphasis></simpara> + <orderedlist> + <listitem> + <simpara> + <emphasis>"Adaptation"</emphasis> means a work based upon the Work, or upon the Work + and other pre-existing works, such as a translation, adaptation, derivative work, + arrangement of music or other alterations of a literary or artistic work, or phonogram + or performance and includes cinematographic adaptations or any other form in which the + Work may be recast, transformed, or adapted including in any form recognizably derived + from the original, except that a work that constitutes a Collection will not be + considered an Adaptation for the purpose of this License. For the avoidance of doubt, + where the Work is a musical work, performance or phonogram, the synchronization of the + Work in timed-relation with a moving image ("synching") will be considered an + Adaptation for the purpose of this License. </simpara> + </listitem> + + <listitem> <simpara> - Proper form for an incorporation by reference is as follows: + <emphasis>"Collection"</emphasis> means a collection of literary or artistic works, + such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or + other works or subject matter other than works listed in Section 1(f) below, which, by + reason of the selection and arrangement of their contents, constitute intellectual + creations, in which the Work is included in its entirety in unmodified form along with + one or more other contributions, each constituting separate and independent works in + themselves, which together are assembled into a collective whole. A work that + constitutes a Collection will not be considered an Adaptation (as defined above) for + the purposes of this License. </simpara> - <para> - Copyright (c) <year> by <author's name or designee>. This - material may be distributed only subject to the terms and conditions set - forth in the Open Publication License, vX.Y or later (the latest version - is presently available at <link xlink:href="&url.opl;">&url.opl;</link> - </para> + </listitem> + + <listitem> <simpara> - The reference must be immediately followed with any options elected by - the author(s) and/or publisher of the document (see section VI). - Commercial redistribution of Open Publication-licensed material is - permitted. 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 name shall be as - large as the title of the work and cited as possessive with respect to - the title. + <emphasis>"Distribute"</emphasis> means to make available to the public the original + and copies of the Work or Adaptation, as appropriate, through sale or other transfer + of ownership. </simpara> - </section> + </listitem> - <section xml:id="opl.copyright"> - <title>II. COPYRIGHT</title> + <listitem> <simpara> - The copyright to each Open Publication is owned by its author(s) or designee. + <emphasis>"Licensor"</emphasis> means the individual, individuals, entity or entities + that offer(s) the Work under the terms of this License. </simpara> - </section> + </listitem> - <section xml:id="opl.scope"> - <title>III. SCOPE OF LICENSE</title> + <listitem> <simpara> - The following license terms apply to all Open Publication works, unless - otherwise explicitly stated in the document. + <emphasis>"Work"</emphasis> means the literary and/or artistic work offered under the + terms of this License including without limitation any production in the literary, + scientific and artistic domain, whatever may be the mode or form of its expression + including digital form, such as a book, pamphlet and other writing; a lecture, + address, sermon or other work of the same nature; a dramatic or dramatico-musical + work; a choreographic work or entertainment in dumb show; a musical composition with + or without words; a cinematographic work to which are assimilated works expressed by a + process analogous to cinematography; a work of drawing, painting, architecture, + sculpture, engraving or lithography; a photographic work to which are assimilated + works expressed by a process analogous to photography; a work of applied art; an + illustration, map, plan, sketch or three-dimensional work relative to geography, + topography, architecture or science; a performance; a broadcast; a phonogram; a + compilation of data to the extent it is protected as a copyrightable work; or a work + performed by a variety or circus performer to the extent it is not otherwise + considered a literary or artistic work. </simpara> + </listitem> + + <listitem> <simpara> - 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. + <emphasis>"You"</emphasis> means an individual or entity exercising rights under this + License who has not previously violated the terms of this License with respect to the + Work, or who has received express permission from the Licensor to exercise rights + under this License despite a previous violation. </simpara> + </listitem> + + <listitem> <simpara> - SEVERABILITY. If any part of this license is found to be unenforceable in - any jurisdiction, the remaining portions of the license remain in force. + <emphasis>"Publicly Perform"</emphasis> means to perform public recitations of the + Work and to communicate to the public those public recitations, by any means or + process, including by wire or wireless means or public digital performances; to make + available to the public Works in such a way that members of the public may access + these Works from a place and at a place individually chosen by them; to perform the + Work to the public by any means or process and the communication to the public of the + performances of the Work, including by public digital performance; to broadcast and + rebroadcast the Work by any means including signs, sounds or images. </simpara> + </listitem> + + <listitem> <simpara> - NO WARRANTY. Open Publication works are licensed and provided "as is" - without warranty of any kind, express or implied, including, but not - limited to, the implied warranties of merchantability and fitness for a - particular purpose or a warranty of non-infringement. + <emphasis>"Reproduce"</emphasis> means to make copies of the Work by any means + including without limitation by sound or visual recordings and the right of fixation + and reproducing fixations of the Work, including storage of a protected performance or + phonogram in digital form or other electronic medium. </simpara> - </section> + </listitem> + </orderedlist> + <simpara> + <emphasis>2. Fair Dealing Rights.</emphasis> Nothing in this License is intended to + reduce, limit, or restrict any uses free from copyright or rights arising from + limitations or exceptions that are provided for in connection with the copyright + protection under copyright law or other applicable laws. + </simpara> - <section xml:id="opl.modified.works"> - <title>IV. REQUIREMENTS ON MODIFIED WORKS</title> - <para> - All modified versions of documents covered by this license, including - translations, anthologies, compilations and partial documents, must meet - the following requirements: - </para> - <para> - <orderedlist> - <listitem> - <simpara> - The modified version must be labeled as such. - </simpara> - </listitem> - <listitem> - <simpara> - The person making the modifications must be identified and the - modifications dated. - </simpara> - </listitem> - <listitem> - <simpara> - Acknowledgement of the original author and publisher if applicable must - be retained according to normal academic citation practices. - </simpara> - </listitem> - <listitem> - <simpara> - The location of the original unmodified document must be identified. - </simpara> - </listitem> - <listitem> - <simpara> - 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. - </simpara> - </listitem> - </orderedlist> - </para> - </section> + <simpara> + <emphasis>3. License Grant.</emphasis> Subject to the terms and conditions of this + License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual + (for the duration of the applicable copyright) license to exercise the rights in the + Work as stated below: + </simpara> + <orderedlist> + <listitem> + <simpara> + to Reproduce the Work, to incorporate the Work into one or more Collections, and to + Reproduce the Work as incorporated in the Collections; + </simpara> + </listitem> - <section xml:id="opl.good-practice"> - <title>V. GOOD-PRACTICE RECOMMENDATIONS</title> + <listitem> <simpara> - In addition to the requirements of this license, it is requested from and - strongly recommended of redistributors that: + to create and Reproduce Adaptations provided that any such Adaptation, including any + translation in any medium, takes reasonable steps to clearly label, demarcate or + otherwise identify that changes were made to the original Work. For example, a + translation could be marked "The original work was translated from English to + Spanish," or a modification could indicate "The original work has been modified."; </simpara> + </listitem> + + <listitem> + <simpara> + to Distribute and Publicly Perform the Work including as incorporated in Collections; + and, + </simpara> + </listitem> + + <listitem> + <simpara> + to Distribute and Publicly Perform Adaptations. + </simpara> + </listitem> + + <listitem> <para> + For the avoidance of doubt: <orderedlist> <listitem> <simpara> - 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. + <emphasis>Non-waivable Compulsory License Schemes.</emphasis> In those + jurisdictions in which the right to collect royalties through any statutory or + compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive + right to collect such royalties for any exercise by You of the rights granted under + this License; </simpara> </listitem> + <listitem> <simpara> - All substantive modifications (including deletions) be either clearly - marked up in the document or else described in an attachment to the - document. + <emphasis>Waivable Compulsory License Schemes.</emphasis> In those jurisdictions in + which the right to collect royalties through any statutory or compulsory licensing + scheme can be waived, the Licensor waives the exclusive right to collect such + royalties for any exercise by You of the rights granted under this License; and, </simpara> </listitem> + <listitem> <simpara> - 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). + <emphasis>Voluntary License Schemes.</emphasis> The Licensor waives the right to + collect royalties, whether individually or, in the event that the Licensor is a + member of a collecting society that administers voluntary licensing schemes, via + that society, from any exercise by You of the rights granted under this License. </simpara> </listitem> </orderedlist> </para> - </section> + </listitem> + </orderedlist> + <simpara> + The above rights may be exercised in all media and formats whether now known or + hereafter devised. The above rights include the right to make such modifications as are + technically necessary to exercise the rights in other media and formats. Subject to + Section 8(f), all rights not expressly granted by Licensor are hereby reserved. + </simpara> + + <simpara> + <emphasis>4. Restrictions</emphasis>. The license granted in Section 3 above is + expressly made subject to and limited by the following restrictions: + </simpara> + + <orderedlist> + <listitem> + <simpara> + You may Distribute or Publicly Perform the Work only under the terms of this License. + You must include a copy of, or the Uniform Resource Identifier (URI) for, this License + with every copy of the Work You Distribute or Publicly Perform. You may not offer or + impose any terms on the Work that restrict the terms of this License or the ability of + the recipient of the Work to exercise the rights granted to that recipient under the + terms of the License. You may not sublicense the Work. You must keep intact all + notices that refer to this License and to the disclaimer of warranties with every copy + of the Work You Distribute or Publicly Perform. When You Distribute or Publicly + Perform the Work, You may not impose any effective technological measures on the Work + that restrict the ability of a recipient of the Work from You to exercise the rights + granted to that recipient under the terms of the License. This Section 4(a) applies to + the Work as incorporated in a Collection, but this does not require the Collection + apart from the Work itself to be made subject to the terms of this License. If You + create a Collection, upon notice from any Licensor You must, to the extent + practicable, remove from the Collection any credit as required by Section 4(b), as + requested. If You create an Adaptation, upon notice from any Licensor You must, to the + extent practicable, remove from the Adaptation any credit as required by Section 4(b), + as requested. + </simpara> + </listitem> + + <listitem> + <simpara> + If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You + must, unless a request has been made pursuant to Section 4(a), keep intact all + copyright notices for the Work and provide, reasonable to the medium or means You are + utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if + supplied, and/or if the Original Author and/or Licensor designate another party or + parties (e.g., a sponsor institute, publishing entity, journal) for attribution + ("Attribution Parties") in Licensor's copyright notice, terms of service or by other + reasonable means, the name of such party or parties; (ii) the title of the Work if + supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor + specifies to be associated with the Work, unless such URI does not refer to the + copyright notice or licensing information for the Work; and (iv) , consistent with + Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work + in the Adaptation (e.g., "French translation of the Work by Original Author," or + "Screenplay based on original Work by Original Author"). The credit required by this + Section 4 (b) may be implemented in any reasonable manner; provided, however, that in + the case of a Adaptation or Collection, at a minimum such credit will appear, if a + credit for all contributing authors of the Adaptation or Collection appears, then as + part of these credits and in a manner at least as prominent as the credits for the + other contributing authors. For the avoidance of doubt, You may only use the credit + required by this Section for the purpose of attribution in the manner set out above + and, by exercising Your rights under this License, You may not implicitly or + explicitly assert or imply any connection with, sponsorship or endorsement by the + Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your + use of the Work, without the separate, express prior written permission of the + Original Author, Licensor and/or Attribution Parties. + </simpara> + </listitem> + + <listitem> + <simpara> + Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted + by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by + itself or as part of any Adaptations or Collections, You must not distort, mutilate, + modify or take other derogatory action in relation to the Work which would be + prejudicial to the Original Author's honor or reputation. Licensor agrees that in + those jurisdictions (e.g. Japan), in which any exercise of the right granted in + Section 3(b) of this License (the right to make Adaptations) would be deemed to be a + distortion, mutilation, modification or other derogatory action prejudicial to the + Original Author's honor and reputation, the Licensor will waive or not assert, as + appropriate, this Section, to the fullest extent permitted by the applicable national + law, to enable You to reasonably exercise Your right under Section 3(b) of this + License (right to make Adaptations) but not otherwise. + </simpara> + </listitem> + </orderedlist> + + <simpara><emphasis>5. Representations, Warranties and Disclaimer</emphasis></simpara> + <simpara> + UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK + AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, + EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF + TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE + ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, + WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED + WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + </simpara> + + <simpara> + <emphasis>6. Limitation on Liability.</emphasis> EXCEPT TO THE EXTENT REQUIRED BY + APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY + SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS + LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF + SUCH DAMAGES. + </simpara> + + <simpara><emphasis>7. Termination.</emphasis></simpara> + <orderedlist> + + <listitem> + <simpara> + This License and the rights granted hereunder will terminate automatically upon any + breach by You of the terms of this License. Individuals or entities who have received + Adaptations or Collections from You under this License, however, will not have their + licenses terminated provided such individuals or entities remain in full compliance + with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of + this License. + </simpara> + </listitem> + + <listitem> + <simpara> + Subject to the above terms and conditions, the license granted here is perpetual (for + the duration of the applicable copyright in the Work). Notwithstanding the above, + Licensor reserves the right to release the Work under different license terms or to + stop distributing the Work at any time; provided, however that any such election will + not serve to withdraw this License (or any other license that has been, or is required + to be, granted under the terms of this License), and this License will continue in + full force and effect unless terminated as stated above. + </simpara> + </listitem> + </orderedlist> - <section xml:id="opl.options"> - <title>VI. LICENSE OPTIONS</title> + <simpara><emphasis>8. Miscellaneous</emphasis></simpara> + <orderedlist> + <listitem> + <simpara> + Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor + offers to the recipient a license to the Work on the same terms and conditions as the + license granted to You under this License. + </simpara> + </listitem> + + <listitem> <simpara> - 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 must be included with the license (or its incorporation by - reference) in derived works. + Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the + recipient a license to the original Work on the same terms and conditions as the + license granted to You under this License. </simpara> + </listitem> + + <listitem> <simpara> - A. To prohibit distribution of substantively modified versions without the - explicit permission of the author(s). "Substantive modification" is - defined as a change to the semantic content of the document, and excludes - mere changes in format or typographical corrections. + If any provision of this License is invalid or unenforceable under applicable law, it + shall not affect the validity or enforceability of the remainder of the terms of this + License, and without further action by the parties to this agreement, such provision + shall be reformed to the minimum extent necessary to make such provision valid and + enforceable. </simpara> + </listitem> + + <listitem> <simpara> - To accomplish this, add the phrase `Distribution of substantively modified - versions of this document is prohibited without the explicit permission of - the copyright holder.' to the license reference or copy. + No term or provision of this License shall be deemed waived and no breach consented to + unless such waiver or consent shall be in writing and signed by the party to be + charged with such waiver or consent </simpara> + </listitem> + + <listitem> <simpara> - B. 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. + This License constitutes the entire agreement between the parties with respect to the + Work licensed here. There are no understandings, agreements or representations with + respect to the Work not specified here. Licensor shall not be bound by any additional + provisions that may appear in any communication from You. This License may not be + modified without the mutual written agreement of the Licensor and You. </simpara> + </listitem> + + <listitem> <simpara> - To accomplish this, add the phrase '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.' to the license - reference or copy. + The rights granted under, and the subject matter referenced, in this License were + drafted utilizing the terminology of the Berne Convention for the Protection of + Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of + 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty + of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These + rights and subject matter take effect in the relevant jurisdiction in which the + License terms are sought to be enforced according to the corresponding provisions of + the implementation of those treaty provisions in the applicable national law. If the + standard suite of rights granted under applicable copyright law includes additional + rights not granted under this License, such additional rights are deemed to be + included in the License; this License is not intended to restrict the license of any + rights under applicable law. </simpara> - </section> + </listitem> + </orderedlist> </appendix> + http://cvs.php.net/viewvc.cgi/phpdoc/entities/global.ent?r1=1.332&r2=1.333&diff_format=u Index: phpdoc/entities/global.ent diff -u phpdoc/entities/global.ent:1.332 phpdoc/entities/global.ent:1.333 --- phpdoc/entities/global.ent:1.332 Thu Jul 17 12:41:35 2008 +++ phpdoc/entities/global.ent Sun Jul 20 20:14:40 2008 @@ -1,6 +1,6 @@ <!-- -*- SGML -*- - $Id: global.ent,v 1.332 2008/07/17 12:41:35 tony2001 Exp $ + $Id: global.ent,v 1.333 2008/07/20 20:14:40 bjori Exp $ Contains global "macros" for all the XML documents. @@ -32,6 +32,7 @@ <!ENTITY url.calendar "http://www.fourmilab.ch/documents/calendar/";> <!ENTITY url.calendar.jd "http://www.hermetic.ch/cal_stud/jdn.htm";> <!ENTITY url.caudium "http://caudium.net/";> +<!ENTITY url.cc.by "http://creativecommons.org/licenses/by/3.0/";> <!ENTITY url.cert "http://www.cert.org/advisories/CA-1996-11.html";> <!ENTITY url.corba.universe "http://universe-phpext.sourceforge.net/";> <!ENTITY url.cdb "http://cr.yp.to/cdb.html";> @@ -280,7 +281,6 @@ <!ENTITY url.openssl "http://www.openssl.org/";> <!ENTITY url.openssl.binaries "http://www.openssl.org/related/binaries.html";> <!ENTITY url.openssl.ciphers "http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT";> -<!ENTITY url.opl "http://www.opencontent.org/openpub/";> <!ENTITY url.oracle "http://www.oracle.com/";> <!ENTITY url.oracle.instant.client "http://www.oracle.com/technology/tech/oci/instantclient/instantclient.html";> <!ENTITY url.oracle.oic.connect "http://download-west.oracle.com/docs/cd/B12037_01/network.101/b10775/naming.htm#i498306";>
