[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy floss-and-foss.ml.html po/floss-...
|
From: |
GNUN |
|
Subject: |
www/philosophy floss-and-foss.ml.html po/floss-... |
|
Date: |
Fri, 08 Jan 2016 13:36:05 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 16/01/08 13:36:05
Modified files:
philosophy : floss-and-foss.ml.html
Added files:
philosophy/po : floss-and-foss.ml-diff.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/floss-and-foss.ml.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/floss-and-foss.ml-diff.html?cvsroot=www&rev=1.1
Patches:
Index: floss-and-foss.ml.html
===================================================================
RCS file: /web/www/www/philosophy/floss-and-foss.ml.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- floss-and-foss.ml.html 9 May 2014 15:30:33 -0000 1.5
+++ floss-and-foss.ml.html 8 Jan 2016 13:36:03 -0000 1.6
@@ -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.ml.po">
+ http://www.gnu.org/philosophy/po/floss-and-foss.ml.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/floss-and-foss.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/floss-and-foss.ml-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-11-09" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/floss-and-foss.en.html" -->
<!--#include virtual="/server/header.ml.html" -->
<!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
<!--#include virtual="/philosophy/po/floss-and-foss.translist" -->
<!--#include virtual="/server/banner.ml.html" -->
+<!--#include virtual="/server/outdated.ml.html" -->
<h2>FLOSS à´à´ FOSS à´à´</h2>
<p><strong>റിà´àµà´à´¾à´°àµâà´¡àµ
à´¸àµà´±àµà´±à´¾à´³àµâമനàµâ</strong> à´à´´àµà´¤à´¿à´¯à´¤àµ.</p>
@@ -118,7 +124,7 @@
<p class="unprintable"><!-- timestamp start -->
à´ªàµà´¤àµà´àµà´à´¿à´¯à´¤àµ:
-$Date: 2014/05/09 15:30:33 $
+$Date: 2016/01/08 13:36:03 $
<!-- timestamp end -->
</p>
Index: po/floss-and-foss.ml-diff.html
===================================================================
RCS file: po/floss-and-foss.ml-diff.html
diff -N po/floss-and-foss.ml-diff.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ po/floss-and-foss.ml-diff.html 8 Jan 2016 13:36:04 -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>
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>FLOSS and FOSS - GNU Project - Free Software
Foundation</title>
+ <!--#include virtual="/philosophy/po/floss-and-foss.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>FLOSS and FOSS</h2>
+
+<p>by <strong>Richard Stallman</strong></p>
+
+<p>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 <a href="/philosophy/free-software-even-more-important.html">
+computer users' freedom</a>; 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
+<a href="/philosophy/open-source-misses-the-point.html"> practical
+benefits only</a>.</p>
+
+<p>To emphasize that “free software” refers to freedom and
+not to price, we sometimes write or say “free/libre
+software,” adding the French or Spanish word that means free in
+the sense of freedom. In some contexts, it works to use just
+“libre software.”</p>
+
+<p>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
+“FLOSS,” meaning “Free/Libre and Open Source
+Software,” 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.</p>
+
+<p>Others use the term “FOSS,” which stands for
+“Free and Open Source Software.” This is meant to mean the
+same thing as “FLOSS,” but it is less clear, since it
+fails to explain that “free” refers to
<em>freedom</em>.
+It also makes “free software” less visible than
+“open source,” since it presents “open source”
+prominently but splits “free software” apart.</p>
+
+<span class="inserted"><ins><em><p>“Free and Open Source
Software” is misleading in
+another way: it suggests that “free and open source” 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.</p></em></ins></span>
+
+<p>Thus, if you want to be neutral between free software and open
+source, <span class="inserted"><ins><em>and clear about
them,</em></ins></span> the way to achieve that is to say
+“FLOSS,” not “FOSS.”</p>
+
+<p>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—by saying
+“free” and “libre”.</p>
+
+</div><!-- for id="content", starts in the include above -->
+
+<!--#include virtual="/server/footer.html" -->
+
+<div id="footer">
+<div class="unprintable">
+
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden"><address@hidden></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a
href="mailto:address@hidden"><address@hidden></a>.</p>
+
+<p><!-- 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 <a href="mailto:address@hidden">
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<p>Copyright © <span
class="removed"><del><strong>2013</strong></del></span> <span
class="inserted"><ins><em>2013, 2015</em></ins></span> Richard
Stallman</p>
+
+<p>This page is licensed under a <a rel="license"
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2016/01/08 13:36:04 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
+</pre></body></html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy floss-and-foss.ml.html po/floss-...,
GNUN <=