diff options
author | Francesca Ciceri <madamezou> | 2011-06-28 16:53:38 +0000 |
---|---|---|
committer | Francesca Ciceri <madamezou> | 2011-06-28 16:53:38 +0000 |
commit | 8a66097109bb4c5d67521875213e02c1e3ca488e (patch) | |
tree | f0d28c1b24dbe44d7a6161299cfb453e48db7fd3 /english/logos | |
parent | 5f077851005a3958abcfb03c8f63435849b0a0f9 (diff) |
added end tags, now the page is (x)html compliant
CVS version numbers
english/logos/index.wml: 1.59 -> 1.60
Diffstat (limited to 'english/logos')
-rw-r--r-- | english/logos/index.wml | 62 |
1 files changed, 33 insertions, 29 deletions
diff --git a/english/logos/index.wml b/english/logos/index.wml index 2cd8fd36bf7..0a3a1f614f5 100644 --- a/english/logos/index.wml +++ b/english/logos/index.wml @@ -4,18 +4,19 @@ <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. +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. +logo</a> falls under an open use type license.</p> <hr> <table cellspacing="0" cellpadding="5" width="100%"> <colgroup span="2"> -<col width="65%"> -<col width="35%"> +<col width="65%" /> +<col width="35%" /> +</colgroup> <tr> <th colspan="2"><a name="open-use">Debian Open Use Logo</a></th> </tr> @@ -24,7 +25,7 @@ logo</a> falls under an open use type license. <h3>Debian Open Use Logo License</h3> <p>The logo without “Debian” is released under the following -common free software license. +common free software license.</p> <p>Copyright (c) 1999 Software in the Public Interest <p>Permission is hereby granted, free of charge, to any person @@ -33,10 +34,10 @@ common free software license. including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, - subject to the following conditions: + subject to the following conditions:</p> <p>The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. + included in all copies or substantial portions of the Software.</p> <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE @@ -45,18 +46,18 @@ common free software license. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. + THE SOFTWARE.</p> <p>The logo with “Debian” is released under the following license, -due to ongoing concerns about <a href="../trademark">trademarks</a>. +due to ongoing concerns about <a href="../trademark">trademarks</a>.</p> <p>Copyright (c) 1999 Software in the Public Interest <br />This logo or a modified version may be used by anyone to refer to the Debian project, but does not indicate endorsement by the -project. +project.</p> <p>Note: we would appreciate that you make the image a link to -http://www.debian.org/ if you use it on a web page. +http://www.debian.org/ if you use it on a web page.</p> </td> <td> <openlogotable> @@ -64,12 +65,13 @@ http://www.debian.org/ if you use it on a web page. </tr> </table> -<hr> +<hr /> <table cellspacing="0" cellpadding="5" width="100%"> <colgroup span="2"> -<col width="65%"> -<col width="35%"> +<col width="65%" /> +<col width="35%" /> +</colgroup> <tr> <th colspan="2"><a name="official-use">Debian Official Use Logo</a></th> </tr> @@ -77,25 +79,26 @@ http://www.debian.org/ if you use it on a web page. <td> <h3>Debian Official Use Logo License</h3> -<p>Copyright (c) 1999 Software in the Public Interest +<p>Copyright (c) 1999 Software in the Public Interest</p> <ol> <li>This logo may only be used if: <ul> <li>the product it is used for is made using a documented procedure as published on www.debian.org (for example - official CD-creation), or + official CD-creation), or </li> <li>official approval is given by Debian for its use in this - purpose + purpose </li> </ul> + </li> <li>May be used if an official part of debian (decided using the rules in I) is part of the complete product, if it is made clear that only - this part is officially approved - <li>We reserve the right to revoke a license for a product + this part is officially approved </li> + <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, hats, etc) as long as they are made by a Debian developer and not sold for -profit. +profit.</p> </td> <td> <officiallogotable> @@ -103,22 +106,23 @@ profit. </tr> </table> -<hr> +<hr /> <h2>About the Debian Logo</h2> +<p> The Debian Logo was selected by a vote by the Debian developers in 1999. It was created by <a href="mailto:rsilva@debian.org">Raul Silva</a>. You can find more details about the Logo on the -<a href="http://wiki.debian.org/DebianLogo">Debian Logo Wiki Page</a>. +<a href="http://wiki.debian.org/DebianLogo">Debian Logo Wiki Page</a>.</p> <h2>Other promotional images</h2> -<p><img class="ico" src="button-1.gif" alt="[Debian GNU/Linux]"> +<p><img class="ico" src="button-1.gif" alt="[Debian GNU/Linux]" /> This is the first button made for the Project. The license of this logo is equivalent to the Open Use logo license. The button -created by <a href="mailto:csmall@debian.org">Craig Small</a>. +created by <a href="mailto:csmall@debian.org">Craig Small</a>.</p> -<p>Here are some more buttons that have been made for Debian: +<p>Here are some more buttons that have been made for Debian:</p> <br /> <morebuttons> @@ -127,22 +131,22 @@ created by <a href="mailto:csmall@debian.org">Craig Small</a>. <table summary="Other Debian art web sites"><tr> <td valign="bottom" align="center"> <a href="http://gnuart.onshore.com/">\ -<img src="gnuart.png" alt="GNU/art">\ +<img src="gnuart.png" alt="GNU/art" />\ </a><br /> <a href="http://gnuart.onshore.com/">GNU/art</a> </td> <td valign="bottom" align="center"> <a href="http://io.debian.net/~tar/volkany/">\ -<img src="debart_logo_04.png" alt="volkany's Debian graphics">\ +<img src="debart_logo_04.png" alt="volkany's Debian graphics" />\ </a><br /> <a href="http://io.debian.net/~tar/volkany/">volkany's Debian graphics</a> </td> </tr></table> -<p><a href="tshirt-lt99.jpg">T-shirt art</a> from LinuxTag 99. +<p><a href="tshirt-lt99.jpg">T-shirt art</a> from LinuxTag 99.</p> <p>If you'd like to help advertize Debian on the web, you can use our -<a href="../banners/">banners</a>. +<a href="../banners/">banners</a>.</p> # # Logo font: Poppl Laudatio Condensed |