[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/education edu-schools.html
From: |
Dora Scilipoti |
Subject: |
www/education edu-schools.html |
Date: |
Wed, 05 Mar 2014 21:32:54 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: Dora Scilipoti <dora> 14/03/05 21:32:54
Modified files:
education : edu-schools.html
Log message:
Fix order of notes 1 and 2.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-schools.html?cvsroot=www&r1=1.9&r2=1.10
Patches:
Index: edu-schools.html
===================================================================
RCS file: /web/www/www/education/edu-schools.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- edu-schools.html 5 Mar 2014 21:25:41 -0000 1.9
+++ edu-schools.html 5 Mar 2014 21:32:53 -0000 1.10
@@ -70,10 +70,10 @@
never do this.</p>
<p>Why, after all, do some proprietary software developers offer
-gratis copies<a href="#note2">(2)</a> of their nonfree programs to
+gratis copies<a href="#note1">(1)</a> of their nonfree programs to
schools? Because they want to <em>use</em> the schools to implant
dependence on their products, like tobacco companies distributing
-gratis cigarettes to school children<a href="#note1">(1)</a>. They
+gratis cigarettes to school children<a href="#note2">(2)</a>. They
will not give gratis copies to these students once they've graduated,
nor to the companies that they go to work for.</p>
@@ -140,14 +140,14 @@
campaign.</p>
<ol>
-<li><cite><a id="note1"></a>RJ Reynolds Tobacco Company was
+<li><cite><a id="note1"></a>Warning: a school that accepts such an
+offer may find subsequent upgrades rather expensive.</cite></li>
+
+<li><cite><a id="note2"></a>RJ Reynolds Tobacco Company was
fined $15m in 2002 for handing out free samples of cigarettes at
events attended by children. See
<a
href="http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm">
http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm</a>.</cite></li>
-
-<li><cite><a id="note2"></a>Warning: a school that accepts such an
-offer may find subsequent upgrades rather expensive.</cite></li>
</ol>
</div><!-- for id="content", starts in the include above -->
@@ -190,7 +190,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2014/03/05 21:25:41 $
+$Date: 2014/03/05 21:32:53 $
<!-- timestamp end -->
</p>
</div>