Use <q>, <hr /> and add missing </li>

CVS version numbers

english/social_contract.wml: 1.21 -> 1.22

1 files changed, 25 insertions, 25 deletions

diff --git a/english/social_contract.wml b/english/social_contract.wml
index b597b761e1a..c683ef17f66 100644
--- a/english/social_contract.wml
+++ b/english/social_contract.wml
@@ -16,7 +16,7 @@ as a set of commitments that we agree to abide by, has been adopted by
 the free software community as the basis of the
 <a href="http://www.opensource.org/docs/definition_plain.html">Open Source Definition</a>.</p>
 
-<hr>
+<hr />
     <h2><q>Social Contract</q> with the Free Software Community</h2>
 
     <ol>
@@ -24,8 +24,8 @@ the free software community as the basis of the
 	<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
+	  is <q><em>free</em></q> in the document entitled <q><cite>The Debian Free
+	  Software Guidelines</cite></q>. 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
@@ -39,7 +39,7 @@ the free software community as the basis of the
 	  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
+	  user requests to the <q><em>upstream</em></q> authors of works
 	  included in our system.
 	</p>
       </li>
@@ -70,8 +70,8 @@ the free software community as the basis of the
 	<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
+	  Guidelines. We have created <q><code>contrib</code></q> and
+	  <q><code>non-free</code></q> 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
@@ -83,7 +83,7 @@ the free software community as the basis of the
 	</p>
       </li>
     </ol>
-<hr>
+<hr />
 <h2 id="guidelines">The Debian Free Software Guidelines (DFSG)</h2>
 <ol>
    <li><p><strong>Free Redistribution</strong></p>
@@ -91,19 +91,19 @@ the free software community as the basis of the
      party from selling or giving away the software as a
      component of an aggregate software distribution containing
      programs from several different sources. The license may not
-     require a royalty or other fee for such sale.</p>
+     require a royalty or other fee for such sale.</p></li>
    <li><p><strong>Source Code</strong></p>
      <p>The program must include source code, and must allow
      distribution in source code as well as compiled
-     form.</p>
+     form.</p></li>
    <li><p><strong>Derived Works</strong></p>
      <p>The license must allow modifications and derived works, and
      must allow them to be distributed under the same terms as
-     the license of the original software.</p>
+     the license of the original software.</p></li>
    <li><p><strong>Integrity of The Author's Source Code</strong></p>
      <p>The license may restrict source-code from being distributed
      in modified form _<strong>only</strong>_ if the license allows
-     the distribution of "<tt>patch files</tt>" with the source
+     the distribution of <q><tt>patch files</tt></q> with the source
      code for the purpose of modifying the program at build
      time. The license must explicitly permit distribution of
      software built from modified source code. The license may
@@ -111,20 +111,20 @@ the free software community as the basis of the
      number from the original software.  (<em>This is a
      compromise. The Debian group encourages all authors not to
      restrict any files, source or binary, from being
-     modified.</em>)</p>
+     modified.</em>)</p></li>
    <li><p><strong>No Discrimination Against Persons or Groups</strong></p>
      <p>The license must not discriminate against any person or
-     group of persons.</p>
+     group of persons.</p></li>
    <li><p><strong>No Discrimination Against Fields of Endeavor</strong></p>
      <p>The license must not restrict anyone from making use of the
      program in a specific field of endeavor. For example, it may
      not restrict the program from being used in a business, or
-     from being used for genetic research.</p>
+     from being used for genetic research.</p></li>
    <li><p><strong>Distribution of License</strong></p>
      <p>The rights attached to the program must apply to all to
      whom the program is redistributed without the need for
      execution of an additional license by those
-     parties.</p>
+     parties.</p></li>
    <li><p><strong>License Must Not Be Specific to Debian</strong></p>
      <p>The rights attached to the program must not depend on the
      program's being part of a Debian system. If the program is
@@ -132,22 +132,22 @@ the free software community as the basis of the
      but otherwise within the terms of the program's license, all
      parties to whom the program is redistributed should have the
      same rights as those that are granted in conjunction with
-     the Debian system.</p>
+     the Debian system.</p></li>
    <li><p><strong>License Must Not Contaminate Other Software</strong></p>
      <p>The license must not place restrictions on other software
      that is distributed along with the licensed
      software. For example, the license must not insist that all
      other programs distributed on the same medium must be free
-     software.</p>
+     software.</p></li>
    <li><p><strong>Example Licenses</strong></p>
-     <p>The "<strong><a href="http://www.gnu.org/copyleft/gpl.html">GPL</a></strong>",
-     "<strong><a href="misc/bsd.license">BSD</a></strong>", and
-     "<strong><a href="http://www.perl.com/pub/a/language/misc/Artistic.html">Artistic</a></strong>"
-     licenses are examples of licenses that we consider "<em>free</em>".</p>
+     <p>The <q><strong><a href="http://www.gnu.org/copyleft/gpl.html">GPL</a></strong></q>,
+     <q><strong><a href="misc/bsd.license">BSD</a></strong></q>, and
+     <q><strong><a href="http://www.perl.com/pub/a/language/misc/Artistic.html">Artistic</a></strong></q>
+     licenses are examples of licenses that we consider <q><em>free</em></q>.</p></li>
 </ol>
 
-<p><em>The concept of stating our "social contract with the free
-software community" was suggested by Ean Schuessler. This document
+<p><em>The concept of stating our <q>social contract with the free
+software community</q> was suggested by Ean Schuessler. This document
 was drafted by Bruce Perens, refined by the other Debian developers
 during a month-long e-mail conference in June 1997, and then
 <a href="http://lists.debian.org/debian-announce/debian-announce-1997/msg00017.html">\
@@ -155,8 +155,8 @@ accepted</a> as the publicly stated policy of the Debian Project.</em></p>
 
 <p><em>Bruce Perens later removed the Debian-specific references from the
 Debian Free Software Guidelines to create
-<a href="http://www.opensource.org/docs/definition.php">&ldquo;The Open
-Source Definition&rdquo;</a>.</em></p>
+<a href="http://www.opensource.org/docs/definition.php"><q>The Open
+Source Definition</q></a>.</em></p>
 
 <p><em>Other organizations may derive from and build on this document.
 Please give credit to the Debian project if you do.</em></p>