[gnu-pl] wwwgnudiff - raport nr 323

[Wojciech Kotwica]

--- prev/www/home.html  Tue Jun 15 05:27:09 2004
+++ curr/www/home.html  Fri Jun 18 05:26:56 2004
@@ -220,5 +220,5 @@
 <li><strong>Long-term contribution:</strong> 
 <a href="/server/takeaction.html#directory">
-Add to the Free Software Directory</li>
+Add to the Free Software Directory</a></li>
 </ul>
 
@@ -347,5 +347,5 @@
 Updated:
 <!-- timestamp start -->
-$Date: 2004/06/14 15:25:21 $ $Author: sinuhe $
+$Date: 2004/06/17 13:14:09 $ $Author: corey $
 <!-- timestamp end -->
 </p>
--- prev/www/gnu/gnu-user-groups.html   Sat Jun 12 05:27:57 2004
+++ curr/www/gnu/gnu-user-groups.html   Fri Jun 18 05:27:45 2004
@@ -179,4 +179,5 @@
   <li><a href="#TOCGLUnitedStates" id="GLUnitedStates">United States</a>
     <ul>
+      <li><a href="http://www.swfglug.org";>South-West Florida GNU/Linux Users 
Group</a></li>
       <li><a href="http://www.eskimo.com/~lo/linux/index.html";>Gnubies: New
         York GNU/Linux/Free OS Beginners Group</a></li>
@@ -298,5 +299,5 @@
 Updated:
 <!-- timestamp start -->
-$Date: 2004/06/11 12:01:34 $ $Author: lorenzo $
+$Date: 2004/06/17 09:00:54 $ $Author: Sammy $
 <!-- timestamp end -->
 </p>
--- prev/www/licenses/license-list.html Thu Jun 17 05:28:09 2004
+++ curr/www/licenses/license-list.html Fri Jun 18 05:28:02 2004
@@ -1010,11 +1010,4 @@
 
 
-<dt><ins>Daniel Bernstein's licenses</ins></dt>
-<dd>
-These licenses are not free software licenses because they
-do not permit publication of modified versions.
-<p></p></dd>
-
-
 <dt><ins>Aladdin Free Public License</ins></dt>
 <dd>
@@ -1089,4 +1082,13 @@
 
 
+<dt>The license of PINE</dt>
+<dd>
+The license of PINE is not a free software license because it mostly
+prohibits the distribution of modified versions.  It also restricts
+the media that can be used for <A HREF="/philosophy/selling.html">
+selling copies</A>.
+<p></p></dd>
+
+
 <dt><a 
href="http://msdn.microsoft.com/msdn-files/027/001/901/ShSourceCLIbetaLicense.htm";>
 Microsoft's Shared Source License</a></dt>
@@ -1378,5 +1380,5 @@
 Updated:
 <!-- timestamp start -->
-$Date: 2004/06/16 15:50:51 $ $Author: lorenzo $
+$Date: 2004/06/17 23:27:20 $ $Author: rms $
 <!-- timestamp end -->
 </p>
--- prev/www/philosophy/categories.html Thu May 27 05:33:30 2004
+++ curr/www/philosophy/categories.html Fri Jun 18 05:28:31 2004
@@ -138,10 +138,11 @@
      The term ``open source'' software is used by some people to mean
      more or less the same thing as free software.  However, their criteria
-     are somewhat less strict; they have accepted some kinds of license
-     restrictions that we have rejected as unacceptable.
-
+     are somewhat lax; they accept some license
+     restrictions that we consider too restrictive.
+     <p>
      We prefer the term
      ``<a href="/philosophy/free-software-for-freedom.html">free
-     software</a>''; follow that link to see the reasons.
+     software</a>'' because it refers to freedom--something that
+     the term ``open source'' does not do.
      <p></p>
      </dd>
@@ -280,11 +281,14 @@
      <a href="/software/software.html">GNU software</a> is software that is
      released under the auspices of the
-     <a href="/gnu/gnu-history.html">GNU Project</a>.  Most GNU software is
-     <a href="/copyleft/copyleft.html">copylefted</a>, but not all;
-     however, all GNU software must be
-     <a href="/philosophy/free-sw.html">free software</a>.
-     <p>
+     <a href="/gnu/gnu-history.html">GNU Project</a>.
      If a program is GNU software, we also say that it is a
-     GNU program.</p>
+     GNU program or a GNU package.  The
+     README or manual of a GNU package should say it is one;
+     also, the <a href="/directory">
+     Free Software Directory </a> indentifies all GNU packages.</p>
+     <p>
+     Most GNU software is <a href="/copyleft/copyleft.html">
+     copylefted </a>, but not all; however, all GNU software must be
+     <a href="/philosophy/free-sw.html">free software</a>.</p>
      <p>
      Some GNU software is written by
@@ -542,5 +546,5 @@
 Updated:
 <!-- timestamp start -->
-$Date: 2004/05/26 18:10:43 $ $Author: rms $
+$Date: 2004/06/17 23:18:13 $ $Author: rms $
 <!-- timestamp end -->
 </p>
--- prev/www/philosophy/sco/sco-gnu-linux.html  Thu Sep  4 17:56:10 2003
+++ curr/www/philosophy/sco/sco-gnu-linux.html  Fri Jun 18 05:28:31 2004
@@ -97,13 +97,14 @@
 <p>
 
