CVSROOT: /web/www
Module name: www
Changes by: Brett Smith <brett> 11/03/04 14:52:08
Modified files:
distros : common-distros.html
Log message:
bring Debian entry more coherently up-to-date, per johns and RMS
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.html?cvsroot=www&r1=1.27&r2=1.28
Patches:
Index: common-distros.html
===================================================================
RCS file: /web/www/www/distros/common-distros.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- common-distros.html 27 Feb 2011 23:33:01 -0000 1.27
+++ common-distros.html 4 Mar 2011 14:52:05 -0000 1.28
@@ -65,20 +65,21 @@
<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. At present, that's not always true
-in practice: Debian has repeatedly made tacit or explicit exceptions for
-specific pieces of nonfree software, such as the blobs included in or
-accompanying Linux. The 2011 release of Debian, called
-“Squeeze”, has removed these blobs. That is a substantial
-step towards a completely free distro, but isn't all the way there.</p>
-
-<p>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.</p>
+distribution will be free software. 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>
+
+<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>
<h3 id="Fedora">Fedora</h3>
@@ -189,7 +190,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2011/02/27 23:33:01 $
+$Date: 2011/03/04 14:52:05 $
<!-- timestamp end -->
</p>
</div>
