CVSROOT: /webcvs/www
Module name: www
Changes by: Richard M. Stallman <rms> 11/06/22 23:19:21
Modified files:
distros : common-distros.html
Log message:
Make description of Debian clearer and less hostile.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.html?cvsroot=www&r1=1.34&r2=1.35
Patches:
Index: common-distros.html
===================================================================
RCS file: /webcvs/www/www/distros/common-distros.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- common-distros.html 14 May 2011 16:30:12 -0000 1.34
+++ common-distros.html 22 Jun 2011 23:19:18 -0000 1.35
@@ -67,22 +67,20 @@
<h3 id="Debian">Debian GNU/Linux</h3>
-<p>Debian's Social Contract does say that all software in the main
-distribution will be free software. However, Debian also provides a
+<p>Debian's Social Contract states the goal of making Debian entirely
+free software, and Debian conscientiously keeps nonfree software out
+of the official Debian system. However, Debian also provides a
repository of nonfree software. According to the project, this
-software is “not part of the Debian system.” We understand
-that's important for organizational reasons, but users would be
-hard-pressed to make a distinction. The repository is hosted on many
-of the project's main servers, and people can readily learn about
-software available through it by browsing Debian's online package
-database. This does too much to steer users towards proprietary
-software for us to endorse it.</p>
+software is “not part of the Debian system,” but the
+repository is hosted on many of the project's main servers, and people
+can readily learn about these nonfree packages by browsing Debian's
+online package database. This does too much to steer users towards
+proprietary software for us to endorse it.</p>
<p>Previous releases of Debian also included nonfree blobs with the
-kernel Linux. Starting with the release of Debian 6.0
-(“squeeze”) in February 2011, these blobs have been moved
-out of the main distribution to separate packages in the nonfree
-repository.</p>
+kernel Linux. With the release of Debian 6.0 (“squeeze”)
+in February 2011, these blobs have been moved out of the main
+distribution to separate packages in the nonfree repository.</p>
<h3 id="Fedora">Fedora</h3>
@@ -199,7 +197,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2011/05/14 16:30:12 $
+$Date: 2011/06/22 23:19:18 $
<!-- timestamp end -->
</p>
</div>
