www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/philosophy floss-and-foss.de.html floss-and...


From: GNUN
Subject: www/philosophy floss-and-foss.de.html floss-and...
Date: Sun, 11 Sep 2016 14:58:16 +0000 (UTC)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/09/11 14:58:16

Modified files:
        philosophy     : floss-and-foss.de.html floss-and-foss.pl.html 
Added files:
        philosophy/po  : floss-and-foss.de-diff.html 
                         floss-and-foss.pl-diff.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/floss-and-foss.de.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/floss-and-foss.pl.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/floss-and-foss.de-diff.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/floss-and-foss.pl-diff.html?cvsroot=www&rev=1.1

Patches:
Index: floss-and-foss.de.html
===================================================================
RCS file: /web/www/www/philosophy/floss-and-foss.de.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- floss-and-foss.de.html      1 Apr 2016 14:49:01 -0000       1.6
+++ floss-and-foss.de.html      11 Sep 2016 14:58:15 -0000      1.7
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/floss-and-foss.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/floss-and-foss.de.po">
+ https://www.gnu.org/philosophy/po/floss-and-foss.de.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/floss-and-foss.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/floss-and-foss.de-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2016-07-13" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/floss-and-foss.en.html" -->
 
 <!--#include virtual="/server/header.de.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
 
 <!--#include virtual="/philosophy/po/floss-and-foss.translist" -->
 <!--#include virtual="/server/banner.de.html" -->
+<!--#include virtual="/server/outdated.de.html" -->
 <h2>FLOSS und FOSS</h2>
 
 <p>von <strong>Richard Stallman</strong></p>
@@ -129,7 +135,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2016/04/01 14:49:01 $
+$Date: 2016/09/11 14:58:15 $
 
 <!-- timestamp end -->
 </p>

Index: floss-and-foss.pl.html
===================================================================
RCS file: /web/www/www/philosophy/floss-and-foss.pl.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- floss-and-foss.pl.html      30 Jan 2016 03:28:53 -0000      1.2
+++ floss-and-foss.pl.html      11 Sep 2016 14:58:15 -0000      1.3
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/floss-and-foss.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/floss-and-foss.pl.po">
+ https://www.gnu.org/philosophy/po/floss-and-foss.pl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/floss-and-foss.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/floss-and-foss.pl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2016-07-13" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/floss-and-foss.en.html" -->
 
 <!--#include virtual="/server/header.pl.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
 
 <!--#include virtual="/philosophy/po/floss-and-foss.translist" -->
 <!--#include virtual="/server/banner.pl.html" -->
+<!--#include virtual="/server/outdated.pl.html" -->
 <h2>FLOSS i&nbsp;FOSS</h2>
 
 <p><strong>Richard Stallman</strong></p>
@@ -130,7 +136,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2016/01/30 03:28:53 $
+$Date: 2016/09/11 14:58:15 $
 
 <!-- timestamp end -->
 </p>

