* [gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en: inserts.xml
@ 2011-06-19 19:41 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 4+ messages in thread
From: Robin H. Johnson (robbat2) @ 2011-06-19 19:41 UTC (permalink / raw
To: gentoo-doc-cvs
robbat2 11/06/19 19:41:54
Modified: inserts.xml
Log:
Bug #369181: Update wording of license document footer, by assent of trustees in meeting.
Revision Changes Path
1.3 xml/htdocs/doc/en/inserts.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/inserts.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/inserts.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/inserts.xml?r1=1.2&r2=1.3
Index: inserts.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/inserts.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -p -w -b -B -u -u -r1.2 -r1.3
--- inserts.xml 28 Sep 2008 14:00:31 -0000 1.2
+++ inserts.xml 19 Jun 2011 19:41:54 -0000 1.3
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE inserts SYSTEM "/dtd/inserts.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/inserts.xml,v 1.2 2008/09/28 14:00:31 neysx Exp $-->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/inserts.xml,v 1.3 2011/06/19 19:41:54 robbat2 Exp $-->
<inserts lang="en">
<version>2</version>
@@ -28,9 +28,12 @@
<insert name="ShowFullHBTip">View all handbook in one page</insert>
<insert name="Home">Home</insert>
<insert name="License">
- The contents of this document are licensed under the <uri
- link="http://creativecommons.org/licenses/by-sa/2.5">Creative Commons -
- Attribution / Share Alike</uri> license.
+ The contents of this document, unless otherwise expressly stated, are
+ licensed under the <uri
+ link="http://creativecommons.org/licenses/by-sa/2.5">CC-BY-SA-2.5
+ license</uri> license. The <uri
+ link="http://www.gentoo.org/main/en/name-logo.xml">Gentoo Name and Logo
+ Usage Guidelines</uri> apply.
</insert>
<insert name="hb_file">Link to other book part not available</insert>
<!-- Metadoc stuff -->
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en: inserts.xml
@ 2011-06-19 22:15 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 4+ messages in thread
From: Robin H. Johnson (robbat2) @ 2011-06-19 22:15 UTC (permalink / raw
To: gentoo-doc-cvs
robbat2 11/06/19 22:15:44
Modified: inserts.xml
Log:
Fix whitespace and doubling of "license".
Revision Changes Path
1.4 xml/htdocs/doc/en/inserts.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/inserts.xml?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/inserts.xml?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/inserts.xml?r1=1.3&r2=1.4
Index: inserts.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/inserts.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -p -w -b -B -u -u -r1.3 -r1.4
--- inserts.xml 19 Jun 2011 19:41:54 -0000 1.3
+++ inserts.xml 19 Jun 2011 22:15:44 -0000 1.4
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE inserts SYSTEM "/dtd/inserts.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/inserts.xml,v 1.3 2011/06/19 19:41:54 robbat2 Exp $-->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/inserts.xml,v 1.4 2011/06/19 22:15:44 robbat2 Exp $-->
<inserts lang="en">
- <version>2</version>
+ <version>3</version>
<insert name="Content">Content</insert>
<insert name="Credits">Credits</insert>
<insert name="Updated">Updated <docdate/></insert>
@@ -28,12 +28,7 @@
<insert name="ShowFullHBTip">View all handbook in one page</insert>
<insert name="Home">Home</insert>
<insert name="License">
- The contents of this document, unless otherwise expressly stated, are
- licensed under the <uri
- link="http://creativecommons.org/licenses/by-sa/2.5">CC-BY-SA-2.5
- license</uri> license. The <uri
- link="http://www.gentoo.org/main/en/name-logo.xml">Gentoo Name and Logo
- Usage Guidelines</uri> apply.
+ The contents of this document, unless otherwise expressly stated, are licensed under the <uri link="http://creativecommons.org/licenses/by-sa/2.5">CC-BY-SA-2.5</uri> license. The <uri link="http://www.gentoo.org/main/en/name-logo.xml"> Gentoo Name and Logo Usage Guidelines </uri> apply.
</insert>
<insert name="hb_file">Link to other book part not available</insert>
<!-- Metadoc stuff -->
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en: inserts.xml
@ 2011-11-29 18:51 Sven Vermeulen (swift)
0 siblings, 0 replies; 4+ messages in thread
From: Sven Vermeulen (swift) @ 2011-11-29 18:51 UTC (permalink / raw
To: gentoo-doc-cvs
swift 11/11/29 18:51:19
Modified: inserts.xml
Log:
Support 3.0 license string texts
Within the stylesheets, the code uses the XML fragments in the inserts.xml file to display the license info. This is done
on a key/value pair approach, currently only supporting "License". In this update, fragments "License-2.5" and
"License-3.0" are added to support "<license version="2.5" />" and "<license version="3.0" />" entries.
Revision Changes Path
1.5 xml/htdocs/doc/en/inserts.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/inserts.xml?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/inserts.xml?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/inserts.xml?r1=1.4&r2=1.5
Index: inserts.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/inserts.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- inserts.xml 19 Jun 2011 22:15:44 -0000 1.4
+++ inserts.xml 29 Nov 2011 18:51:19 -0000 1.5
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE inserts SYSTEM "/dtd/inserts.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/inserts.xml,v 1.4 2011/06/19 22:15:44 robbat2 Exp $-->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/inserts.xml,v 1.5 2011/11/29 18:51:19 swift Exp $-->
<inserts lang="en">
- <version>3</version>
+ <version>4</version>
<insert name="Content">Content</insert>
<insert name="Credits">Credits</insert>
<insert name="Updated">Updated <docdate/></insert>
@@ -30,6 +30,13 @@
<insert name="License">
The contents of this document, unless otherwise expressly stated, are licensed under the <uri link="http://creativecommons.org/licenses/by-sa/2.5">CC-BY-SA-2.5</uri> license. The <uri link="http://www.gentoo.org/main/en/name-logo.xml"> Gentoo Name and Logo Usage Guidelines </uri> apply.
</insert>
+ <insert name="License-2.5">
+ The contents of this document, unless otherwise expressly stated, are licensed under the <uri link="http://creativecommons.org/licenses/by-sa/2.5">CC-BY-SA-2.5</uri> license. The <uri link="http://www.gentoo.org/main/en/name-logo.xml"> Gentoo Name and Logo Usage Guidelines </uri> apply.
+ </insert>
+ <insert name="License-3.0">
+ The contents of this document, unless otherwise expressly stated, are
+ licensed under the <uri link="http://creativecommons.org/licenses/by-sa/3.0">CC-BY-SA-3.0</uri> license. The <uri link="http://www.gentoo.org/main/en/name-logo.xml"> Gentoo Name and Logo Usage Guidelines </uri> apply.
+ </insert>
<insert name="hb_file">Link to other book part not available</insert>
<!-- Metadoc stuff -->
<insert name="GLinuxDocCat">Gentoo Linux Documentation Categories</insert>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en: inserts.xml
@ 2011-12-31 21:28 Sven Vermeulen (swift)
0 siblings, 0 replies; 4+ messages in thread
From: Sven Vermeulen (swift) @ 2011-12-31 21:28 UTC (permalink / raw
To: gentoo-doc-cvs
swift 11/12/31 21:28:15
Modified: inserts.xml
Log:
Change "Updated" to "Page updated" so no confusion arises on the handbook up-to-dateness, cfr discussion on gentoo-doc@gentoo.org
Revision Changes Path
1.6 xml/htdocs/doc/en/inserts.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/inserts.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/inserts.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/inserts.xml?r1=1.5&r2=1.6
Index: inserts.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/inserts.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- inserts.xml 29 Nov 2011 18:51:19 -0000 1.5
+++ inserts.xml 31 Dec 2011 21:28:15 -0000 1.6
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE inserts SYSTEM "/dtd/inserts.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/inserts.xml,v 1.5 2011/11/29 18:51:19 swift Exp $-->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/inserts.xml,v 1.6 2011/12/31 21:28:15 swift Exp $-->
<inserts lang="en">
- <version>4</version>
+ <version>5</version>
<insert name="Content">Content</insert>
<insert name="Credits">Credits</insert>
- <insert name="Updated">Updated <docdate/></insert>
+ <insert name="Updated">Page updated <docdate/></insert>
<insert name="Outdated">The <uri link="$originalversion">original version</uri> of this document was last updated <docdate/></insert>
<!-- Doc not in /doc/LL/metadoc.xml -->
<insert name="NoIndex">This translation is not maintained anymore</insert>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-12-31 21:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-19 22:15 [gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en: inserts.xml Robin H. Johnson (robbat2)
-- strict thread matches above, loose matches on Subject: below --
2011-12-31 21:28 Sven Vermeulen (swift)
2011-11-29 18:51 Sven Vermeulen (swift)
2011-06-19 19:41 Robin H. Johnson (robbat2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox