[gnu-pl] wwwgnudiff - raport nr 215

[Wojciech Kotwica]

--- prev/www/licenses/licenses.html     Wed Oct 22 23:29:08 2003
+++ curr/www/licenses/licenses.html     Fri Jan 23 05:27:36 2004
@@ -100,5 +100,5 @@
       <A HREF="/licenses/gpl.txt">plain text</A>,
       <A HREF="/licenses/gpl.texi">Texinfo</A>, and
-      <A HREF="/licenses/gpl.tex">LaTeX</A>.
+      <A HREF="/licenses/gpl.tex">LaTeX</A>. These documents are not formatted 
for standalone publishing, and are intended to be included in another document.
   <LI><a href="/licenses/gpl-faq.html">The GNU GPL Frequently Asked
   Questions</a>
@@ -125,5 +125,5 @@
       <A HREF="/licenses/lgpl.html">HTML</A>,
       <A HREF="/licenses/lgpl.txt">plain text</A>, and
-      <A HREF="/licenses/lgpl.texi">Texinfo</A>.
+      <A HREF="/licenses/lgpl.texi">Texinfo</A>. These documents are not 
formatted for standalone publishing, and are intended to be included in another 
document. 
   <LI><A HREF="/licenses/why-not-lgpl.html">Why you shouldn't use the
       Library GPL for your next library</A>
@@ -146,5 +146,5 @@
       <A HREF="/licenses/fdl.txt">plain text</A>, or
       <A HREF="/licenses/fdl.tex">LaTeX</A>.
-      <A HREF="/licenses/fdl.texi">Texinfo</A>.
+      <A HREF="/licenses/fdl.texi">Texinfo</A>. These documents are not 
formatted for standalone publishing, and are intended to be included in another 
document. 
   <LI><A HREF="/licenses/why-gfdl.html">Why publishers should use the GNU 
FDL</A>
   <LI><A HREF="/licenses/fdl.html#SEC4">How to use the GNU FDL for
@@ -357,5 +357,5 @@
 <A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>.
 <P>
-Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.,
+Copyright (C) 1996, 1997, 1998, 1999, 2003, 2004 Free Software Foundation, 
Inc.,
 59 Temple Place - Suite 330, Boston, MA  02111,  USA
 <P>
@@ -365,5 +365,5 @@
 Updated:
 <!-- timestamp start -->
-$Date: 2003/10/22 21:29:08 $ $Author: jpw $
+$Date: 2004/01/22 13:52:19 $ $Author: derekgnu $
 <!-- timestamp end -->
 <HR>
--- prev/www/philosophy/words-to-avoid.html     Mon Jan  5 17:26:28 2004
+++ curr/www/philosophy/words-to-avoid.html     Fri Jan 23 05:27:53 2004
@@ -63,4 +63,6 @@
 | ``<A HREF="words-to-avoid.html#SellSoftware"
        NAME="TOCSellSoftware">Sell software</A>''
+| ``<A HREF="words-to-avoid.html#SoftwareIndustry"
+       NAME="TOCSoftwareIndustry">Software Industry</A>''
 | ``<A HREF="words-to-avoid.html#Theft"
        NAME="TOCTheft">Theft</A>''
@@ -420,6 +422,29 @@
 <P>
 
+<H4>``<A HREF="words-to-avoid.html#TOCSoftwareIndustry"
+     NAME="SoftwareIndustry">Software Industry</A>''</H4>
+
+The term ``software industry'' encourages people to imagine
+that software is always developed by a sort of factory
+and then delivered to consumers.  The free software community
+shows this is not the case.  Software businesses exist, and
+various businesses develop free and/or non-free software,
+but those that develop free software are not like factories.
+
+<P>
+
+The term ``industry'' is being used as propaganda by advocates of
+software patents.  They call software development ``industry'' and
+then try to argue that this means it should be subject to patent
+monopolies.  <A HREF="http://swpat.ffii.org/papers/europarl0309/";>
+The European Parliament, rejecting software patents
+in 2003, voted to define ``industry'' as ``automated production 
+of material goods''.</A>
+
+
 <H4>``<A HREF="words-to-avoid.html#TOCTheft"
      NAME="Theft">Theft</A>''</H4>
+
+
 Copyright apologists often use words like ``stolen'' and ``theft'' to
 describe copyright infringement.  At the same time, they ask us to
@@ -490,5 +515,5 @@
 Updated:
 <!-- hhmts start -->
-$Date: 2004/01/05 16:26:28 $ $Author: canderson $
+$Date: 2004/01/23 04:16:07 $ $Author: rms $
 <!-- hhmts end -->
 <HR>
--- prev/www/server/mirror.html Sat Nov  8 08:12:53 2003
+++ curr/www/server/mirror.html Fri Jan 23 05:28:13 2004
@@ -83,40 +83,37 @@
        work being performed.
 -->
-  <LI>using the
-       <A HREF="/copyleft/copyleft.html">GPLed</A>
-       program Wget, a non-interactive web-mirroring utility.
-       <P>
-       You can download Wget, via anonymous FTP, from
-       <A
-       
HREF="http://ftp.gnu.org/pub/gnu/wget/";>http://ftp.gnu.org/pub/gnu/wget/</A>,
-       or from a <a href="http://www.gnu.org/order/ftp.html";>local
-       mirror site</a>.  This option (or mirror.pl) is not preferable,
-       as the pages are transferred as interpretted by the
-       webserver, not as given to the webserver.  This method can
-       also be inefficient and taxing on mirror resources.
-
-  <li>Use anonymous cvs.  The following command will checkout the
-  entire website, with a couple of exceptions (namely the /prep
-  directory, order.gnu.org, and a couple other pages that are
-  autogenerated elsewhere.  In these cases, you will have to use
-  wget, or another method): 
+    <LI>Using the <A HREF="/copyleft/copyleft.html">GPLed</A>
+    program Wget, a non-interactive web-mirroring utility.
+    <P>
+    You can download Wget, via anonymous FTP, from
+    <A 
HREF="http://ftp.gnu.org/pub/gnu/wget/";>http://ftp.gnu.org/pub/gnu/wget/</A>,
+    or from a <a href="http://www.gnu.org/order/ftp.html";>local
+    mirror site</a>.  This option (or mirror.pl) is not preferable,
+    as the pages are transferred as interpretted by the
+    webserver, not as given to the webserver.  This method can
+    also be inefficient and taxing on mirror resources.</P>
+
+    <li>Using anonymous CVS.  The following command will checkout the
+    entire website, with a couple of exceptions (namely the /prep
+    directory, order.gnu.org, and a couple other pages that are
+    autogenerated elsewhere.  In these cases, you will have to use
+    wget, or another method): 
 
 <pre>
-cvs -z3 -d:pserver:address@hidden:/webcvs co .
+export CVS_RSH="ssh"
+cvs -z3 -d:ext:address@hidden:/webcvs/www co www
 </pre>
 
-<p>
-To keep the site up to date, use cron and a "cvs udpate".
+    <p>
+    To keep the site up to date, use cron and a "cvs update".
+    <p>
 
-Check back here for a more complete list of those pages not
-included in CVS.
-<p>
+    <li>Using Apache's <a 
href="http://httpd.apache.org/docs/mod/mod_proxy.html";>
+    mod_proxy</a>.  The following example for daily mirroring may help:
 
- <li>Use Apache's <a href="http://httpd.apache.org/docs/mod/mod_proxy.html";>
- mod_proxy</a>.  The following example for daily mirroring may help:
- <pre>
- ProxyPass / http://www.gnu.org/
- CacheDefaultExpire 24
- </pre>
+<pre>
+ProxyPass / http://www.gnu.org/
+CacheDefaultExpire 24
+</pre>
 
 </ul>
@@ -174,5 +171,5 @@
 Updated:
 <!-- hhmts start -->
-Updated: $Date: 2003/11/08 07:12:53 $$Author: sinuhe $
+Updated: $Date: 2004/01/22 16:54:03 $$Author: corey $
 <!-- hhmts end -->
 <HR>