[gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en: xml-guide.xml

[Sven Vermeulen (swift)]

swift       11/11/29 19:02:45

  Modified:             xml-guide.xml
  Log:
  Document the use of the "<license version="3.0"/>" tag
  
  With CC-BY-SA 3.0 now allowed for documents, we document this approach in the XML Guide.

Revision  Changes    Path
1.71                 xml/htdocs/doc/en/xml-guide.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xml-guide.xml?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xml-guide.xml?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/xml-guide.xml?r1=1.70&r2=1.71

Index: xml-guide.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/xml-guide.xml,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- xml-guide.xml	6 Dec 2010 11:27:27 -0000	1.70
+++ xml-guide.xml	29 Nov 2011 19:02:45 -0000	1.71
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xml-guide.xml,v 1.70 2010/12/06 11:27:27 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/xml-guide.xml,v 1.71 2011/11/29 19:02:45 swift Exp $ -->
 
 <guide>
 <title>Gentoo GuideXML Guide</title>
@@ -35,8 +35,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>11</version>
-<date>2010-12-06</date>
+<version>12</version>
+<date>2011-11-29</date>
 
 <chapter>
 <title>GuideXML basics</title>
@@ -110,11 +110,11 @@
 &lt;/abstract&gt;
 
 &lt;!-- The content of this document is licensed under the CC-BY-SA license --&gt;
-&lt;!-- See http://creativecommons.org/licenses/by-sa/2.5 --&gt;
-&lt;license/&gt;
+&lt;!-- See http://creativecommons.org/licenses/by-sa/3.0 --&gt;
+&lt;license version="3.0"/&gt;
 
 &lt;version&gt;<i>1</i>&lt;/version&gt;
-&lt;date&gt;<i>2010-12-25</i>&lt;/date&gt;
+&lt;date&gt;<i>2011-11-29</i>&lt;/date&gt;
 </pre>
 
 <p>
@@ -170,10 +170,12 @@
 </p>
 
 <p>
-Finally we have the <c>&lt;license/&gt;</c> tag, used to publish the document
-under the <uri link="http://creativecommons.org/licenses/by-sa/2.5/">Creative
+Finally we have the <c>&lt;license version="3.0"/&gt;</c> tag, used to publish
+the document under the <uri link="http://creativecommons.org/licenses/by-sa/3.0/">Creative
 Commons - Attribution / Share Alike</uri> license as required by the <uri
-link="/proj/en/gdp/doc/doc-policy.xml">Documentation Policy</uri>.
+link="/proj/en/gdp/doc/doc-policy.xml">Documentation Policy</uri>. Historically,
+the tag <c>&lt;license /&gt;</c> was used, which denoted the 2.5 version of the
+license. This is still accepted/allowed.
 </p>
 
 </body>
@@ -817,8 +819,8 @@
 &lt;/abstract&gt;
 
 &lt;!-- The content of this document is licensed under the CC-BY-SA license --&gt;
-&lt;!-- See http://creativecommons.org/licenses/by-sa/2.5 --&gt;
-&lt;license/&gt;
+&lt;!-- See http://creativecommons.org/licenses/by-sa/3.0 --&gt;
+&lt;license version="3.0"/&gt;
 
 &lt;version&gt;...&lt;/version&gt;
 &lt;date&gt;...&lt;/date&gt;
@@ -879,7 +881,7 @@
 &lt;!-- &#36;Header&#36; --&gt;
 
 &lt;!--  The content of this document is licensed under the CC-BY-SA license --&gt;
-&lt;!--  See http://creativecommons.org/licenses/by-sa/2.5 --&gt;
+&lt;!--  See http://creativecommons.org/licenses/by-sa/3.0 --&gt;
 
 &lt;sections&gt;