[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy free-software-for-freedom.es.htm...
|
From: |
GNUN |
|
Subject: |
www/philosophy free-software-for-freedom.es.htm... |
|
Date: |
Fri, 14 Mar 2014 10:58:59 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 14/03/14 10:58:59
Modified files:
philosophy : free-software-for-freedom.es.html
using-gfdl.ko.html using-gfdl.nl.html
wassenaar.ko.html wassenaar.nl.html
philosophy/po : free-software-for-freedom.es-en.html
Added files:
philosophy/po : using-gfdl.ko-diff.html using-gfdl.nl-diff.html
wassenaar.ko-diff.html wassenaar.nl-diff.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-software-for-freedom.es.html?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/using-gfdl.ko.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/using-gfdl.nl.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/wassenaar.ko.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/wassenaar.nl.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-software-for-freedom.es-en.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/using-gfdl.ko-diff.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/using-gfdl.nl-diff.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/wassenaar.ko-diff.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/wassenaar.nl-diff.html?cvsroot=www&rev=1.1
Patches:
Index: free-software-for-freedom.es.html
===================================================================
RCS file: /web/www/www/philosophy/free-software-for-freedom.es.html,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- free-software-for-freedom.es.html 12 Mar 2014 12:28:34 -0000 1.45
+++ free-software-for-freedom.es.html 14 Mar 2014 10:58:57 -0000 1.46
@@ -1,7 +1,7 @@
<!--#include virtual="/server/header.es.html" -->
-<!-- Parent-Version: 1.75 -->
+<!-- Parent-Version: 1.76 -->
<!-- This file is automatically generated by GNUnited Nations! -->
<!--#set var="ENGLISH_PAGE"
value="/philosophy/free-software-for-freedom.en.html" -->
@@ -14,11 +14,11 @@
<h2>Por qué «software libre» es mejor que «código abierto»</h2>
<div class="announcement">
-<blockquote><p>Este artÃculo ha sido sustituido por una versión actualizada
y mejorada
-disponible bajo el tÃtulo <a
+<blockquote><p>Este artÃculo ha sido sustituido por una versión
sustancialmente modificada
+y mejorada disponible bajo el tÃtulo <a
href="/philosophy/open-source-misses-the-point.html">«Por qué el código
-abierto pierde el punto de vista del software libre»</a>. Esta antigua
-versión se conserva sólo como referencia histórica.</p></blockquote>
+abierto pierde el punto de vista del software libre»</a>. Esta versión
+original se conserva sólo como referencia histórica.</p></blockquote>
</div>
<p>
@@ -424,6 +424,7 @@
<!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.es.html" -->
<div id="footer">
+<div class="unprintable">
<p>EnvÃe sus consultas acerca de la FSF y GNU a <a
href="mailto:address@hidden";><address@hidden></a>. Existen también <a
@@ -455,6 +456,7 @@
</p><p>Consulte la <a href="/server/standards/README.translations.html">GuÃa
para las traducciones</a> para obtener información sobre la coordinación y
el envÃo de traducciones de las páginas de este sitio web.</p>
+</div>
<p>Copyright © 1998, 1999, 2000, 2001, 2007 Free Software Foundation,
Inc.</p>
@@ -469,10 +471,10 @@
</div>
- <p><!-- timestamp start -->
+ <p></p><p class="unprintable"><!-- timestamp start -->
Ãltima actualización:
-$Date: 2014/03/12 12:28:34 $
+$Date: 2014/03/14 10:58:57 $
<!-- timestamp end -->
</p>
Index: using-gfdl.ko.html
===================================================================
RCS file: /web/www/www/philosophy/using-gfdl.ko.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- using-gfdl.ko.html 31 Aug 2013 20:12:45 -0000 1.28
+++ using-gfdl.ko.html 14 Mar 2014 10:58:57 -0000 1.29
@@ -8,6 +8,13 @@
<!--#include virtual="/philosophy/po/using-gfdl.translist" -->
<!--#include virtual="/server/banner.ko.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="http://www.gnu.org/philosophy/po/using-gfdl.ko.po";>
+ http://www.gnu.org/philosophy/po/using-gfdl.ko.po</a>' -->
+ <!--#set var="ORIGINAL_FILE" value="/philosophy/using-gfdl.html" -->
+ <!--#set var="DIFF_FILE" value="/philosophy/po/using-gfdl.ko-diff.html" -->
+ <!--#set var="OUTDATED_SINCE" value="2014-01-13" -->
+ <!--#include virtual="/server/outdated.ko.html" -->
<h2>GNU FDL ì¬ì©í기</h2>
<p>ê¸: <a href="http://www.stallman.org";>리ì²ë ì¤í¨ë¨¼</a></p>
@@ -85,7 +92,7 @@
<p><!-- timestamp start -->
ìµì¢
ìì ì¼:
-$Date: 2013/08/31 20:12:45 $
+$Date: 2014/03/14 10:58:57 $
<!-- timestamp end -->
</p>
Index: using-gfdl.nl.html
===================================================================
RCS file: /web/www/www/philosophy/using-gfdl.nl.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- using-gfdl.nl.html 31 Aug 2013 20:12:45 -0000 1.12
+++ using-gfdl.nl.html 14 Mar 2014 10:58:57 -0000 1.13
@@ -8,6 +8,13 @@
<!--#include virtual="/philosophy/po/using-gfdl.translist" -->
<!--#include virtual="/server/banner.nl.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="http://www.gnu.org/philosophy/po/using-gfdl.nl.po";>
+ http://www.gnu.org/philosophy/po/using-gfdl.nl.po</a>' -->
+ <!--#set var="ORIGINAL_FILE" value="/philosophy/using-gfdl.html" -->
+ <!--#set var="DIFF_FILE" value="/philosophy/po/using-gfdl.nl-diff.html" -->
+ <!--#set var="OUTDATED_SINCE" value="2014-01-13" -->
+ <!--#include virtual="/server/outdated.nl.html" -->
<h2>GNU FDL Gebruiken</h2>
<p>door <a href="http://www.stallman.org";>Richard Stallman</a></p>
@@ -106,7 +113,7 @@
<p><!-- timestamp start -->
Bijgewerkt:
-$Date: 2013/08/31 20:12:45 $
+$Date: 2014/03/14 10:58:57 $
<!-- timestamp end -->
</p>
Index: wassenaar.ko.html
===================================================================
RCS file: /web/www/www/philosophy/wassenaar.ko.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- wassenaar.ko.html 31 Aug 2013 20:12:46 -0000 1.18
+++ wassenaar.ko.html 14 Mar 2014 10:58:57 -0000 1.19
@@ -8,6 +8,13 @@
<!--#include virtual="/philosophy/po/wassenaar.translist" -->
<!--#include virtual="/server/banner.ko.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="http://www.gnu.org/philosophy/po/wassenaar.ko.po";>
+ http://www.gnu.org/philosophy/po/wassenaar.ko.po</a>' -->
+ <!--#set var="ORIGINAL_FILE" value="/philosophy/wassenaar.html" -->
+ <!--#set var="DIFF_FILE" value="/philosophy/po/wassenaar.ko-diff.html" -->
+ <!--#set var="OUTDATED_SINCE" value="2014-01-13" -->
+ <!--#include virtual="/server/outdated.ko.html" -->
<h2>ë°ì¸ë르 íì </h2>
<p>
@@ -94,7 +101,7 @@
<p><!-- timestamp start -->
ìµì¢
ìì ì¼:
-$Date: 2013/08/31 20:12:46 $
+$Date: 2014/03/14 10:58:57 $
<!-- timestamp end -->
</p>
Index: wassenaar.nl.html
===================================================================
RCS file: /web/www/www/philosophy/wassenaar.nl.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- wassenaar.nl.html 31 Aug 2013 20:12:46 -0000 1.14
+++ wassenaar.nl.html 14 Mar 2014 10:58:57 -0000 1.15
@@ -8,6 +8,13 @@
<!--#include virtual="/philosophy/po/wassenaar.translist" -->
<!--#include virtual="/server/banner.nl.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="http://www.gnu.org/philosophy/po/wassenaar.nl.po";>
+ http://www.gnu.org/philosophy/po/wassenaar.nl.po</a>' -->
+ <!--#set var="ORIGINAL_FILE" value="/philosophy/wassenaar.html" -->
+ <!--#set var="DIFF_FILE" value="/philosophy/po/wassenaar.nl-diff.html" -->
+ <!--#set var="OUTDATED_SINCE" value="2014-01-13" -->
+ <!--#include virtual="/server/outdated.nl.html" -->
<h2>Het Akkoord van Wassenaar.</h2>
<p>
@@ -110,7 +117,7 @@
<p><!-- timestamp start -->
Bijgewerkt:
-$Date: 2013/08/31 20:12:46 $
+$Date: 2014/03/14 10:58:57 $
<!-- timestamp end -->
</p>
Index: po/free-software-for-freedom.es-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-software-for-freedom.es-en.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- po/free-software-for-freedom.es-en.html 12 Mar 2014 12:28:35 -0000
1.22
+++ po/free-software-for-freedom.es-en.html 14 Mar 2014 10:58:58 -0000
1.23
@@ -1,5 +1,5 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.75 -->
+<!-- Parent-Version: 1.76 -->
<title>Why “Free Software” is better than “Open Source”
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/free-software-for-freedom.translist" -->
@@ -7,11 +7,10 @@
<h2>Why “Free Software” is better than “Open
Source”</h2>
<div class="announcement">
-<blockquote><p>This article has been superseded by
+<blockquote><p>This article has been superseded by a major rewrite,
<a href="/philosophy/open-source-misses-the-point.html">“Open
-Source” misses the point of Free Software</a>, which is a major
-rewrite and a greatly improved. We keep this version for historical
-comparison.</p></blockquote>
+Source” misses the point of Free Software</a>, which is much
+better. We keep this version for historical reasons.</p></blockquote>
</div>
<p>
@@ -404,6 +403,7 @@
</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
@@ -427,6 +427,7 @@
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 © 1998, 1999, 2000, 2001, 2007 Free Software Foundation,
Inc.</p>
@@ -437,9 +438,9 @@
<!--#include virtual="/server/bottom-notes.html" -->
-<p>Updated:
+<p></p><p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/03/12 12:28:35 $
+$Date: 2014/03/14 10:58:58 $
<!-- timestamp end -->
</p>
</div>
Index: po/using-gfdl.ko-diff.html
===================================================================
RCS file: po/using-gfdl.ko-diff.html
diff -N po/using-gfdl.ko-diff.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ po/using-gfdl.ko-diff.html 14 Mar 2014 10:58:58 -0000 1.1
@@ -0,0 +1,160 @@
+<!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/using-gfdl.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" -->
+<span class="inserted"><ins><em><!-- Parent-Version: 1.76
--></em></ins></span>
+<title>Using GNU FDL
+- GNU Project - Free Software <span class="removed"><del><strong>Foundation
(FSF)</title></strong></del></span> <span
class="inserted"><ins><em>Foundation</title></em></ins></span>
+<!--#include virtual="/philosophy/po/using-gfdl.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>Using GNU FDL</h2>
+
+<p>by <a href="http://www.stallman.org">Richard
Stallman</a></p>
+
+<p>If you know someone who is writing a manual about free software,
+and looking towards commercial publication, you have a chance to help
+the Free Software Movement a great deal with a small amount of work:
+by suggesting the idea of publishing the manual under
+the <a href="/copyleft/fdl.html">GNU Free Documentation
+License</a>.</p>
+
+<p>Until recently, commercial book publication almost always implied a
+<span class="removed"><del><strong>non-free</strong></del></span>
+<span class="inserted"><ins><em>nonfree</em></ins></span> book. But just as
free commercial software has been
+increasing for a while, now free commercial documentation is starting
+to take off as well. Some of the major commercial publishers of
+documentation about the <a href= "/gnu/linux-and-gnu.html">GNU/Linux
+system</a>, and about free software in general, are now willing to
+publish books under the GNU FDL, and pay the authors in the usual
+way—IF the authors are firm about this.</p>
+
+<p>But publishers are likely to first propose an ordinary proprietary
+book. And if the authors agree, that's what it will be. So it is
+essential for authors to take the lead; to say, “We want to use
+the GNU FDL for this book”. So when your friend mentions
+writing a manual, you can influence the course of events simply by
+pointing out this possibility.</p>
+
+<p>If a publisher rejects the request at first, the GNU Project may be
+able to help the authors prevail. They can contact us
+at <a
href="mailto:address@hidden"><address@hidden></a>.</p>
+
+<p>There
+are <a href="/licenses/license-list.html#DocumentationLicenses">
+other</a> legitimate free documentation licenses, but sometimes using
+them requires care. For example, one license is equipped with two
+optional clauses that can be enabled; the license is free if neither
+optional clause is used, but enabling either of them makes the book
+<span class="removed"><del><strong>non-free.</strong></del></span>
+<span class="inserted"><ins><em>nonfree.</em></ins></span> (See <a
href="/licenses/license-list.html">
+http://www.gnu.org/licenses/license-list.html.</a>) Authors that want
+to publish free documentation, but using a license other than the GNU
+FDL, can contact us so we can check that the license really qualifies
+for free documentation.</p>
+
+<p>When a commercial manual is free and relates to the GNU system, the
+GNU Project can recommend it to the public. So if the authors or
+publisher set up a web page to describe it and/or sell copies, we can
+make a link to that page from <a
+href="/doc/other-free-books.html">www.gnu.org/doc/other-free-books.html</a>,
+provided the page meets our usual criteria (for instance, it should
+not link to other pages about <span
class="removed"><del><strong>non-free</strong></del></span> <span
class="inserted"><ins><em>nonfree</em></ins></span> software or documentation,
and
+should not be obnoxious about trying to persuade people to buy).
+Please inform <a href="mailto:address@hidden">
+<address@hidden></a> about such pages.</p>
+
+<p>See also <a href="/philosophy/free-doc.html">Free Software and
Free
+Manuals</a>.</p>
+
+<span class="removed"><del><strong></div></strong></del></span>
+
+<span class="inserted"><ins><em></div><!-- for id="content", starts
in the include above --></em></ins></span>
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<span class="removed"><del><strong><p>
+Please</strong></del></span>
+<span class="inserted"><ins><em><div class="unprintable">
+
+<p>Please</em></ins></span> send <span
class="inserted"><ins><em>general</em></ins></span> FSF & GNU inquiries to
+<a <span
class="removed"><del><strong>href="mailto:address@hidden"><em>address@hidden</em></a>.</strong></del></span>
<span
class="inserted"><ins><em>href="mailto:address@hidden"><address@hidden></a>.</em></ins></span>
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.
+<span class="removed"><del><strong><br />
+Please send broken</strong></del></span> <span
class="inserted"><ins><em>Broken</em></ins></span> links and other corrections
or suggestions <span class="inserted"><ins><em>can be sent</em></ins></span>
+to <a <span
class="removed"><del><strong>href="mailto:address@hidden"><em>address@hidden</em></a>.
+</p>
+
+<p></strong></del></span> <span
class="inserted"><ins><em>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>. --></em></ins></span>
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this <span class="removed"><del><strong>article.
+</p>
+
+<p>
+Copyright</strong></del></span> <span
class="inserted"><ins><em>article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright</em></ins></span> © 1999 Richard M. <span
class="removed"><del><strong>Stallman
+<br />
+This</strong></del></span> <span class="inserted"><ins><em>Stallman</p>
+
+<p>This</em></ins></span> page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
+Commons Attribution-NoDerivs 3.0 United States <span
class="removed"><del><strong>License</a>.
+</p></strong></del></span> <span
class="inserted"><ins><em>License</a>.</p></em></ins></span>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<span class="removed"><del><strong><p>Updated:</strong></del></span>
+
+<span class="inserted"><ins><em><p></p><p
class="unprintable">Updated:</em></ins></span>
+<!-- timestamp start -->
+$Date: 2014/03/14 10:58:58 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
+</pre></body></html>
Index: po/using-gfdl.nl-diff.html
===================================================================
RCS file: po/using-gfdl.nl-diff.html
diff -N po/using-gfdl.nl-diff.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ po/using-gfdl.nl-diff.html 14 Mar 2014 10:58:58 -0000 1.1
@@ -0,0 +1,160 @@
+<!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/using-gfdl.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" -->
+<span class="inserted"><ins><em><!-- Parent-Version: 1.76
--></em></ins></span>
+<title>Using GNU FDL
+- GNU Project - Free Software <span class="removed"><del><strong>Foundation
(FSF)</title></strong></del></span> <span
class="inserted"><ins><em>Foundation</title></em></ins></span>
+<!--#include virtual="/philosophy/po/using-gfdl.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>Using GNU FDL</h2>
+
+<p>by <a href="http://www.stallman.org">Richard
Stallman</a></p>
+
+<p>If you know someone who is writing a manual about free software,
+and looking towards commercial publication, you have a chance to help
+the Free Software Movement a great deal with a small amount of work:
+by suggesting the idea of publishing the manual under
+the <a href="/copyleft/fdl.html">GNU Free Documentation
+License</a>.</p>
+
+<p>Until recently, commercial book publication almost always implied a
+<span class="removed"><del><strong>non-free</strong></del></span>
+<span class="inserted"><ins><em>nonfree</em></ins></span> book. But just as
free commercial software has been
+increasing for a while, now free commercial documentation is starting
+to take off as well. Some of the major commercial publishers of
+documentation about the <a href= "/gnu/linux-and-gnu.html">GNU/Linux
+system</a>, and about free software in general, are now willing to
+publish books under the GNU FDL, and pay the authors in the usual
+way—IF the authors are firm about this.</p>
+
+<p>But publishers are likely to first propose an ordinary proprietary
+book. And if the authors agree, that's what it will be. So it is
+essential for authors to take the lead; to say, “We want to use
+the GNU FDL for this book”. So when your friend mentions
+writing a manual, you can influence the course of events simply by
+pointing out this possibility.</p>
+
+<p>If a publisher rejects the request at first, the GNU Project may be
+able to help the authors prevail. They can contact us
+at <a
href="mailto:address@hidden"><address@hidden></a>.</p>
+
+<p>There
+are <a href="/licenses/license-list.html#DocumentationLicenses">
+other</a> legitimate free documentation licenses, but sometimes using
+them requires care. For example, one license is equipped with two
+optional clauses that can be enabled; the license is free if neither
+optional clause is used, but enabling either of them makes the book
+<span class="removed"><del><strong>non-free.</strong></del></span>
+<span class="inserted"><ins><em>nonfree.</em></ins></span> (See <a
href="/licenses/license-list.html">
+http://www.gnu.org/licenses/license-list.html.</a>) Authors that want
+to publish free documentation, but using a license other than the GNU
+FDL, can contact us so we can check that the license really qualifies
+for free documentation.</p>
+
+<p>When a commercial manual is free and relates to the GNU system, the
+GNU Project can recommend it to the public. So if the authors or
+publisher set up a web page to describe it and/or sell copies, we can
+make a link to that page from <a
+href="/doc/other-free-books.html">www.gnu.org/doc/other-free-books.html</a>,
+provided the page meets our usual criteria (for instance, it should
+not link to other pages about <span
class="removed"><del><strong>non-free</strong></del></span> <span
class="inserted"><ins><em>nonfree</em></ins></span> software or documentation,
and
+should not be obnoxious about trying to persuade people to buy).
+Please inform <a href="mailto:address@hidden">
+<address@hidden></a> about such pages.</p>
+
+<p>See also <a href="/philosophy/free-doc.html">Free Software and
Free
+Manuals</a>.</p>
+
+<span class="removed"><del><strong></div></strong></del></span>
+
+<span class="inserted"><ins><em></div><!-- for id="content", starts
in the include above --></em></ins></span>
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<span class="removed"><del><strong><p>
+Please</strong></del></span>
+<span class="inserted"><ins><em><div class="unprintable">
+
+<p>Please</em></ins></span> send <span
class="inserted"><ins><em>general</em></ins></span> FSF & GNU inquiries to
+<a <span
class="removed"><del><strong>href="mailto:address@hidden"><em>address@hidden</em></a>.</strong></del></span>
<span
class="inserted"><ins><em>href="mailto:address@hidden"><address@hidden></a>.</em></ins></span>
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.
+<span class="removed"><del><strong><br />
+Please send broken</strong></del></span> <span
class="inserted"><ins><em>Broken</em></ins></span> links and other corrections
or suggestions <span class="inserted"><ins><em>can be sent</em></ins></span>
+to <a <span
class="removed"><del><strong>href="mailto:address@hidden"><em>address@hidden</em></a>.
+</p>
+
+<p></strong></del></span> <span
class="inserted"><ins><em>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>. --></em></ins></span>
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this <span class="removed"><del><strong>article.
+</p>
+
+<p>
+Copyright</strong></del></span> <span
class="inserted"><ins><em>article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright</em></ins></span> © 1999 Richard M. <span
class="removed"><del><strong>Stallman
+<br />
+This</strong></del></span> <span class="inserted"><ins><em>Stallman</p>
+
+<p>This</em></ins></span> page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
+Commons Attribution-NoDerivs 3.0 United States <span
class="removed"><del><strong>License</a>.
+</p></strong></del></span> <span
class="inserted"><ins><em>License</a>.</p></em></ins></span>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<span class="removed"><del><strong><p>Updated:</strong></del></span>
+
+<span class="inserted"><ins><em><p></p><p
class="unprintable">Updated:</em></ins></span>
+<!-- timestamp start -->
+$Date: 2014/03/14 10:58:58 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
+</pre></body></html>
Index: po/wassenaar.ko-diff.html
===================================================================
RCS file: po/wassenaar.ko-diff.html
diff -N po/wassenaar.ko-diff.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ po/wassenaar.ko-diff.html 14 Mar 2014 10:58:59 -0000 1.1
@@ -0,0 +1,163 @@
+<!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/wassenaar.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" -->
+<span class="inserted"><ins><em><!-- Parent-Version: 1.76
--></em></ins></span>
+<title>The Wassenaar Arrangement
+- GNU Project - Free Software <span class="removed"><del><strong>Foundation
(FSF)</title></strong></del></span> <span
class="inserted"><ins><em>Foundation</title></em></ins></span>
+<!--#include virtual="/philosophy/po/wassenaar.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>The Wassenaar Arrangement</h2>
+
+<p>
+Our first information about the new Wassenaar Arrangement came in the
+form of a newspaper article, which said that export of encryption
+software would be prohibited—and this seemed to include free
+software. So we posted an announcement seeking people in
+non-Wassenaar countries to participate in distribution and development
+of free software for encryption.</p>
+
+<p>
+Subsequently the actual text of the new version of Wassenaar Arrangement was
+published. Then we saw that it continues to have an exception that
+seems to cover free software. (They use the term “public
+domain”, but they seem to mean something like free software by
+that.) So the problem seems to have been a false alarm.</p>
+
+<p>
+However, the US continues to seek such restrictions, and therefore it
+makes sense to continue our preparations, as a precaution in case a
+future version of the Wassenaar Arrangement places further restrictions
+on exportation of free software.</p>
+
+<p>
+Here is our interpretation of the text of the latest Wassenaar
+Arrangement, as we have seen it. This has not been checked by a
+lawyer.</p>
+
+<p>
+According to the General Software Notes, entry 2, the agreement does
+not cover software which is in “the public domain”. This
+is defined in the definitions as technology or software which has been
+made available without restrictions upon its further dissemination.
+There is also a statement that copyright by itself does not deny a
+program this “public domain” status.</p>
+
+<p>
+There are currently discussions about the agreement and it would seem
+logical that the definition of “public domain” is
+something that will be clarified at future meetings.</p>
+
+<p>
+Finnish officials have stated that <cite>“nothing will change as
+far as the “public domain” software and the Dec 3
+Wassenaar Arrangement are concerned.”</cite></p>
+
+<p>
+In Denmark, we are told, there has been an incident where the Ministry
+of Commerce informed an administrator to stop offering the program PGP
+for download.</p>
+
+<p>
+Recent news indicate that the Australian government has prohibited the
+export of free software for encryption by modifying the Wassenaar list
+that related to the definition of software “in the public
+domain.”</p>
+
+<span class="removed"><del><strong></div></strong></del></span>
+
+<span class="inserted"><ins><em></div><!-- for id="content", starts
in the include above --></em></ins></span>
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+
+<span class="removed"><del><strong><p>
+Please</strong></del></span>
+<span class="inserted"><ins><em><div class="unprintable">
+
+<p>Please</em></ins></span> send <span
class="inserted"><ins><em>general</em></ins></span> FSF & GNU inquiries to
+<a <span
class="removed"><del><strong>href="mailto:address@hidden"><em>address@hidden</em></a>.</strong></del></span>
<span
class="inserted"><ins><em>href="mailto:address@hidden"><address@hidden></a>.</em></ins></span>
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.
+<span class="removed"><del><strong><br />
+Please send broken</strong></del></span> <span
class="inserted"><ins><em>Broken</em></ins></span> links and other corrections
or suggestions <span class="inserted"><ins><em>can be sent</em></ins></span>
+to <a <span
class="removed"><del><strong>href="mailto:address@hidden"><em>address@hidden</em></a>.
+</p>
+
+<p></strong></del></span> <span
class="inserted"><ins><em>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>. --></em></ins></span>
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this <span class="removed"><del><strong>article.
+</p>
+
+<p>
+Copyright</strong></del></span> <span
class="inserted"><ins><em>article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright</em></ins></span> © 1996, 1997, 1998, <span
class="removed"><del><strong>2008</strong></del></span> <span
class="inserted"><ins><em>2008, 2014</em></ins></span> Free Software Foundation,
+<span class="removed"><del><strong>Inc.,
+</p>
+<address>51 Franklin St, Fifth Floor, Boston, MA 02110,
USA</address>
+<p>
+This</strong></del></span>
+<span class="inserted"><ins><em>Inc.</p>
+
+<p>This</em></ins></span> page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
+Commons Attribution-NoDerivs 3.0 United States <span
class="removed"><del><strong>License</a>.
+</p></strong></del></span> <span
class="inserted"><ins><em>License</a>.</p></em></ins></span>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<span class="removed"><del><strong><p>Updated:</strong></del></span>
+
+<span class="inserted"><ins><em><p></p><p
class="unprintable">Updated:</em></ins></span>
+<!-- timestamp start -->
+$Date: 2014/03/14 10:58:59 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
+</pre></body></html>
Index: po/wassenaar.nl-diff.html
===================================================================
RCS file: po/wassenaar.nl-diff.html
diff -N po/wassenaar.nl-diff.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ po/wassenaar.nl-diff.html 14 Mar 2014 10:58:59 -0000 1.1
@@ -0,0 +1,163 @@
+<!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/wassenaar.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" -->
+<span class="inserted"><ins><em><!-- Parent-Version: 1.76
--></em></ins></span>
+<title>The Wassenaar Arrangement
+- GNU Project - Free Software <span class="removed"><del><strong>Foundation
(FSF)</title></strong></del></span> <span
class="inserted"><ins><em>Foundation</title></em></ins></span>
+<!--#include virtual="/philosophy/po/wassenaar.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>The Wassenaar Arrangement</h2>
+
+<p>
+Our first information about the new Wassenaar Arrangement came in the
+form of a newspaper article, which said that export of encryption
+software would be prohibited—and this seemed to include free
+software. So we posted an announcement seeking people in
+non-Wassenaar countries to participate in distribution and development
+of free software for encryption.</p>
+
+<p>
+Subsequently the actual text of the new version of Wassenaar Arrangement was
+published. Then we saw that it continues to have an exception that
+seems to cover free software. (They use the term “public
+domain”, but they seem to mean something like free software by
+that.) So the problem seems to have been a false alarm.</p>
+
+<p>
+However, the US continues to seek such restrictions, and therefore it
+makes sense to continue our preparations, as a precaution in case a
+future version of the Wassenaar Arrangement places further restrictions
+on exportation of free software.</p>
+
+<p>
+Here is our interpretation of the text of the latest Wassenaar
+Arrangement, as we have seen it. This has not been checked by a
+lawyer.</p>
+
+<p>
+According to the General Software Notes, entry 2, the agreement does
+not cover software which is in “the public domain”. This
+is defined in the definitions as technology or software which has been
+made available without restrictions upon its further dissemination.
+There is also a statement that copyright by itself does not deny a
+program this “public domain” status.</p>
+
+<p>
+There are currently discussions about the agreement and it would seem
+logical that the definition of “public domain” is
+something that will be clarified at future meetings.</p>
+
+<p>
+Finnish officials have stated that <cite>“nothing will change as
+far as the “public domain” software and the Dec 3
+Wassenaar Arrangement are concerned.”</cite></p>
+
+<p>
+In Denmark, we are told, there has been an incident where the Ministry
+of Commerce informed an administrator to stop offering the program PGP
+for download.</p>
+
+<p>
+Recent news indicate that the Australian government has prohibited the
+export of free software for encryption by modifying the Wassenaar list
+that related to the definition of software “in the public
+domain.”</p>
+
+<span class="removed"><del><strong></div></strong></del></span>
+
+<span class="inserted"><ins><em></div><!-- for id="content", starts
in the include above --></em></ins></span>
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+
+<span class="removed"><del><strong><p>
+Please</strong></del></span>
+<span class="inserted"><ins><em><div class="unprintable">
+
+<p>Please</em></ins></span> send <span
class="inserted"><ins><em>general</em></ins></span> FSF & GNU inquiries to
+<a <span
class="removed"><del><strong>href="mailto:address@hidden"><em>address@hidden</em></a>.</strong></del></span>
<span
class="inserted"><ins><em>href="mailto:address@hidden"><address@hidden></a>.</em></ins></span>
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.
+<span class="removed"><del><strong><br />
+Please send broken</strong></del></span> <span
class="inserted"><ins><em>Broken</em></ins></span> links and other corrections
or suggestions <span class="inserted"><ins><em>can be sent</em></ins></span>
+to <a <span
class="removed"><del><strong>href="mailto:address@hidden"><em>address@hidden</em></a>.
+</p>
+
+<p></strong></del></span> <span
class="inserted"><ins><em>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>. --></em></ins></span>
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this <span class="removed"><del><strong>article.
+</p>
+
+<p>
+Copyright</strong></del></span> <span
class="inserted"><ins><em>article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright</em></ins></span> © 1996, 1997, 1998, <span
class="removed"><del><strong>2008</strong></del></span> <span
class="inserted"><ins><em>2008, 2014</em></ins></span> Free Software Foundation,
+<span class="removed"><del><strong>Inc.,
+</p>
+<address>51 Franklin St, Fifth Floor, Boston, MA 02110,
USA</address>
+<p>
+This</strong></del></span>
+<span class="inserted"><ins><em>Inc.</p>
+
+<p>This</em></ins></span> page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
+Commons Attribution-NoDerivs 3.0 United States <span
class="removed"><del><strong>License</a>.
+</p></strong></del></span> <span
class="inserted"><ins><em>License</a>.</p></em></ins></span>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<span class="removed"><del><strong><p>Updated:</strong></del></span>
+
+<span class="inserted"><ins><em><p></p><p
class="unprintable">Updated:</em></ins></span>
+<!-- timestamp start -->
+$Date: 2014/03/14 10:58:59 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
+</pre></body></html>