aboutsummaryrefslogtreecommitdiffstats
path: root/english/social_contract.wml
diff options
context:
space:
mode:
authorJames A. Treacy <treacy>1998-10-30 20:19:33 +0000
committerJames A. Treacy <treacy>1998-10-30 20:19:33 +0000
commitdea9d1ae0f0bc3a42ae1fb85b6c3c052aa756dfa (patch)
tree16e14b2b5542134e5b340b2cc9d01469fe16d0e4 /english/social_contract.wml
parent3604099c3bc662afc98c21c74a7f1154243c092e (diff)
removed languages lines
CVS version numbers english/contact.wml: 1.2 -> 1.3 english/donations.wml: 1.5 -> 1.6 english/index.wml: 1.13 -> 1.14 english/license.wml: 1.4 -> 1.5 english/social_contract.wml: 1.3 -> 1.4 english/support.wml: 1.2 -> 1.3 english/todo.wml: 1.4 -> 1.5 english/template/debian/footer.wml: 1.5 -> 1.6
Diffstat (limited to 'english/social_contract.wml')
-rw-r--r--english/social_contract.wml38
1 files changed, 17 insertions, 21 deletions
diff --git a/english/social_contract.wml b/english/social_contract.wml
index 30782126944..f2ccbef6711 100644
--- a/english/social_contract.wml
+++ b/english/social_contract.wml
@@ -61,7 +61,7 @@ the free software community as the basis of the
<P>We acknowledge that some of our users require the use of
programs that don't conform to the
<a href="#guidelines">Debian Free Software Guidelines</a>.
- We have created "<tt>contrib</tt>" and "<tt>non-free</tt>"
+ We have created "<tt>contrib</tt>" and "<tt>non-free</tt>"
areas in our FTP archive for this software. The software in
these directories is not part of the Debian system, although
it has been configured for use with Debian. We encourage CD
@@ -71,10 +71,10 @@ the free software community as the basis of the
isn't a part of Debian, we support its use, and we provide
infrastructure (such as our bug-tracking system and mailing
lists) for non-free software packages.
- </OL>
- <HR>
- <H2><a name="guidelines">The Debian Free Software Guidelines</a></H2>
- <OL>
+</OL>
+<HR>
+<H2><a name="guidelines">The Debian Free Software Guidelines</a></H2>
+<OL>
<LI><P><strong>Free Redistribution</strong>
<P>The license of a Debian component may not restrict any
party from selling or giving away the software as a
@@ -98,9 +98,9 @@ the free software community as the basis of the
software built from modified source code. The license may
require derived works to carry a different name or version
number from the original software. (<em>This is a
- compromise. The Debian group encourages all authors to not
- restrict any files, source or binary, from being
- modified.</em>)</P>
+ compromise. The Debian group encourages all authors to not
+ restrict any files, source or binary, from being
+ modified.</em>)</P>
<LI><P><strong>No Discrimination Against Persons or Groups</strong>
<P>The license must not discriminate against any person or
group of persons.</P>
@@ -133,19 +133,15 @@ the free software community as the basis of the
"<strong><a href="misc/bsd.license">BSD</a></strong>", and
"<strong><a href="http://language.perl.com/misc/Artistic.html">Artistic</a></strong>"
licenses are examples of licenses that we consider "<em>free</em>".
- </OL>
-
- <P><EM>Bruce Perens wrote the first draft of this document
- and refined it using the comments of the Debian developers
- during a month-long e-mail conference in June 1997. He
- later removed the Debian-specific references from the
- Debian Free Software Guidelines to create &ldquo;The Open
- Source Definition&rdquo;.</EM>
+</OL>
- <P><EM>Other organizations may derive from and build on this document.
- Please give credit to the Debian project if you do.</EM>
+<P><EM>Bruce Perens wrote the first draft of this document
+and refined it using the comments of the Debian developers
+during a month-long e-mail conference in June 1997. He
+later removed the Debian-specific references from the
+Debian Free Software Guidelines to create &ldquo;The Open
+Source Definition&rdquo;.</EM>
- <HR>
- <P>Back to the <A href="$(HOME)/">Debian GNU/Linux homepage</A>.
+<P><EM>Other organizations may derive from and build on this document.
+Please give credit to the Debian project if you do.</EM>
-<:= languages ("$(HOME)", ".", "$(WML_SRC_BASENAME)", "$(CUR_LANG)") :>

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