Index: po/floss-and-foss.de-diff.html
===================================================================
RCS file: po/floss-and-foss.de-diff.html
diff -N po/floss-and-foss.de-diff.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ po/floss-and-foss.de-diff.html      11 Sep 2016 14:58:16 -0000      1.1
@@ -0,0 +1,121 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>/philosophy/floss-and-foss.html-diff</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: 1.77 --&gt;
+&lt;title&gt;FLOSS and FOSS - GNU Project - Free Software 
Foundation&lt;/title&gt;
+ &lt;!--#include virtual="/philosophy/po/floss-and-foss.translist" --&gt;
+&lt;!--#include virtual="/server/banner.html" --&gt;
+&lt;h2&gt;FLOSS and FOSS&lt;/h2&gt;
+
+&lt;p&gt;by &lt;strong&gt;Richard Stallman&lt;/strong&gt;&lt;/p&gt;
+
+&lt;p&gt;The two political camps in the free software community are the free
+software movement and open source.  The free software movement is a
+campaign
+for &lt;a href="/philosophy/free-software-even-more-important.html"&gt;
+computer users' freedom&lt;/a&gt;; we say that a nonfree program is an
+injustice to its users.  The open source camp declines to see the
+issue as a matter of justice to the users, and bases its arguments on
+&lt;a href="/philosophy/open-source-misses-the-point.html"&gt; practical
+benefits only&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;To emphasize that &ldquo;free software&rdquo; refers to freedom and
+not to price, we sometimes write or say <span 
class="removed"><del><strong>&ldquo;free/libre</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;free (libre)</em></ins></span>
+software,&rdquo; adding the French or Spanish word that means free in
+the sense of freedom.  In some contexts, it works to use just
+&ldquo;libre software.&rdquo;&lt;/p&gt;
+
+&lt;p&gt;A researcher studying practices and methods used by developers in
+the free software community decided that these questions were
+independent of the developers' political views, so he used the term
+&ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source
+Software,&rdquo; to explicitly avoid a preference between the two
+political camps.  If you wish to be neutral, this is a good way to do
+it, since this makes the names of the two camps equally prominent.&lt;/p&gt;
+
+&lt;p&gt;Others use the term &ldquo;FOSS,&rdquo; which stands for
+&ldquo;Free and Open Source Software.&rdquo; This is meant to mean the
+same thing as &ldquo;FLOSS,&rdquo; but it is less clear, since it
+fails to explain that &ldquo;free&rdquo; refers to 
&lt;em&gt;freedom&lt;/em&gt;.
+It also makes &ldquo;free software&rdquo; less visible than
+&ldquo;open source,&rdquo; since it presents &ldquo;open source&rdquo;
+prominently but splits &ldquo;free software&rdquo; apart.&lt;/p&gt;
+
+&lt;p&gt;&ldquo;Free and Open Source Software&rdquo; is misleading in
+another way: it suggests that &ldquo;free and open source&rdquo; names
+a single point of view, rather than mentioning two different ones.
+This conceptualization of the field is an obstacle to understanding
+the fact that free software and open source are different political
+positions that disagree fundamentally.&lt;/p&gt;
+
+&lt;p&gt;Thus, if you want to be neutral between free software and open
+source, and clear about them, the way to achieve that is to say
+&ldquo;FLOSS,&rdquo; not &ldquo;FOSS.&rdquo;&lt;/p&gt;
+
+&lt;p&gt;We in the free software movement don't use either of these terms,
+because we don't want to be neutral on the political question.  We
+stand for freedom, and we show it every time&mdash;by saying
+&ldquo;free&rdquo; and <span 
class="removed"><del><strong>&ldquo;libre&rdquo;.&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>&ldquo;libre&rdquo;&mdash; or &ldquo;free
+(libre)&rdquo;.&lt;/p&gt;</em></ins></span>
+
+&lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
+
+&lt;!--#include virtual="/server/footer.html" --&gt;
+
+&lt;div id="footer"&gt;
+&lt;div class="unprintable"&gt;
+
+&lt;p&gt;Please send general FSF &amp; GNU inquiries to
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to &lt;a href="mailto:address@hidden"&gt;
+        &lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and submitting translations of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;
+
+Please see the &lt;a
+href="/server/standards/README.translations.html"&gt;Translations
+README&lt;/a&gt; for information on coordinating and submitting translations
+of this article.&lt;/p&gt;
+&lt;/div&gt;
+
+&lt;p&gt;Copyright &copy; 2013, <span 
class="removed"><del><strong>2015</strong></del></span> <span 
class="inserted"><ins><em>2015, 2016</em></ins></span> Richard 
Stallman&lt;/p&gt;
+
+&lt;p&gt;This page is licensed under a &lt;a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
+Commons Attribution-NoDerivatives 4.0 International 
License&lt;/a&gt;.&lt;/p&gt;
+
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
+
+&lt;p class="unprintable"&gt;Updated:
+&lt;!-- timestamp start --&gt;
+$Date: 2016/09/11 14:58:16 $
+&lt;!-- timestamp end --&gt;
+&lt;/p&gt;
+&lt;/div&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+</pre></body></html>

