www/philosophy bsd.html bsd.html.gw-diff

[Yavor Doganov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   07/04/01 12:58:12

Modified files:
        philosophy     : bsd.html 
Removed files:
        philosophy     : bsd.html.gw-diff 

Log message:
        * Added link to the Hebrew translation.
        * Restored original copiright years.
        * Amended the entities -- &mdash;, &{l,d}quo; and ordinary ' for
          casual apostrophies.
        * Removed the useless bsd.html.gw-diff.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/bsd.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/bsd.html.gw-diff?cvsroot=www&r1=1.2&r2=0

Patches:
Index: bsd.html
===================================================================
RCS file: /web/www/www/philosophy/bsd.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- bsd.html    30 Mar 2007 17:05:53 -0000      1.18
+++ bsd.html    1 Apr 2007 12:58:08 -0000       1.19
@@ -55,13 +55,13 @@
 </p>
 <p>
     If other developers who used BSD-like licenses had copied the BSD
-    advertising clause verbatim&#8212;including the sentence that refers to
-    the University of California&#8212;then they would not have made the
+    advertising clause verbatim&mdash;including the sentence that refers to
+    the University of California&mdash;then they would not have made the
     problem any bigger.
 </p>
 <p>
     But, as you might expect, other developers did not copy the clause
-    verbatim.  They changed it, replacing &#8220;University of 
California&#8221;
+    verbatim.  They changed it, replacing &ldquo;University of 
California&rdquo;
     with their own institution or their own names.  The result is a
     plethora of licenses, requiring a plethora of different sentences.
 </p>
@@ -80,7 +80,7 @@
     surprised if the list has grown by now.
 </p>
 <p>
-    To address this problem, in my &#8220;spare time&#8221; I talk with
+    To address this problem, in my &ldquo;spare time&rdquo; I talk with
     developers who have used BSD-style licenses, asking them if they would
     please remove the advertising clause.  Around 1996 I spoke with the
     developers of FreeBSD about this, and they decided to remove the
@@ -103,8 +103,8 @@
     change them.
 </p>
 <p>
-    But if they followed Berkeley&#8217;s lead before, maybe Berkeley&#8217;s
-    change in policy will convince some of them to change.  It&#8217;s worth
+    But if they followed Berkeley's lead before, maybe Berkeley's
+    change in policy will convince some of them to change.  It's worth
     asking.
 </p>
 <p>
@@ -114,16 +114,16 @@
 </p>
 <p>
     And if you want to release a program as non-copylefted free
-    software, please don&#8217;t use the advertising clause.  Instead of
-    copying the BSD license from some released package&#8212;which might
-    still have the old version of the license in it&#8212;please copy the
+    software, please don't use the advertising clause.  Instead of
+    copying the BSD license from some released package&mdash;which might
+    still have the old version of the license in it&mdash;please copy the
     license from X11.
 </p>
 <p>
     You can also help spread awareness of the issue by not using the
-    term &#8220;BSD-style&#8221;, and not saying &#8220;the BSD license&#8221;
+    term &ldquo;BSD-style&rdquo;, and not saying &ldquo;the BSD license&rdquo;
     which implies there is only one.  You see, when people refer to all
-    non-copyleft free software licenses as &#8220;BSD-style licenses&#8221;,
+    non-copyleft free software licenses as &ldquo;BSD-style licenses&rdquo;,
     some new free software developer who wants to use a non-copyleft free
     software license might take for granted that the place to get it is from
     BSD.  He or she might copy the license with the advertising clause, not by
@@ -133,15 +133,15 @@
     If you would like to cite one specific example of a non-copyleft
     license, and you have no particular preference, please pick an
     example which has no particular problem.  For instance, if you talk
-    about &#8220;X11-style licenses&#8221;, you will encourage people to copy 
the
+    about &ldquo;X11-style licenses&rdquo;, you will encourage people to copy 
the
     license from X11, which avoids the advertising clause for certain,
     rather than take a risk by randomly chosing one of the two BSD
     licenses.
 </p>
 <p>
     When you want to refer specifically to one of the BSD licenses,
-    please always state which one: the &#8220;original BSD license&#8221; or 
the
-    &#8220;revised BSD license&#8221;.
+    please always state which one: the &ldquo;original BSD license&rdquo; or 
the
+    &ldquo;revised BSD license&rdquo;.
 </p>
 
 <!-- If needed, change the copyright block at the bottom. In general, -->
@@ -156,12 +156,12 @@
 
 <p>
 Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+<a href="mailto:address@hidden";><em>address@hidden</em></a>.
 There are also <a href="/contact/">other ways to contact</a> 
 the FSF.
 <br />
 Please send broken links and other corrections (or suggestions) to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+<a href="mailto:address@hidden";><em>address@hidden</em></a>.
 </p>
 
 <p>
@@ -172,7 +172,7 @@
 </p>
 
 <p>
-Copyright &copy; 2007 Free Software Foundation, Inc.,
+Copyright &copy; 1998, 1999, 2001, 2003, 2007 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 are
@@ -183,7 +183,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2007/03/30 17:05:53 $ $Author: clarkema $
+$Date: 2007/04/01 12:58:08 $
 <!-- timestamp end -->
 </p>
 </div>
@@ -205,16 +205,28 @@
 <!-- Please use W3C normative character entities -->
 
 <ul class="translations-list">
-<li><a href="/philosophy/bsd.ca.html">Catal&#x00e0;</a>&nbsp;[ca]</li> <!-- 
Catalan -->
+<!-- Catalan -->
+<li><a href="/philosophy/bsd.ca.html">Catal&#x00e0;</a>&nbsp;[ca]</li>
+<!-- English -->
 <li><a href="/philosophy/bsd.html">English</a>&nbsp;[en]</li>
-<li><a href="/philosophy/bsd.es.html">Espa&#x00f1;ol</a>&nbsp;[es]</li>        
<!-- Spanish -->
-<li><a href="/philosophy/bsd.fr.html">Fran&#x00e7;ais</a>&nbsp;[fr]</li>       
<!-- French -->
-<li><a href="/philosophy/bsd.id.html">Bahasa Indonesia</a>&nbsp;[id]</li>      
<!-- Indonesian -->
-<li><a 
href="/philosophy/bsd.ja.html">&#x65e5;&#x672c;&#x8a9e;</a>&nbsp;[ja]</li>      
<!-- Japanese -->
-<li><a href="/philosophy/bsd.nl.html">Nederlands</a>&nbsp;[nl]</li>    <!-- 
Dutch -->
-<li><a href="/philosophy/bsd.pl.html">Polski</a>&nbsp;[pl]</li>        <!-- 
Polish -->
-<li><a href="/philosophy/bsd.pt.html">Portugu&#x0ea;s</a>&nbsp;[pt]</li>       
<!-- Portuguese -->
-<li><a 
href="/philosophy/bsd.ru.html">&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;</a>&nbsp;[ru]</li>
 <!-- Russian -->
+<!-- Spanish -->
+<li><a href="/philosophy/bsd.es.html">Espa&#x00f1;ol</a>&nbsp;[es]</li>
+<!-- French -->
+<li><a href="/philosophy/bsd.fr.html">Fran&#x00e7;ais</a>&nbsp;[fr]</li>
+<!-- Hebrew -->
+<li><a 
href="/philosophy/bsd.he.html">&#x05e2;&#x05d1;&#x05e8;&#x05d9;&#x05ea;</a>&nbsp;[he]</li>
+<!-- Indonesian -->
+<li><a href="/philosophy/bsd.id.html">Bahasa Indonesia</a>&nbsp;[id]</li>
+<!-- Japanese -->
+<li><a 
href="/philosophy/bsd.ja.html">&#x65e5;&#x672c;&#x8a9e;</a>&nbsp;[ja]</li>
+<!-- Dutch -->
+<li><a href="/philosophy/bsd.nl.html">Nederlands</a>&nbsp;[nl]</li>
+<!-- Polish -->
+<li><a href="/philosophy/bsd.pl.html">Polski</a>&nbsp;[pl]</li>
+<!-- Portuguese -->
+<li><a href="/philosophy/bsd.pt.html">Portugu&#x0ea;s</a>&nbsp;[pt]</li>
+<!-- Russian -->
+<li><a 
href="/philosophy/bsd.ru.html">&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;</a>&nbsp;[ru]</li>
 </ul>
 </div>
 </div>

Index: bsd.html.gw-diff
===================================================================
RCS file: bsd.html.gw-diff
diff -N bsd.html.gw-diff
--- bsd.html.gw-diff    5 May 2005 19:37:13 -0000       1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
-*** /usr/www/html/philosophy/bsd.html  Thu May 14 00:16:25 1998
---- /usr/www/html/philosophy/bsd.html.out      Thu Aug 13 10:20:18 1998
-***************
-*** 111,117 ****
-  
-  Please send FSF &amp; GNU inquiries &amp; questions to 
-  
-! <A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>.
-  There are also <A HREF="/home.html#ContactInfo">other ways to
-  contact</A> the FSF.
-  <P>
---- 111,117 ----
-  
-  Please send FSF &amp; GNU inquiries &amp; questions to 
-  
-! <A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>.
-  There are also <A HREF="/home.html#ContactInfo">other ways to
-  contact</A> the FSF.
-  <P>
-***************
-*** 120,126 ****
-  
-  <A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>,
-  send other questions to
-! <A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>.
-  <P>
-  Copyright (C) 1998 Free Software Foundation, Inc.,
-  51 Franklin St, Fifth Floor, Boston, MA  02110,  USA
---- 120,126 ----
-  
-  <A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>,
-  send other questions to
-! <A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>.
-  <P>
-  Copyright (C) 1998 Free Software Foundation, Inc.,
-  51 Franklin St, Fifth Floor, Boston, MA  02110,  USA
-***************
-*** 130,136 ****
-  <P>
-  Updated:
-  <!-- hhmts start -->
-! 13 May 1998 rms
-  <!-- hhmts end -->
-  <HR>
-  </BODY>
---- 130,136 ----
-  <P>
-  Updated:
-  <!-- hhmts start -->
-! 13 Aug 1998 grat-w
-  <!-- hhmts end -->
-  <HR>
-  </BODY>