trans-coord/gnun gnu/initial-announcement.html ...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   10/07/01 18:10:11

Modified files:
        gnun/gnu       : initial-announcement.html 
        gnun/philosophy: can-you-trust.html categories.html free-sw.html 
                         not-ipr.html open-source-misses-the-point.html 
                         software-literary-patents.html 
                         words-to-avoid.html 

Log message:
        Automatic sync from the master www repository.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/gnu/initial-announcement.html?cvsroot=trans-coord&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/can-you-trust.html?cvsroot=trans-coord&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/categories.html?cvsroot=trans-coord&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/free-sw.html?cvsroot=trans-coord&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/not-ipr.html?cvsroot=trans-coord&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/open-source-misses-the-point.html?cvsroot=trans-coord&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/software-literary-patents.html?cvsroot=trans-coord&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/words-to-avoid.html?cvsroot=trans-coord&r1=1.29&r2=1.30

Patches:
Index: gnu/initial-announcement.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/gnu/initial-announcement.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gnu/initial-announcement.html       28 Jun 2010 18:10:10 -0000      1.12
+++ gnu/initial-announcement.html       1 Jul 2010 18:10:11 -0000       1.13
@@ -81,7 +81,7 @@
 <p>Individual programmers can contribute by writing a compatible duplicate
 of some Unix utility and giving it to me.  For most projects, such
 part-time distributed work would be very hard to coordinate; the
-independently written parts would not work together.  But for the
+independently-written parts would not work together.  But for the
 particular task of replacing Unix, this problem is absent.  Most
 interface specifications are fixed by Unix compatibility.  If each
 contribution works with the rest of Unix, it will probably work
@@ -197,7 +197,7 @@
 Individual programmers can contribute by writing a compatible duplicate
 of some Unix utility and giving it to me.  For most projects, such
 part-time distributed work would be very hard to coordinate; the
-independently written parts would not work together.  But for the
+independently-written parts would not work together.  But for the
 particular task of replacing Unix, this problem is absent.  Most
 interface specifications are fixed by Unix compatibility.  If each
 contribution works with the rest of Unix, it will probably work
@@ -259,7 +259,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/06/28 18:10:10 $
+$Date: 2010/07/01 18:10:11 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/can-you-trust.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/can-you-trust.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- philosophy/can-you-trust.html       23 Jun 2010 18:10:14 -0000      1.12
+++ philosophy/can-you-trust.html       1 Jul 2010 18:10:11 -0000       1.13
@@ -169,7 +169,7 @@
 <p>
 When someone uses GPG to send you an encrypted document, and you use
 GPG to decode it, the result is an unencrypted document that you can
-read, forward, copy, and even re-encrypt to send it securely to
+read, forward, copy, and even reencrypt to send it securely to
 someone else.  A treacherous-computing application would let you read
 the words on the screen, but would not let you produce an unencrypted
 document that you could use in other ways.  GPG, a free software
@@ -275,7 +275,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/06/23 18:10:14 $
+$Date: 2010/07/01 18:10:11 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/categories.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/categories.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- philosophy/categories.html  27 Jun 2010 18:10:15 -0000      1.14
+++ philosophy/categories.html  1 Jul 2010 18:10:11 -0000       1.15
@@ -1,7 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>Categories of Free and Non-Free Software - GNU Project - Free Software 
Foundation (FSF)</title>
+<title>Categories of Free and Nonfree Software - GNU Project - Free Software 
Foundation (FSF)</title>
 <!--#include virtual="/server/banner.html" -->
-<h2>Categories of free and non-free software</h2>
+<h2>Categories of free and nonfree software</h2>
 
 <!-- This document uses XHTML 1.0 Strict, but may be served as -->
 <!-- text/html.  Please ensure that markup style considers -->
@@ -77,7 +77,7 @@
        various other languages.</p>
 
        <p>Free software is often <a href="/software/reliability.html">more
-       reliable</a> than non-free software.</p>
+       reliable</a> than nonfree software.</p>
 
 <h3 id="OpenSource">Open source software</h3>
 
@@ -101,7 +101,7 @@
 
        <p>Public domain software is software that is not copyrighted. If
        the source code is in the public domain, that is a special case of
-       <a href="#Non-CopyleftedFreeSoftware">non-copylefted free
+       <a href="#Non-CopyleftedFreeSoftware">noncopylefted free
        software</a>, which means that some copies or modified versions
        may not be free at all.</p>
 
@@ -163,9 +163,9 @@
        license; therefore, it is good for the community if people use
        a single copyleft license.</p>
 
-<h3 id="Non-CopyleftedFreeSoftware">Non-copylefted free software</h3>
+<h3 id="Non-CopyleftedFreeSoftware">Noncopylefted free software</h3>
 
