Conservancy/voting
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HTML fixes

Browse source
This commit is contained in:
Owen Taylor 2005-08-18 20:56:26 +00:00
parent 79998a955b
commit 32932759a5
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
foundation.gnome.org/licensing/guidelines/index.wml
View file

@ -76,8 +76,8 @@ GNOME Trademarks at www.gnome.org to verify exactly how the marks should appear.
<li><u>Use Proper Notice of Trademark.</u> <li><u>Use Proper Notice of Trademark.</u>
<p> <p>
Identify GNOME Trademarks appropriately as a registered trademark (using the circled-R Identify GNOME Trademarks appropriately as a registered trademark (using the circled-R
symbol – &#xae;), or as an unregistered trademark (using the &ldquo;TM&rdqou; symbol – &#x2122;) or an symbol – &reg;), or as an unregistered trademark (using the &ldquo;TM&rdqou; symbol - &trade;) or an
unregistered service mark (using the &ldquo;SM&rdqou; symbol – &#x2120;). Check the list of GNOME unregistered service mark (using the &ldquo;SM&rdqou; symbol - &#x2120;). Check the list of GNOME
Trademarks found at <a href="http://foundation.gnome.org/licensing/">http://foundation.gnome.org/licensing/</a> to verify the correct symbol to use for each name. Trademarks found at <a href="http://foundation.gnome.org/licensing/">http://foundation.gnome.org/licensing/</a> to verify the correct symbol to use for each name.
</p> </p>
</li> </li>
@ -106,7 +106,9 @@ that suggests GNOME affiliation, sponsorship or certification of the publication
</ul> </ul>
</li> </li>
</ul> </ul>
3. <u>Prohibited Use</u>: </li>
<li><u>Prohibited Use</u>:
<ul>
<li> Do not make reference to GNOME or GNOME Trademarks in a manner that is false or <li> Do not make reference to GNOME or GNOME Trademarks in a manner that is false or
misleading.</li> misleading.</li>
<li> Do not combine or use a GNOME Trademark with your company's product or service <li> Do not combine or use a GNOME Trademark with your company's product or service
@ -126,7 +128,9 @@ service name.</li>
<li> Do not use a GNOME logo on posters, brochures, signs, their websites, or other materials <li> Do not use a GNOME logo on posters, brochures, signs, their websites, or other materials
to promote a book about GNOME software, products or services.</li> to promote a book about GNOME software, products or services.</li>
<li> Do not alter a GNOME word mark or logo in any way.</li> <li> Do not alter a GNOME word mark or logo in any way.</li>
<l><u>Revision of Guidelines</u> </ul>
</li>
<li><u>Revision of Guidelines</u>
<p> <p>
When these trademark guidelines are revised, the updated version will be posted at When these trademark guidelines are revised, the updated version will be posted at
<a href="http://foundation.gnome.org/licensing/">http://foundation.gnome.org/licensing/</a>. <a href="http://foundation.gnome.org/licensing/">http://foundation.gnome.org/licensing/</a>.
@ -135,6 +139,7 @@ When these trademark guidelines are revised, the updated version will be posted
To obtain permission for proposed use of the GNOME trademarks, contact: To obtain permission for proposed use of the GNOME trademarks, contact:
the GNOME Foundation at <a href="mailto:licensing@gnome.org>mailto:licensing@gnome.org.</a> the GNOME Foundation at <a href="mailto:licensing@gnome.org>mailto:licensing@gnome.org.</a>
</p> </p>
</li>
</ol> </ol>
</body> </body>
</html> </html>

7
foundation.gnome.org/licensing/index.wml
View file

@ -12,8 +12,7 @@
<p> <p>
One of the functions that the GNOME Foundation provides is to One of the functions that the GNOME Foundation provides is to
act as the legal owner for such GNOME project assets as the act as the legal owner for such GNOME project assets as the
GNOME name and the GNOME foot. These trademarks are some of GNOME name and the GNOME foot. We must protect these trademarks in
GNOME's most important assets. We must protect the trademarks in
order to keep them. Therefore, we have some guidelines for their order to keep them. Therefore, we have some guidelines for their
use and a standard agreement for user groups. These cover many use and a standard agreement for user groups. These cover many
common situations; if you need permission to use the GNOME common situations; if you need permission to use the GNOME
@ -25,8 +24,8 @@
</p> </p>
<ul> <ul>
<li>The word GNOME&#x2122;</li> <li>The word GNOME&#x2122;</li>
<li>The GNOME foot logo: <link rel="icon" type="image/png" href="http://www.gnome.org/img/logo/text-64.png"/></li> <li>The GNOME foot logo: <img src="http://www.gnome.org/img/logo/text-64" rel="GNOME Foot Logo/></li>
<ul> </ul>
<h2>Third-party usage guidelines</h2> <h2>Third-party usage guidelines</h2>
<p> <p>
Under the law, “fair use” of trademarks is allowed (for example, Under the law, “fair use” of trademarks is allowed (for example,