| 1 |
swift 11/11/29 19:01:23 |
| 2 |
|
| 3 |
Modified: doc-policy.xml |
| 4 |
Log: |
| 5 |
Introduce support for version 3.0 in our documents |
| 6 |
|
| 7 |
From the GDP point-of-view, the CC-BY-SA 3.0 license also fully matches the projects' principles. The original choice for |
| 8 |
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 |
| 9 |
this version, allowing for documents to be replicated between the two sources. |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.27 xml/htdocs/proj/en/gdp/doc/doc-policy.xml |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/gdp/doc/doc-policy.xml?rev=1.27&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/gdp/doc/doc-policy.xml?rev=1.27&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/gdp/doc/doc-policy.xml?r1=1.26&r2=1.27 |
| 17 |
|
| 18 |
Index: doc-policy.xml |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/proj/en/gdp/doc/doc-policy.xml,v |
| 21 |
retrieving revision 1.26 |
| 22 |
retrieving revision 1.27 |
| 23 |
diff -u -r1.26 -r1.27 |
| 24 |
--- doc-policy.xml 29 Sep 2011 12:55:51 -0000 1.26 |
| 25 |
+++ doc-policy.xml 29 Nov 2011 19:01:23 -0000 1.27 |
| 26 |
@@ -1,5 +1,5 @@ |
| 27 |
<?xml version='1.0' encoding="UTF-8"?> |
| 28 |
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/gdp/doc/doc-policy.xml,v 1.26 2011/09/29 12:55:51 cam Exp $ --> |
| 29 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/gdp/doc/doc-policy.xml,v 1.27 2011/11/29 19:01:23 swift Exp $ --> |
| 30 |
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd"> |
| 31 |
|
| 32 |
<guide> |
| 33 |
@@ -26,8 +26,8 @@ |
| 34 |
<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> |
| 35 |
<license/> |
| 36 |
|
| 37 |
-<version>7</version> |
| 38 |
-<date>2011-09-29</date> |
| 39 |
+<version>8</version> |
| 40 |
+<date>2011-11-29</date> |
| 41 |
|
| 42 |
<chapter> |
| 43 |
<title>Introduction</title> |
| 44 |
@@ -163,8 +163,9 @@ |
| 45 |
<p> |
| 46 |
Every document published by the Gentoo Documentation Project must be |
| 47 |
licensed by the <uri |
| 48 |
-link="http://creativecommons.org/licenses/by-sa/2.5/">Creative Commons |
| 49 |
-Attribution-ShareAlike License</uri>. |
| 50 |
+link="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons |
| 51 |
+Attribution-ShareAlike License</uri>, preferably the latest version (although |
| 52 |
+earlier versions are supported too). |
| 53 |
</p> |
| 54 |
|
| 55 |
<p> |
| 56 |
@@ -177,12 +178,18 @@ |
| 57 |
</abstract> |
| 58 |
<i> |
| 59 |
<!-- The content of this document is licensed under the CC-BY-SA license --> |
| 60 |
-<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> |
| 61 |
-<license/> |
| 62 |
+<!-- See http://creativecommons.org/licenses/by-sa/3.0 --> |
| 63 |
+<license version="3.0"/> |
| 64 |
</i> |
| 65 |
<version>...</version> |
| 66 |
</pre> |
| 67 |
|
| 68 |
+<p> |
| 69 |
+If the 2.5 version is used, the tag can be either <c><license /></c> or |
| 70 |
+<c><license version="2.5" /></c>. In either case should the comment be |
| 71 |
+updated to refer to the correct version URL. |
| 72 |
+</p> |
| 73 |
+ |
| 74 |
</body> |
| 75 |
</section> |
| 76 |
<section> |
Archives