-       <p>Non-copylefted free software comes from the author with
+       <p>Noncopylefted free software comes from the author with
        permission to redistribute and modify, and also to add additional
        restrictions to it.</p>
 
@@ -178,17 +178,17 @@
 
        <p>The <a href="http://www.x.org";>X Window System</a>
        illustrates this. The X Consortium releases X11 with
-       distribution terms that make it non-copylefted free
+       distribution terms that make it noncopylefted free
        software. If you wish, you can get a copy which has those
-       distribution terms and is free. However, there are non-free
+       distribution terms and is free. However, there are nonfree
        versions as well, and there are (or at least were) popular
-       workstations and PC graphics boards for which non-free
+       workstations and PC graphics boards for which nonfree
        versions are the only ones that work. If you are using this
        hardware, X11 is not free software for
        you. <a href="/philosophy/x.html">The developers of X11 even
-       made X11 non-free</a> for a while; they were able to do this
+       made X11 nonfree</a> for a while; they were able to do this
        because others had contributed their code under the same
-       non-copyleft license.</p>
+       noncopyleft license.</p>
 
 <h3 id="LaxPermissiveLicensedSoftware">Lax permissive licensed software</h3>
 
@@ -234,7 +234,7 @@
        kind of free software is legally suitable to include if it
        helps meet technical goals. And it isn't necessary for all the
        components to be GNU software, individually.  GNU can and does
-       include non-copylefted free software such as the X Window
+       include noncopylefted free software such as the X Window
        System that were developed by other projects.</p>
 
 <h3 id="GNUprograms">GNU programs</h3>
@@ -269,22 +269,22 @@
        by the Free Software Foundation; some is copyrighted by the
        contributors who wrote it.</p>
 
-<h3 id="non-freeSoftware">Non-free software</h3>
+<h3 id="non-freeSoftware">Nonfree software</h3>
 
-       <p>Non-free software is any software that is not free.
+       <p>Nonfree software is any software that is not free.
        Its use, redistribution or modification is prohibited, or
        requires you to ask for permission, or is restricted so much
        that you effectively can't do it freely.</p>
 
 <h3 id="ProprietarySoftware">Proprietary software</h3>
 
-       <p>Proprietary software is another name for non-free software.
-       In the past we subdivided non-free software into
-       &ldquo;semi-free software&rdquo;, which could be modified and
+       <p>Proprietary software is another name for nonfree software.
+       In the past we subdivided nonfree software into
+       &ldquo;semifree software&rdquo;, which could be modified and
        redistributed noncommercially, and &ldquo; proprietary
        software&rdquo;, which could not be.  But we have dropped that
        distinction and now use &ldquo;proprietary software&rdquo; as
-       synonymous with non-free software.</p>
+       synonymous with nonfree software.</p>
 
        <p>The Free Software Foundation follows the rule that we cannot
        install any proprietary program on our computers except temporarily
@@ -296,7 +296,7 @@
        computer in the 1980s, because we were using it to write a free
        replacement for Unix. Nowadays, since free operating systems are
        available, the excuse is no longer applicable; we do not use any
-       non-free operating systems, and any new computer we install
+       nonfree operating systems, and any new computer we install
        must run a completely free operating system.</p>
 
        <p>We don't insist that users of GNU, or contributors to GNU, have
@@ -319,7 +319,7 @@
        redistribute copies, but says that anyone who continues to use a
        copy is <em>required</em> to pay a license fee.</p>
 
-       <p>Shareware is not free software, or even semi-free. There are two
+       <p>Shareware is not free software, or even semifree. There are two
        reasons it is not:</p>
 
        <ul>
@@ -358,8 +358,8 @@
        &ldquo;proprietary&rdquo; are not the same thing! Most
        commercial software
        is <a href="#ProprietarySoftware">proprietary</a>, but there
-       is commercial free software, and there is non-commercial
-       non-free software.</p>
+       is commercial free software, and there is noncommercial
+       nonfree software.</p>
 
        <p>For example, GNU Ada is developed by a company.  It is always
        distributed under the terms of the GNU GPL, and every copy is
@@ -417,7 +417,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/06/27 18:10:15 $
+$Date: 2010/07/01 18:10:11 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/free-sw.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/free-sw.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- philosophy/free-sw.html     29 Jun 2010 18:10:14 -0000      1.22
+++ philosophy/free-sw.html     1 Jul 2010 18:10:11 -0000       1.23
@@ -175,17 +175,11 @@
 In the GNU project, we use 
 <a href="/copyleft/copyleft.html">copyleft</a>
 to protect these freedoms legally for everyone.  But 