Index: po/floss-and-foss.pl-diff.html
===================================================================
RCS file: po/floss-and-foss.pl-diff.html
diff -N po/floss-and-foss.pl-diff.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ po/floss-and-foss.pl-diff.html      11 Sep 2016 14:58:16 -0000      1.1
@@ -0,0 +1,121 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>/philosophy/floss-and-foss.html-diff</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: 1.77 --&gt;
+&lt;title&gt;FLOSS and FOSS - GNU Project - Free Software 
Foundation&lt;/title&gt;
+ &lt;!--#include virtual="/philosophy/po/floss-and-foss.translist" --&gt;
+&lt;!--#include virtual="/server/banner.html" --&gt;
+&lt;h2&gt;FLOSS and FOSS&lt;/h2&gt;
+
+&lt;p&gt;by &lt;strong&gt;Richard Stallman&lt;/strong&gt;&lt;/p&gt;
+
+&lt;p&gt;The two political camps in the free software community are the free
+software movement and open source.  The free software movement is a
+campaign
+for &lt;a href="/philosophy/free-software-even-more-important.html"&gt;
+computer users' freedom&lt;/a&gt;; we say that a nonfree program is an
+injustice to its users.  The open source camp declines to see the
+issue as a matter of justice to the users, and bases its arguments on
+&lt;a href="/philosophy/open-source-misses-the-point.html"&gt; practical
+benefits only&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;To emphasize that &ldquo;free software&rdquo; refers to freedom and
+not to price, we sometimes write or say <span 
class="removed"><del><strong>&ldquo;free/libre</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;free (libre)</em></ins></span>
+software,&rdquo; adding the French or Spanish word that means free in
+the sense of freedom.  In some contexts, it works to use just
+&ldquo;libre software.&rdquo;&lt;/p&gt;
+
+&lt;p&gt;A researcher studying practices and methods used by developers in
+the free software community decided that these questions were
+independent of the developers' political views, so he used the term
+&ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source
+Software,&rdquo; to explicitly avoid a preference between the two
+political camps.  If you wish to be neutral, this is a good way to do
+it, since this makes the names of the two camps equally prominent.&lt;/p&gt;
+
+&lt;p&gt;Others use the term &ldquo;FOSS,&rdquo; which stands for
+&ldquo;Free and Open Source Software.&rdquo; This is meant to mean the
+same thing as &ldquo;FLOSS,&rdquo; but it is less clear, since it
+fails to explain that &ldquo;free&rdquo; refers to 
&lt;em&gt;freedom&lt;/em&gt;.
+It also makes &ldquo;free software&rdquo; less visible than
+&ldquo;open source,&rdquo; since it presents &ldquo;open source&rdquo;
+prominently but splits &ldquo;free software&rdquo; apart.&lt;/p&gt;
+
+&lt;p&gt;&ldquo;Free and Open Source Software&rdquo; is misleading in
+another way: it suggests that &ldquo;free and open source&rdquo; names
+a single point of view, rather than mentioning two different ones.
+This conceptualization of the field is an obstacle to understanding
+the fact that free software and open source are different political
+positions that disagree fundamentally.&lt;/p&gt;
+
+&lt;p&gt;Thus, if you want to be neutral between free software and open
+source, and clear about them, the way to achieve that is to say
+&ldquo;FLOSS,&rdquo; not &ldquo;FOSS.&rdquo;&lt;/p&gt;
+
+&lt;p&gt;We in the free software movement don't use either of these terms,
+because we don't want to be neutral on the political question.  We
+stand for freedom, and we show it every time&mdash;by saying
+&ldquo;free&rdquo; and <span 
class="removed"><del><strong>&ldquo;libre&rdquo;.&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>&ldquo;libre&rdquo;&mdash; or &ldquo;free
+(libre)&rdquo;.&lt;/p&gt;</em></ins></span>
+
+&lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
+
+&lt;!--#include virtual="/server/footer.html" --&gt;
+
+&lt;div id="footer"&gt;
+&lt;div class="unprintable"&gt;
+
+&lt;p&gt;Please send general FSF &amp; GNU inquiries to
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to &lt;a href="mailto:address@hidden"&gt;
+        &lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and submitting translations of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;
+
+Please see the &lt;a
+href="/server/standards/README.translations.html"&gt;Translations
+README&lt;/a&gt; for information on coordinating and submitting translations
+of this article.&lt;/p&gt;
+&lt;/div&gt;
+
+&lt;p&gt;Copyright &copy; 2013, <span 
class="removed"><del><strong>2015</strong></del></span> <span 
class="inserted"><ins><em>2015, 2016</em></ins></span> Richard 
Stallman&lt;/p&gt;
+
+&lt;p&gt;This page is licensed under a &lt;a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
+Commons Attribution-NoDerivatives 4.0 International 
License&lt;/a&gt;.&lt;/p&gt;
+
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
+
+&lt;p class="unprintable"&gt;Updated:
+&lt;!-- timestamp start --&gt;
+$Date: 2016/09/11 14:58:16 $
+&lt;!-- timestamp end --&gt;
+&lt;/p&gt;
+&lt;/div&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+</pre></body></html>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]