diff options
| author | David Prévot <taffit> | 2013-01-19 18:31:32 +0000 |
|---|---|---|
| committer | David Prévot <taffit> | 2013-01-19 18:31:32 +0000 |
| commit | fd5cddf6a94acd14262c7ab3bd71f009235e391a (patch) | |
| tree | 0d9c46f193aceff7d84318d8d7dfea00ed413918 /english/trademark.wml | |
| parent | 28841f2b2971580cee0d10ee3b6231f2c2f798f5 (diff) | |
Fix some tags and a plural form
CVS version numbers
english/trademark.wml: 1.23 -> 1.24
Diffstat (limited to 'english/trademark.wml')
| -rw-r--r-- | english/trademark.wml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/english/trademark.wml b/english/trademark.wml index 1ebd0ebbf7c..8cff3c404e6 100644 --- a/english/trademark.wml +++ b/english/trademark.wml @@ -72,7 +72,7 @@ prohibited.</p> <li>You can use Debian trademarks to make true factual statements about Debian or communicate compatibility with your product truthfully.</li> - <li>Your intended use qualifies as "nominative fair use" of the Debian + <li>Your intended use qualifies as <q>nominative fair use</q> of the Debian trademarks, i.e., merely identifying that you are talking about Debian in a text, without suggesting sponsorship or endorsement.</li> @@ -125,7 +125,7 @@ prohibited.</p> project.</li> <li>Acknowledge Software in the Public Interest, Inc.'s ownership of the - Debian trademark prominently.</p> + Debian trademark prominently. <p><em>Example:</em></p> @@ -134,7 +134,7 @@ prohibited.</p> </li> <li>Include a disclaimer of sponsorship, affiliation, or endorsement by - Debian on your website and on all related printed materials.</p> + Debian on your website and on all related printed materials. <p><em>Example:</em></p> @@ -181,7 +181,7 @@ available at <url http://www.debian.org/trademark>.</p> <li>Any scaling must retain the original proportions of the logo. <li>Do not use the Debian logos as part of your company logo or product logo - or branding itself. It can be used as part of a page describing your + or branding itself. They can be used as part of a page describing your products or services. <li>You need not ask us for permission to use logos on your own website @@ -189,10 +189,10 @@ available at <url http://www.debian.org/trademark>.</p> </ul> - +<p> For any queries with respect to these guidelines, please send an email to <email "trademark@debian.org">. - +</p> <toc-add-entry name="licenses">Organisations Licensed to Use Debian Trademarks</toc-add-entry> |