-<a href="/philosophy/categories.html#Non-CopyleftedFreeSoftware">non-copylefted
+<a href="/philosophy/categories.html#Non-CopyleftedFreeSoftware">noncopylefted
 free software</a> also exists.  We believe there are important reasons why
 <a href="/philosophy/pragmatic.html">it is better to use copyleft</a>,
-but if your program is non-copylefted free software, it is still basically
-ethical.
-</p>
-
-<p>
-See <a href="/philosophy/categories.html">Categories of Free Software</a>
-for a description of how &ldquo;free software,&rdquo; &ldquo;copylefted 
software&rdquo;
-and other categories of software relate to each other.
+but if your program is noncopylefted free software, it is still basically
+ethical. (See <a href="/philosophy/categories.html">Categories of Free 
Software</a> for a description of how &ldquo;free software,&rdquo; 
&ldquo;copylefted software&rdquo; and other categories of software relate to 
each other.)
 </p>
 
 <p>
@@ -422,7 +416,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/06/29 18:10:14 $
+$Date: 2010/07/01 18:10:11 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/not-ipr.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/not-ipr.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/not-ipr.html     26 May 2010 18:10:13 -0000      1.8
+++ philosophy/not-ipr.html     1 Jul 2010 18:10:11 -0000       1.9
@@ -114,7 +114,7 @@
 
 <blockquote><p>
 Unlike their descendants who now work the floor at WIPO, the framers
-of the US constitution had a principled, pro-competitive attitude to
+of the US constitution had a principled, procompetitive attitude to
 intellectual property.  They knew rights might be necessary,
 but&hellip;they tied congress's hands, restricting its power in
 multiple ways.
@@ -225,7 +225,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/05/26 18:10:13 $
+$Date: 2010/07/01 18:10:11 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/open-source-misses-the-point.html
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/philosophy/open-source-misses-the-point.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- philosophy/open-source-misses-the-point.html        23 Jun 2010 18:10:14 
-0000      1.22
+++ philosophy/open-source-misses-the-point.html        1 Jul 2010 18:10:11 
-0000       1.23
@@ -328,7 +328,7 @@
 <a href="http://freesoftware.mit.edu/papers/lakhaniwolf.pdf";>paper on the
 motivation of free software developers</a> says that a considerable
 fraction are motivated by the view that software should be free.  This
-was despite the fact that they surveyed the developers on SourceForge,
+is despite the fact that they surveyed the developers on SourceForge,
 a site that does not support the view that this is an ethical issue.</p>
 
 </div>
@@ -355,7 +355,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/06/23 18:10:14 $
+$Date: 2010/07/01 18:10:11 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/software-literary-patents.html
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/philosophy/software-literary-patents.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/software-literary-patents.html   23 Jun 2010 18:10:14 -0000      
1.10
+++ philosophy/software-literary-patents.html   1 Jul 2010 18:10:11 -0000       
1.11
@@ -189,7 +189,7 @@
 character of Jean Valjean, because he could not even have considered
 writing a novel of this kind.</p>
 
-<p>This analogy can help non-programmers see what software patents
+<p>This analogy can help nonprogrammers see what software patents
 do. Software patents cover features, such as defining abbreviations in
 a word processor, or natural order recalculation in a spreadsheet.
 Patents cover algorithms that programs need to use.  Patents cover
@@ -256,7 +256,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/06/23 18:10:14 $
+$Date: 2010/07/01 18:10:11 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/words-to-avoid.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/words-to-avoid.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- philosophy/words-to-avoid.html      30 Jun 2010 18:10:19 -0000      1.29
+++ philosophy/words-to-avoid.html      1 Jul 2010 18:10:11 -0000       1.30
@@ -547,7 +547,7 @@
 <a href="http://DefectiveByDesign.org";> Defective by Design</a>
 campaign.</p>
 
-<h4 id="RAND">&ldquo;RAND (reasonable and non-discriminatory)&rdquo;</h4>
+<h4 id="RAND">&ldquo;RAND (Reasonable and Non-Discriminatory)&rdquo;</h4>
 <p>
 Standards bodies that promulgate patent-restricted standards that
 prohibit free software typically have a policy of obtaining patent
@@ -651,7 +651,7 @@
 
 <div class="announcement">
 Also note <a href="/philosophy/categories.html">Categories
-of Free Software</a>.</div>
+of Free and Nonfree Software</a>.</div>
 
 <hr />
 <h4>This essay is published
@@ -692,7 +692,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2010/06/30 18:10:19 $
+$Date: 2010/07/01 18:10:11 $
 <!-- timestamp end -->
 </p>
 </div>