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 -->