dabbott 15/01/13 15:55:28 Modified: name-logo.xml Log: removed the word 'content' and replaced it with 'works' Bug 536484
Revision Changes Path 1.11 xml/htdocs/main/en/name-logo.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/main/en/name-logo.xml?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/main/en/name-logo.xml?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/main/en/name-logo.xml?r1=1.10&r2=1.11 Index: name-logo.xml =================================================================== RCS file: /var/cvsroot/gentoo/xml/htdocs/main/en/name-logo.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- name-logo.xml 26 Apr 2011 18:18:24 -0000 1.10 +++ name-logo.xml 13 Jan 2015 15:55:28 -0000 1.11 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE guide SYSTEM "/dtd/guide.dtd"> -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/main/en/name-logo.xml,v 1.10 2011/04/26 18:18:24 quantumsummers Exp $ --> +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/main/en/name-logo.xml,v 1.11 2015/01/13 15:55:28 dabbott Exp $ --> -<guide link="/main/en/name-logo.xml" lang="en"> +<guide> <title>Gentoo Name and Logo Usage Guidelines</title> <author> @@ -14,12 +14,12 @@ This document covers the guidelines on the Gentoo Name and Logo usage. </abstract> -<!-- The content of this document is licensed under the CC-BY-SA license --> +<!-- The works of this document is licensed under the CC-BY-SA license --> <!-- See http://creativecommons.org/licenses/by-sa/2.5 --> <license/> -<version>1.8</version> -<date>2005-12-11</date> +<version>11</version> +<date>2015-01-13</date> <chapter> <title>Preliminaries</title> @@ -62,7 +62,7 @@ <body> <p> -Any content that is copyright Gentoo Foundation, Inc. +Any works that is copyright Gentoo Foundation, Inc. </p> </body> @@ -118,7 +118,7 @@ <body> <p> -You are permitted to use the Gentoo name in computer-related content, provided +You are permitted to use the Gentoo name in computer-related works, provided that: </p> @@ -137,7 +137,7 @@ </li> <li> <e> - you clearly state that the content, project, site, product or any other + you clearly state that the works, project, site, product or any other type of item with which the "Gentoo" name is associated is not part of the Gentoo project and is not directed or managed by Gentoo Foundation, Inc. </e> @@ -174,7 +174,7 @@ <p> Commercial use of the Gentoo "g" logo and Gentoo artwork is allowed for <e>any software or computer hardware product</e> that <e>contains</e> or is <e>based -upon</e> content produced by the Gentoo project, or any project or service +upon</e> works produced by the Gentoo project, or any project or service referencing Gentoo or the Gentoo Project, provided that the following conditions are met: </p> @@ -186,7 +186,7 @@ </li> <li> the artwork used is <e>not</e> the primary (largest) mark displayed on the - product, and is thus intended to convey that the product contains "content + product, and is thus intended to convey that the product contains "works produced by the Gentoo project", but is <e>not itself a product being sold or supported</e> by Gentoo Foundation, Inc. </li> @@ -216,13 +216,13 @@ Inc., and that any Gentoo artwork is copyright Gentoo Foundation, Inc, and, </li> <li> - the "g" logo and Gentoo artwork are used in content that pertain to "the + the "g" logo and Gentoo artwork are used in works that pertain to "the Gentoo project", as directed by the Gentoo Foundation, Inc., and not any effort outside or beyond the authority of the Gentoo Foundation, Inc., and </li> <li> <e> - you clearly state that the content, project, site, product or any other + you clearly state that the works, project, site, product or any other type of item with which the "g" logo or Gentoo artwork is associated is not part of the Gentoo project and is not directed or managed by Gentoo Foundation, Inc.
