diff options
| author | Stefano Zacchiroli <zack> | 2012-10-17 10:39:03 +0000 |
|---|---|---|
| committer | Stefano Zacchiroli <zack> | 2012-10-17 10:39:03 +0000 |
| commit | eff9c1c918bbaf046623787e8ca941df919dca92 (patch) | |
| tree | 764ee3fa96f32deaeaf8d4741cf43d94d2f73a56 /english/logos | |
| parent | 98a29651d41439668946505a056d3648f56d5377 (diff) | |
refer to the (former) "official" logo as "restricted" logo
refer to the (former) "open use" logo as "official"
update internal references accordingly
Implement the result of the -project discussion started at:
https://lists.debian.org/debian-project/2012/10/msg00002.html
in particular this patch has been discussed in the sub-thread started at:
https://lists.debian.org/debian-project/2012/10/msg00020.html
CVS version numbers
english/logos/index.wml: 1.65 -> 1.66
Diffstat (limited to 'english/logos')
| -rw-r--r-- | english/logos/index.wml | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/english/logos/index.wml b/english/logos/index.wml index 9a5a39f0736..274617643d7 100644 --- a/english/logos/index.wml +++ b/english/logos/index.wml @@ -1,14 +1,12 @@ #use wml::debian::template title="Debian logos" BARETITLE=true #include "$(ENGLISHDIR)/logos/index.data" -<p>Although Debian can be obtained for free and will always remain -that way, events such as the problem with the ownership of the -term “Linux” have shown that Debian needs to protect its -property from any use which could hurt its reputation.</p> - -<p>Debian has decided to create two logos: <a href="#official-use">one -logo</a> is for official Debian use; the <a href="#open-use">other -logo</a> falls under an open use type license.</p> +<p>Debian has two logos. The <a href="#open-use">official logo</a> (also known + as "open use logo") contains the well-known Debian <q>swirl</q> and best + represents the visual identity of the Debian Project. A separate, <a + href="#restricted-use">restricted-use logo</a>, also exists for use by the + Debian Project and its members only. To refer to Debian, please prefer the + open use logo.</p> <hr> @@ -51,11 +49,11 @@ logo</a> falls under an open use type license.</p> <col width="35%" /> </colgroup> <tr> -<th colspan="2"><a name="official-use">Debian Official Use Logo</a></th> +<th colspan="2"><a name="restricted-use">Debian Restricted Use Logo</a></th> </tr> <tr> <td> -<h3>Debian Official Use Logo License</h3> +<h3>Debian Restricted Use Logo License</h3> <p>Copyright (c) 1999 Software in the Public Interest</p> <ol> @@ -74,7 +72,7 @@ logo</a> falls under an open use type license.</p> <li>We reserve the right to revoke a license for a product</li> </ol> -<p>Permission has been given to use the official logo on clothing (shirts, +<p>Permission has been given to use the restricted logo on clothing (shirts, hats, etc) as long as they are made by a Debian developer and not sold for profit.</p> </td> |