[gnu-pl] wwwgnudiff - raport nr 406
Wojciech Kotwica <[email protected]> Wed, 27 Oct 2004 05:28:37 +0200
| Newsgroups | gmane.os.hurd.web.translators.polish |
|---|---|
| Message-ID | <[email protected]> |
--- prev/www/gnu/gnu-user-groups.html Wed Sep 29 05:27:35 2004
+++ curr/www/gnu/gnu-user-groups.html Wed Oct 27 05:27:33 2004
@@ -243,4 +243,5 @@
Group, Santa Fe, New Mexico</a></li>
<li><a href="http://www.morfree.org">Morgantown Free Software Group</a></li>
+ <li>Iowa Northwest GNU/Linux All-purpose Communal Experience (GNULACEIANW): Contact Mark H. Huddleston, <a href="mailto:[email protected]"><[email protected]></a></li>
</ul></li>
@@ -356,5 +357,5 @@
Updated:
<!-- timestamp start -->
-$Date: 2004/09/28 21:01:29 $ $Author: araujo $
+$Date: 2004/10/27 02:06:29 $ $Author: derekgnu $
<!-- timestamp end -->
</p>
--- prev/www/people/webmeisters.html Sat Oct 23 05:28:16 2004
+++ curr/www/people/webmeisters.html Wed Oct 27 05:28:01 2004
@@ -51,8 +51,4 @@
<p></p></dd>
- <dt><a href="http://www.sauter-online.de/"><strong>Thorsten Sauter</strong></a>
- <a href="mailto:[email protected]"><[email protected]></a></dt>
- <dd>Thorsten is a GNU Project webmaster; he is also a Debian GNU/Linux developer.<p></p></dd>
-
<dt><strong>Cesar J. Alaniz</strong></dt>
<dd>Cesar is a volunteer GNU webmaster and student.<p></p></dd>
@@ -152,4 +148,8 @@
<p></p></dd>
+ <dt><a href="http://www.sauter-online.de/"><strong>Thorsten Sauter</strong></a>
+ <a href="mailto:[email protected]"><[email protected]></a></dt>
+ <dd>Thorsten is a GNU Project webmaster; he is also a Debian GNU/Linux developer.<p></p></dd>
+
<dt><strong><a href="http://www.soucy.org/">Ray P. Soucy</a></strong>
<a href="mailto:[email protected]"><[email protected]></a></dt>
@@ -256,5 +256,5 @@
Updated:
<!-- timestamp start -->
-$Date: 2004/10/22 19:17:37 $ $Author: tsauter $
+$Date: 2004/10/26 07:20:55 $ $Author: tsauter $
<!-- timestamp end -->
</p>
--- prev/www/philosophy/categories.html Wed Oct 6 05:28:17 2004
+++ curr/www/philosophy/categories.html Wed Oct 27 05:28:09 2004
@@ -55,8 +55,8 @@
<li>``<a href="#GNUsoftware"
id="TOCGNUsoftware">GNU software</a>''</li>
+ <li>``<a href="#non-freeSoftware"
+ id="TOCnon-freeSoftware">Non-free software</a>''</li>
<li>``<a href="#semi-freeSoftware"
id="TOCsemi-freeSoftware">Semi-free software</a>''</li>
- <li>``<a href="#PrivateSoftware"
- id="TOCPrivateSoftware">Private (custom) software</a>''</li>
<li>``<a href="#ProprietarySoftware"
id="TOCProprietarySoftware">Proprietary software</a>''</li>
@@ -65,4 +65,6 @@
<li>``<a href="#freeware"
id="TOCfreeware">Freeware</a>''</li>
+ <li>``<a href="#PrivateSoftware"
+ id="TOCPrivateSoftware">Private (custom) software</a>''</li>
<li>``<a href="#commercialSoftware"
id="TOCcommercialSoftware">Commercial software</a>''</li>
@@ -96,9 +98,4 @@
the <a href="/philosophy/free-sw.html">full definition</a>.
<p>
- We also have a list of
- <a href="/philosophy/fs-translations.html">translations
- of the term "free software"</a>
- into various other languages.</p>
- <p>
If a program is free, then it can potentially be included in a
free operating system such as GNU, or free versions of the
@@ -108,5 +105,6 @@
of detail, which could be decided in more than one way and still make
the program free. Some of the possible variations are described
- below.</p>
+ below. For information on specific free software licenses, see
+ the <a href="/licenses/license-list.html">license list</a> page.</p>
<p>
Free software is a matter of freedom, not price. But proprietary
@@ -122,10 +120,13 @@
implies. Sometimes it really is free software; sometimes it isn't.</p>
<p>
- Many languages have two separate words for ``free'' as in freedom and
- ``free'' as in zero price. For example, French has ``libre'' and
- ``gratuit''. English has a word ``gratis'' that refers unambiguously
- to price, but no common adjective that refers unambiguously to
- freedom. This is unfortunate, because such a word would be useful
- here.</p>
+ Many languages have two separate words for ``free'' as in
+ freedom and ``free'' as in zero price. For example, French has
+ ``libre'' and ``gratuit''. Not so English; there is a word
+ ``gratis'' that refers unambiguously to price, but no common
+ adjective that refers unambiguously to freedom. So if you
+ are speaking another language, we suggest you translate ``free''
+ into your language to make it clearer. See our list of
+ <a href="/philosophy/fs-translations.html"> translations of the
+ term "free software"</a> into various other languages.</p>
<p>
Free software is often <a href="/software/reliability.html">more
@@ -300,4 +301,12 @@
</dd>
+<dt><a href="#TOCnonFreeSoftware"
+ id="non-freeSoftware"><strong>Non-free software</strong></a></dt>
+<dd>
+ Non-free software is any software that is not free. This
+ includes <a href="#semi-freeSoftware">semi-free software</a>
+ and <a href="#ProprietarySoftware">proprietary software</a>.
+ </dd>
+
<dt><a href="#TOCsemi-freeSoftware"
id="semi-freeSoftware"><strong>Semi-free software</strong></a></dt>
@@ -352,27 +361,4 @@
write a free replacement. So we don't do that.</p>
</dd>
-
-<dt><a href="categories.html#TOCPrivateSoftware"
- name="PrivateSoftware"><strong>Private software</strong></a></dt>
-<dd>
- Private or custom software is software developed for one user
- (typically an organization or company). That user keeps it and
- uses it, and does not release it to the public either as source
- code or as binaries.
- <p>
- A private program is free software in a trivial sense if its
- unique user has full rights to it. However, in a deeper sense,
- it does not really make sense to pose the question of whether
- such a program is free software or not.</p>
- <p>
- In general we do not believe it is wrong to develop a program and
- not release it. There are occasions when a program is so useful
- that withholding it from release is treating humanity badly.
- However, most programs are not that marvelous, and withholding
- them is not particularly harmful. Thus, the development of
- private or custom software, which is a large fraction of
- programming employment, does not violate the principles of the
- free software movement.</p>
- </dd>
<dt><a href="#TOCProprietarySoftware"
@@ -435,4 +421,30 @@
</dd>
+<dt><a href="categories.html#TOCPrivateSoftware"
+ name="PrivateSoftware"><strong>Private software</strong></a></dt>
+<dd>
+ Private or custom software is software developed for one user
+ (typically an organization or company). That user keeps it and
+ uses it, and does not release it to the public either as source
+ code or as binaries.
+ <p>
+ A private program is free software in a trivial sense if its
+ unique user has full rights to it. However, in a deeper sense,
+ it does not really make sense to pose the question of whether
+ such a program is free software or not.</p>
+ <p>
+ In general we do not believe it is wrong to develop a program and
+ not release it. There are occasions when a program is so useful
+ that withholding it from release is treating humanity badly.
+ However, most programs are not that marvelous, and withholding
+ them is not particularly harmful. Thus, there is no conflict
+ between the development of private or custom software and the
+ principles of the free software movement.</p>
+ <p>
+ Nearly all employment for programmers is in development of custom
+ software; therefore most programming jobs are, or could be, done
+ in a way compatible with the free software movement.</p>
+ </dd>
+
<dt><a href="#TOCcommercialSoftware"
id="commercialSoftware"><strong>Commercial Software</strong></a></dt>
@@ -545,5 +557,5 @@
Updated:
<!-- timestamp start -->
-$Date: 2004/10/05 19:58:26 $ $Author: johnsu01 $
+$Date: 2004/10/26 07:03:10 $ $Author: rms $
<!-- timestamp end -->
</p>
--- prev/www/server/list-mirrors.html Tue Oct 26 05:28:36 2004
+++ curr/www/server/list-mirrors.html Wed Oct 27 05:28:27 2004
@@ -345,5 +345,8 @@
- last updated 22 July 2003
- questions to Phillipe BAQUÉ, <a href="mailto:[email protected]"><[email protected]></a></li>
-
+ <li><a href="http://gnu.mirror.fr/">http://gnu.mirror.fr/</a>
+ - updated weekly
+ - questions to
+ <a href="mailto:[email protected]"><[email protected]></a>.</li>
</ul></li>
@@ -662,11 +665,6 @@
- questions to
<a href="mailto:[email protected]"><[email protected]></a>.</li>
- <li><a href="http://gnu.mirror.fr/">http://gnu.mirror.fr/</a>
- - updated weekly
- - questions to
- <a href="mailto:[email protected]"><[email protected]></a>.</li>
</ul></li>
-
<li><a href="list-mirrors.html#TOCTaiwan"
id="Taiwan"><strong>Taiwan</strong></a>
@@ -953,5 +951,5 @@
Updated:
<!-- timestamp start -->
-$Date: 2004/10/25 08:39:54 $ $Author: tsauter $
+$Date: 2004/10/26 23:13:19 $ $Author: derekgnu $
<!-- timestamp end -->
</p>