Bug#61151: www.debian.org: social contract page incorrect about OSD
On Mon, Mar 27, 2000 at 07:48:34AM -0000, Joey Hess wrote:
> Package: www.debian.org
> Version: 20000327
> Severity: normal
> Page: http://www.debian.org/social_contract
>
> "Debian, the producers of the Debian GNU/Linux system, have created the
> Debian Social Contract. The contract, initially designed as as a set of
> commitments that we agree to abide
> by, has been adopted by the free software community as the basis of the
> Open Source Definition."
>
> That's a bit misleading, since the OSD does not include the entirety of the
> social contract, but just the DFSG, which is either just a part of the
> social contract, or a standalone document, depending on who you ask.
>
Is the following better?
--- social_contract.wml.orig Tue Mar 28 10:32:10 2000
+++ social_contract.wml Tue Mar 28 10:26:12 2000
@@ -16,7 +16,8 @@
-->
<P>Debian, the producers of the Debian GNU/Linux system, have created the
-<strong>Debian Social Contract</strong>. The contract, initially designed
+<strong>Debian Social Contract</strong>. The <a href="#guidelines">Debian Free Software
+Guidelines (DFSG)</a> part of the contract, initially designed
as 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/osd.html";>Open Source Definition</a>.
@@ -71,7 +72,7 @@
lists) for non-free software packages.
</OL>
<HR>
-<H2><a name="guidelines">The Debian Free Software Guidelines</a></H2>
+<H2><a name="guidelines">The Debian Free Software Guidelines (DFSG)</a></H2>
<OL>
<LI><P><strong>Free Redistribution</strong>
<P>The license of a Debian component may not restrict any
> The bottom of the page gets it right, so I don't really know why the
> topmost paragraph is there at all.
>
The page needs an introduction, just as most pages which are commonly
referred to by newbies should have. The bit at the bottom of the page
was added at the request of Bruce. Since he was primary author of the
document, it only seemed fair.
--
James (Jay) Treacy
treacy@debian.org
Reply to: