Revert the Social Contract changes.

CVS version numbers

english/social_contract.wml: 1.14 -> 1.15

1 files changed, 48 insertions, 72 deletions

diff --git a/english/social_contract.wml b/english/social_contract.wml
index 00bad30945b..26ab13978f3 100644
--- a/english/social_contract.wml
+++ b/english/social_contract.wml
@@ -4,11 +4,6 @@
 #  Author           : Manoj Srivastava ( srivasta@tiamat.datasync.com )
 #  Created On       : Wed Jul  2 12:47:56 1997
 
-<P>
-  Version 1.1 ratified on April 26, 2004. Supersedes
-  <a href="social_contract.1.0">Version 1.0</a> ratified on July 5, 1997.
-</P>
-
 <P>Debian, the producers of the Debian GNU/Linux system, have created the
 <strong>Debian Social Contract</strong>. The <a href="#guidelines">Debian Free Software
 Guidelines (DFSG)</a> part of the contract, initially designed
@@ -17,73 +12,54 @@ the free software community as the basis of the
 <a href="http://www.opensource.org/osd.html">Open Source Definition</a>.
 
 <HR>
-    <h2><q>Social Contract</q> with the Free Software Community</h2>
-
-    <ol>
-      <li>
-	<strong>Debian will remain 100% free</strong>
-	<p>
-	  We provide the guidelines that we use to determine if a work
-	  is "<em>free</em>" in the document entitled "<cite>The Debian Free
-	  Software Guidelines</cite>". We promise that the Debian system and
-	  all its components will be free according to these
-	  guidelines. We will support people who create or use both
-	  free and non-free works on Debian. We will never make the
-	  system require the use of a non-free component.
-
-	</p>
-      </li>
-      <li><strong>We will give back to the free software community</strong>
-	<p>
-	  When we write new components of the Debian system, we will
-	  license them in a manner consistent with the Debian Free
-	  Software Guidelines.  We will make the best system we can,
-	  so that free works will be widely distributed and used.  We
-	  will communicate things such as bug fixes, improvements and
-	  user requests to the "<em>upstream</em>" authors of works
-	  included in our system.
-	</p>
-      </li>
-      <li><strong>We will not hide problems</strong>
-	<p>
-	  We will keep our entire bug report database open for public
-	  view at all times. Reports that people file online will
-	  promptly become visible to others.
-	</p>
-      </li>
-      <li><strong>Our priorities are our users and free software</strong>
-	<p>
-	  We will be guided by the needs of our users and the free
-	  software community. We will place their interests first in
-	  our priorities. We will support the needs of our users for
-	  operation in many different kinds of computing
-	  environments. We will not object to non-free works that are
-	  intended to be used on Debian systems, or attempt to charge
-	  a fee to people who create or use such works. We will allow
-	  others to create distributions containing both the Debian
-	  system and other works, without any fee from us. In
-	  furtherance of these goals, we will provide an integrated
-	  system of high-quality materials with no legal restrictions
-	  that would prevent such uses of the system.
-	</p>
-      </li>
-      <li><strong>Works that do not meet our free software standards</strong>
-	<p>
-	  We acknowledge that some of our users require the use of
-	  works that do not conform to the Debian Free Software
-	  Guidelines. We have created "<code>contrib</code>" and
-	  "<code>non-free</code>" areas in our archive for these
-	  works. The packages in these areas are not part of the
-	  Debian system, although they have been configured for use
-	  with Debian. We encourage CD manufacturers to read the
-	  licenses of the packages in these areas and determine if
-	  they can distribute the packages on their CDs. Thus,
-	  although non-free works are not a part of Debian, we support
-	  their use and provide infrastructure for non-free packages
-	  (such as our bug tracking system and mailing lists).
-	</p>
-      </li>
-    </ol>
+<H2>"Social Contract" with the Free Software Community</H2>
+<OL>
+   <LI><P><strong>Debian Will Remain 100% Free Software</strong>
+     <P>We promise to keep the Debian GNU/Linux Distribution
+     entirely free software. As there are many definitions of
+     free software, we include the guidelines we use to determine
+     if software is "<em>free</em>" below.  We will support our
+     users who develop and run non-free software on Debian, but
+     we will never make the system depend on an item of non-free
+     software.</P>
+   <LI><strong>We Will Give Back to the Free Software Community</strong>
+     <P>When we write new components of the Debian system, we will
+     license them as free software. We will make the best system
+     we can, so that free software will be widely distributed and
+     used. We will feed back bug-fixes, improvements, user
+     requests, etc. to the "<em>upstream</em>" authors of software
+     included in our system.</P>
+   <LI><P><strong>We Won't Hide Problems</strong>
+     <P>We will keep our entire bug-report database open for public
+     view at all times. Reports that users file on-line will
+     immediately become visible to others.</P>
+   <LI><P><strong>Our Priorities are Our Users and Free Software</strong>
+     <P>We will be guided by the needs of our users and the
+     free-software community. We will place their interests first
+     in our priorities. We will support the needs of our users
+     for operation in many different kinds of computing
+     environment. We won't object to commercial software that is
+     intended to run on Debian systems, and we'll allow others to
+     create value-added distributions containing both Debian and
+     commercial software, without any fee from us. To support
+     these goals, we will provide an integrated system of
+     high-quality, 100% free software, with no legal restrictions
+     that would prevent these kinds of use.</P>
+   <LI><P><strong>Programs That Don't Meet Our Free-Software Standards</strong>
+     <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>"
+     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
+     manufacturers to read the licenses of software packages in
+     these directories and determine if they can distribute that
+     software on their CDs. Thus, although non-free software
+     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 (DFSG)</a></H2>
 <OL>