www/distros common-distros.html

[Brett Smith]

CVSROOT:        /web/www
Module name:    www
Changes by:     Brett Smith <brett>     10/03/02 20:07:57

Modified files:
        distros        : common-distros.html 

Log message:
        add information about Ubuntu per #543099 -- ran this by johns

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.html?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: common-distros.html
===================================================================
RCS file: /web/www/www/distros/common-distros.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- common-distros.html 8 Feb 2010 16:17:26 -0000       1.6
+++ common-distros.html 2 Mar 2010 20:07:52 -0000       1.7
@@ -136,8 +136,10 @@
 <a id="Ubuntu"></a>
 <h3>Ubuntu</h3>
 
-<p>Ubuntu provides specific repositories of nonfree software.  Even if
-you don't use them, the default application installer will advertise
+<p>Ubuntu provides specific repositories of nonfree software, and
+Canonical expressly promotes and recommends nonfree software under the
+Ubuntu name in some of their distribution channels.  Even if you try
+to avoid all of that, the default application installer will advertise
 nonfree software to you.</p>
 
 <a id="BSD"></a>
@@ -182,7 +184,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/02/08 16:17:26 $
+$Date: 2010/03/02 20:07:52 $
 <!-- timestamp end -->
 </p>
 </div>