diff options
| author | Josip Rodin <joy> | 2002-01-06 15:34:34 +0000 |
|---|---|---|
| committer | Josip Rodin <joy> | 2002-01-06 15:34:34 +0000 |
| commit | 74ea64298aaef1ed5a9c6b868f87a1ba61530f05 (patch) | |
| tree | ba7b182b3c3354ce6f9947ef203f310c58f133ab /english/license.wml | |
| parent | ae5512eedae015cef31e1f118d917cf3026ab469 (diff) | |
updated SPI address and fixed a few links that lacked http: for some strange reason; removed mention of OpenHardware(tm) since we don't mention it anywhere else anymore; added a link to logos/; added a note for translators; didn't up the translation-check so that translators do still check things out
CVS version numbers
catalan/license.wml: 1.2 -> 1.3
croatian/license.wml: 1.7 -> 1.8
danish/license.wml: 1.5 -> 1.6
english/license.wml: 1.11 -> 1.12
finnish/license.wml: 1.2 -> 1.3
french/license.wml: 1.8 -> 1.9
german/license.wml: 1.11 -> 1.12
greek/license.wml: 1.2 -> 1.3
indonesian/license.wml: 1.2 -> 1.3
italian/license.wml: 1.14 -> 1.15
japanese/license.wml: 1.6 -> 1.7
korean/license.wml: 1.14 -> 1.15
norwegian/license.wml: 1.12 -> 1.13
polish/license.wml: 1.9 -> 1.10
portuguese/license.wml: 1.7 -> 1.8
romanian/license.wml: 1.15 -> 1.16
russian/license.wml: 1.3 -> 1.4
spanish/license.wml: 1.12 -> 1.13
swedish/license.wml: 1.8 -> 1.9
turkish/license.wml: 1.4 -> 1.5
Diffstat (limited to 'english/license.wml')
| -rw-r--r-- | english/license.wml | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/english/license.wml b/english/license.wml index 83cc0589273..fa9a9267a71 100644 --- a/english/license.wml +++ b/english/license.wml @@ -1,17 +1,22 @@ #use wml::debian::template title="Debian WWW Pages License" NOCOPYRIGHT="true" BARETITLE="true" -<BLOCKQUOTE> -<P>Copyright © 1997-2002 -<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR> -P.O. Box 1326<BR> -Boston, MA 02117, USA. -</BLOCKQUOTE> +<blockquote> +<p>Copyright © 1997-2002 +<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br> +P.O. Box 502761<br> +Indianapolis, IN 46250-2761<br> +United States<br> +</blockquote> -<P>This material may be distributed only subject to the terms and conditions set +<p>This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, Draft v1.0 or later (the latest version is presently available at -<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>). +<a href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>). +</p> -<P>“Debian”, the Debian Logo, “Open Hardware”, -and the Open Hardware Logo are trademarks of Software in the Public -Interest, Inc. +<p>“Debian” and <a href="logos/">the Debian Logo</a> +are trademarks of Software in the Public Interest, Inc.</p> + +# Note to translators: you are free to link to <a href="license.en.html">the +# original license</a> here -- this is legal text and only the original +# version is authoritative. In fact, you needn't even bother translating this. |