swift 11/11/29 19:01:23 Modified: doc-policy.xml Log: Introduce support for version 3.0 in our documents From the GDP point-of-view, the CC-BY-SA 3.0 license also fully matches the projects' principles. The original choice for 2.5 was because it was, at that time, the latest version. With the Gentoo wiki now using CC-BY-SA 3.0, we now also support this version, allowing for documents to be replicated between the two sources.
Revision Changes Path 1.27 xml/htdocs/proj/en/gdp/doc/doc-policy.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/gdp/doc/doc-policy.xml?rev=1.27&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/gdp/doc/doc-policy.xml?rev=1.27&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/gdp/doc/doc-policy.xml?r1=1.26&r2=1.27 Index: doc-policy.xml =================================================================== RCS file: /var/cvsroot/gentoo/xml/htdocs/proj/en/gdp/doc/doc-policy.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- doc-policy.xml 29 Sep 2011 12:55:51 -0000 1.26 +++ doc-policy.xml 29 Nov 2011 19:01:23 -0000 1.27 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding="UTF-8"?> -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/gdp/doc/doc-policy.xml,v 1.26 2011/09/29 12:55:51 cam Exp $ --> +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/gdp/doc/doc-policy.xml,v 1.27 2011/11/29 19:01:23 swift Exp $ --> <!DOCTYPE guide SYSTEM "/dtd/guide.dtd"> <guide> @@ -26,8 +26,8 @@ <!-- See http://creativecommons.org/licenses/by-sa/2.5 --> <license/> -<version>7</version> -<date>2011-09-29</date> +<version>8</version> +<date>2011-11-29</date> <chapter> <title>Introduction</title> @@ -163,8 +163,9 @@ <p> Every document published by the Gentoo Documentation Project must be licensed by the <uri -link="http://creativecommons.org/licenses/by-sa/2.5/";>Creative Commons -Attribution-ShareAlike License</uri>. +link="http://creativecommons.org/licenses/by-sa/3.0/";>Creative Commons +Attribution-ShareAlike License</uri>, preferably the latest version (although +earlier versions are supported too). </p> <p> @@ -177,12 +178,18 @@ </abstract> <i> <!-- The content of this document is licensed under the CC-BY-SA license --> -<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> -<license/> +<!-- See http://creativecommons.org/licenses/by-sa/3.0 --> +<license version="3.0"/> </i> <version>...</version> </pre> +<p> +If the 2.5 version is used, the tag can be either <c><license /></c> or +<c><license version="2.5" /></c>. In either case should the comment be +updated to refer to the correct version URL. +</p> + </body> </section> <section>
