aboutsummaryrefslogtreecommitdiffstats
path: root/english/license.wml
diff options
context:
space:
mode:
authorJosip Rodin <joy>2000-12-04 00:08:39 +0000
committerJosip Rodin <joy>2000-12-04 00:08:39 +0000
commit6e9fbd981ef195144c3599ca919ede1bd9fd5c34 (patch)
tree7b048219c86dafb7fe3e8233e4756348f02b0f9a /english/license.wml
parent7c3cd0729cf406a859715cd9eb8eb0e55f079241 (diff)
clarified title i.e. what is this license for, removed copyright note at the end because it's redundant, explicitely mentioned USA in the SPI address
CVS version numbers english/license.wml: 1.8 -> 1.9
Diffstat (limited to 'english/license.wml')
-rw-r--r--english/license.wml10
1 files changed, 4 insertions, 6 deletions
diff --git a/english/license.wml b/english/license.wml
index 3b73e9240ae..402fdcf3ce9 100644
--- a/english/license.wml
+++ b/english/license.wml
@@ -1,19 +1,17 @@
-#use wml::debian::template title="License"
+#use wml::debian::template title="Debian WWW Pages License" NOCOPYRIGHT="true" BARETITLE="true"
<BLOCKQUOTE>
<P>Copyright &copy; 1997-2000
<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
P.O. Box 1326<BR>
-Boston, MA 02117.
+Boston, MA 02117, USA.
</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>).
-<P>&ldquo;Debian&rdquo;, The Debian Logo, &ldquo;Open Hardware&rdquo;,
+<P>&ldquo;Debian&rdquo;, the Debian Logo, &ldquo;Open Hardware&rdquo;,
and the Open Hardware Logo are trademarks of Software in the Public
Interest, Inc.
-

© 2014-2024 Faster IT GmbH | imprint | privacy policy