-To copy Unix source code would not be ethically wrong, but it is
-illegal; our work would fail to give users lawful freedom to cooperate
-if it were not done lawfully.  To make sure we would not copy Unix
-source code or write anything similar, we told GNU contributors not
-even to look at Unix source code while developing code for GNU.  We
-also suggested design approaches that differ from typical Unix design
-approaches, to ensure our code would not resemble Unix code.  We did
-our best to avoid ever copying Unix code, despite our basic premise
-that to prohibit copying of software is morally wrong.
+To copy Unix source code would not be ethically wrong (<A
+HREF="#footnote" NAME="footref">*</A>), but it is illegal; our work
+would fail to give users lawful freedom to cooperate if it were not
+done lawfully.  To make sure we would not copy Unix source code or
+write anything similar, we told GNU contributors not even to look at
+Unix source code while developing code for GNU.  We also suggested
+design approaches that differ from typical Unix design approaches, to
+ensure our code would not resemble Unix code.  We did our best to
+avoid ever copying Unix code, despite our basic premise that to
+prohibit copying of software is morally wrong.
 
 <p>
@@ -118,7 +119,7 @@
 "it"--which means, to think at such a broad abstract level that the
 specific social issues raised by these various laws are not even visible.
-Any "opinion about intellectual property" is thus bound to be foolish.
+Any opinion "about intellectual property" is thus bound to be foolish.
 (See <a href="/philosophy/words-to-avoid.html">our list of words to
-avoid</a>.)
+avoid</a> for more explanation of the confusion caused by this term.)
 
 <p>
@@ -162,4 +163,13 @@
 
 <hr>
+<p>
+
+<A NAME="footnote" HREF="#footref">*</A> Since this statement directly 
contradicts the
+establishment views of the proprietary software developers, some
+readers suppose that the word "not" was inserted by mistake.  It is
+entirely intentional.  It is not wrong to copy software.  It is wrong
+to stop others from copying software.  Thus, software should be free.
+
+<hr>
 
 <p>
@@ -205,5 +215,5 @@
 Updated:
 <!-- timestamp start -->
-$Date: 2003/09/04 15:56:10 $ $Author: taz $
+$Date: 2004/06/17 23:19:48 $ $Author: rms $
 <!-- timestamp end -->
 <HR>
--- prev/www/server/list-mirrors.html   Mon Jun  7 05:29:17 2004
+++ curr/www/server/list-mirrors.html   Fri Jun 18 05:29:00 2004
@@ -79,4 +79,6 @@
 | <a href="list-mirrors.html#Denmark"
      id="TOCDenmark">Denmark</a>
+| <a href="list-mirrors.html#Estonia"
+     id="TOCEstonia">Estonia</a>     
 | <a href="list-mirrors.html#France"
      id="TOCFrance">France</a>
@@ -114,5 +116,5 @@
 -->
 | <a href="list-mirrors.html#Netherlands"
-     id="TOCNetherlands">The Netherlands</a>
+     id="TOCNetherlands">Netherlands</a>
 | <a href="list-mirrors.html#Norway"
      id="TOCNorway">Norway</a>
@@ -288,10 +290,17 @@
        id="Denmark"><strong>Denmark</strong></a>
      <ul>
-
        <li><a href="http://gnu.cofman.dk";>http://gnu.cofman.dk</a>
        - questions to Claus Larsen <a 
href="http://www.cofman.com/";>http://www.cofman.com</a></li>
-
      </ul></li>
-     
+
+
+<li><a href="list-mirrors.html#TOCEstonia" 
id="Estonia"><strong>Estonia</strong></a>
+    <ul>
+        <li><a href=" http://gnu.wildyou.net";>http://gnu.wildyou.net </a>
+            - updated twice daily - questions to <a 
href="mailto:address@hidden";>address@hidden</a>
+        </li>
+    </ul></li>
+
+
 <li><a href="list-mirrors.html#TOCFrance"
        id="France"><strong>France</strong></a>
@@ -465,5 +474,5 @@
 
 <li><a href="list-mirrors.html#TOCNetherlands"
-       id="Netherlands"><strong>The Netherlands</strong></a>
+       id="Netherlands"><strong>Netherlands</strong></a>
   <ul>
   <li><a href="http://gnu.essentkabel.com/";>http://gnu.essentkabel.com/</a> 
@@ -840,5 +849,5 @@
 Updated:
 <!-- timestamp start -->
-Updated: $Date: 2004/06/06 17:38:02 $ $Author: canderson $
+Updated: $Date: 2004/06/17 13:13:48 $ $Author: corey $
 <!-- timestamp end -->
 </p>
--- prev/www/keepingup.pl.html  Wed Jun  9 13:20:23 2004
+++ curr/www/keepingup.pl.html  Fri Jun 18 05:26:56 2004
@@ -68,5 +68,5 @@
 
 <p><strong><a id="usenet">Usenet</a></strong></p>
-<p>Istnieje kilka <a href="/prep/mailinglists.es.html">usenetowych grup 
dyskusyjnych</a> gnu.*, bêd±cych dobrymi ¼ród³ami informacji. Dziêki tej grupie 
mo¿na orientowaæ siê na bie¿±co, co nowego dzieje siê w&nbsp;GNU:</p>
+<p>Istnieje kilka <a href="/prep/mailinglists.html">usenetowych grup 
dyskusyjnych</a> gnu.*, bêd±cych dobrymi ¼ród³ami informacji. Dziêki tej grupie 
mo¿na orientowaæ siê na bie¿±co, co nowego dzieje siê w&nbsp;GNU:</p>
 <ul>
     <li>gnu.announce</li>
@@ -123,5 +123,5 @@
 Aktualizowane:
 <!-- timestamp start -->
-$Date: 2004/06/09 11:20:23 $ $Author: wkotwica $
+$Date: 2004/06/17 18:55:26 $ $Author: wkotwica $
 <!-- timestamp end -->
 </p>