www/philosophy ICT-for-prosperity.html bsd.html...

[Karl Berry]

CVSROOT:        /web/www
Module name:    www
Changes by:     Karl Berry <karl>       10/03/09 22:51:54

Modified files:
        philosophy     : ICT-for-prosperity.html bsd.html free-sw.html 

Log message:
        use [lr][ds]quo instead of <q>..</q>, which is not reliable, #557446

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/ICT-for-prosperity.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/bsd.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.html?cvsroot=www&r1=1.90&r2=1.91

Patches:
Index: ICT-for-prosperity.html
===================================================================
RCS file: /web/www/www/philosophy/ICT-for-prosperity.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ICT-for-prosperity.html     21 Apr 2008 16:12:45 -0000      1.10
+++ ICT-for-prosperity.html     9 Mar 2010 22:51:48 -0000       1.11
@@ -22,9 +22,9 @@
 </p>
 
 <p>
-The title of this presentation is <q>Shaping
+The title of this presentation is &lsquo;Shaping
 Collaborative <abbr>ICT</abbr> Development and Initiatives for Global
-Prosperity</q> and the themes of this conference are
+Prosperity&rsquo; and the themes of this conference are
 &lsquo;access&rsquo;, &lsquo;empowerment&rsquo; and
 &lsquo;governance&rsquo;.
 </p>
@@ -532,8 +532,8 @@
 I was asked to speak on
 </p>
 <p>
-<q>Shaping Collaborative <abbr>ICT</abbr> Development and
-Initiatives for Global Prosperity</q>
+&lsquo;Shaping Collaborative <abbr>ICT</abbr> Development and
+Initiatives for Global Prosperity&rsquo;
 </p>
 <p>
 Over the past 16 years, I have worked with people who shaped software
@@ -609,7 +609,7 @@
 </p>
 
 <p>
-Copyright &copy; 1996, 1997, 1998, 2007 Free Software Foundation,
+Copyright &copy; 1996, 1997, 1998, 2007, 2008, 2010 Free Software Foundation,
 Inc.,</p>
 <address>51 Franklin St, Fifth Floor, Boston, MA 02110, USA</address>
 <p>Verbatim copying and distribution of this entire article is
@@ -619,7 +619,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2008/04/21 16:12:45 $
+$Date: 2010/03/09 22:51:48 $
 <!-- timestamp end -->
 </p>
 </div>

Index: bsd.html
===================================================================
RCS file: /web/www/www/philosophy/bsd.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- bsd.html    18 Mar 2009 13:35:02 -0000      1.25
+++ bsd.html    9 Mar 2010 22:51:49 -0000       1.26
@@ -33,7 +33,7 @@
 X10 license, the X11 license, and the two BSD (Berkeley Software
 Distribution) licenses.  Most of them are equivalent except for details
 of wording, but the license used for BSD until 1999 had a special
-problem: the <q>obnoxious BSD advertising clause.</q> It said that every
+problem: the &ldquo;obnoxious BSD advertising clause&rdquo;. It said that every
 advertisement mentioning the software must include a particular
 sentence:</p>
 
@@ -179,7 +179,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2009/03/18 13:35:02 $
+$Date: 2010/03/09 22:51:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: free-sw.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.html,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- free-sw.html        30 Dec 2009 20:00:11 -0000      1.90
+++ free-sw.html        9 Mar 2010 22:51:49 -0000       1.91
@@ -20,9 +20,9 @@
 </p>
 
 <p>
-<q>Free software</q> is a matter of liberty, not price.  To understand
-the concept, you should think of <q>free</q> as in <q>free speech,</q>
-not as in <q>free beer.</q>
+&ldquo;Free software&rdquo; is a matter of liberty, not price.  To understand
+the concept, you should think of &ldquo;free&rdquo; as in &ldquo;free 
speech,&rdquo;
+not as in &ldquo;free beer.&rdquo;
 </p>
 
 <p>
@@ -138,7 +138,7 @@
 </p>
 
 <p>
-<q>Free software</q> does not mean <q>noncommercial.</q>  A free
+&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial.&rdquo;  A free
 program must be available for commercial use, commercial development,
 and commercial distribution.  Commercial development of free software
 is no longer unusual; such free commercial software is very important.
@@ -157,9 +157,9 @@
 <p>
 However, rules about how to package a modified version are acceptable, if they
 don't substantively limit your freedom to release modified versions, or
-your freedom to make and use modified versions privately.  Rules that <q>if
+your freedom to make and use modified versions privately.  Rules that &ldquo;if
 you make your version available in this way, you must make it available in
-that way also</q> can be acceptable too, on the same condition.  (Note that
+that way also&rdquo; can be acceptable too, on the same condition.  (Note that
 such a rule still leaves you the choice of whether to publish your version
 at all.)  Rules that require release of source code to the users for
 versions that you put into public use are also acceptable.  It is also
@@ -171,7 +171,7 @@
 
 <p>
 In the GNU project, we use 
-<q><a href="/copyleft/copyleft.html">copyleft</a></q>
+&ldquo;<a href="/copyleft/copyleft.html">copyleft</a>&rdquo;
 to protect these freedoms legally for everyone.  But 
 <a href="/philosophy/categories.html#Non-CopyleftedFreeSoftware">non-copylefted
 free software</a> also exists.  We believe there are important reasons why
@@ -182,7 +182,7 @@
 
 <p>
 See <a href="/philosophy/categories.html">Categories of Free Software</a>
-for a description of how <q>free software,</q> <q>copylefted software</q>
+for a description of how &ldquo;free software,&rdquo; &ldquo;copylefted 
software&rdquo;
 and other categories of software relate to each other.
 </p>
 
@@ -219,13 +219,13 @@
 
 <p>
 When talking about free software, it is best to avoid using terms
-like <q>give away</q> or <q>for free,</q> because those terms imply that
+like &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms 
imply that
 the issue is about price, not freedom.  Some common terms such
-as <q>piracy</q> embody opinions we hope you won't endorse.  See 
+as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See 
 <a href="/philosophy/words-to-avoid.html">Confusing Words and Phrases that
 are Worth Avoiding</a> for a discussion of these terms.  We also have
 a list of proper <a href="/philosophy/fs-translations.html">translations of
-<q>free software</q></a> into various languages.
+&ldquo;free software&rdquo;</a> into various languages.
 </p>
 
 <p>
@@ -289,11 +289,11 @@
 <h2 id="open-source">Open Source?</h2>
 
 <p>
-Another group has started using the term <q>open source</q> to mean
-something close (but not identical) to <q>free software.</q>  We
-prefer the term <q>free software</q> because, once you have heard that
+Another group has started using the term &ldquo;open source&rdquo; to mean
+something close (but not identical) to &ldquo;free software.&rdquo;  We
+prefer the term &ldquo;free software&rdquo; because, once you have heard that
 it refers to freedom rather than price, it calls to mind freedom.  The
-word <q>open</q> <a href="/philosophy/open-source-misses-the-point.html">
+word &ldquo;open&rdquo; <a 
href="/philosophy/open-source-misses-the-point.html">
 never refers to freedom</a>.
 </p>
 
@@ -417,7 +417,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2009/12/30 20:00:11 $
+$Date: 2010/03/09 22:51:49 $
 <!-- timestamp end -->
 </p>
 </div>