www-commits
[Top][All Lists]
Advanced

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

www/philosophy rms-comment-longs-article.html p...


From: Pavel Kharitonov
Subject: www/philosophy rms-comment-longs-article.html p...
Date: Tue, 11 Feb 2014 13:08:18 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       14/02/11 13:08:18

Modified files:
        philosophy     : rms-comment-longs-article.html plan-nine.html 
                         amazon-rms-tim.html amazon-nat.html 
                         lest-codeplex-perplex.html 

Log message:
        Update to boilerplate v1.75; s,non-free,nonfree,

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/rms-comment-longs-article.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/plan-nine.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/amazon-rms-tim.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/amazon-nat.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/lest-codeplex-perplex.html?cvsroot=www&r1=1.12&r2=1.13

Patches:
Index: rms-comment-longs-article.html
===================================================================
RCS file: /web/www/www/philosophy/rms-comment-longs-article.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- rms-comment-longs-article.html      28 Feb 2013 17:09:43 -0000      1.15
+++ rms-comment-longs-article.html      11 Feb 2014 13:08:17 -0000      1.16
@@ -1,6 +1,7 @@
 <!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.75 -->
 <title>Comments on Roderick Long's Article 
-- GNU Project - Free Software Foundation (FSF)</title>
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/rms-comment-longs-article.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Comments on Roderick Long's Article</h2>
@@ -24,23 +25,54 @@
 regards property rights as the highest moral principle, is useful as a
 refutation.  It shows that even if you adore property rights for
 physical objects, you are not compelled to accept copyright.</p>
-</div>
+
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
-<p>Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
-There are also <a href="/contact/">other ways to contact</a> the FSF.<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.</p>
-
-<p>Please see the 
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.</p>
 
-<p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2007, 2008 Free Software 
Foundation, Inc.,</p>
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</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";>&lt;address@hidden&gt;</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";>
+        &lt;address@hidden&gt;</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>
+
+<!-- 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).
 
-<address>51 Franklin St, Fifth Floor, Boston, MA 02110, USA</address>
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2007, 2008
+Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
@@ -50,11 +82,10 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 17:09:43 $
+$Date: 2014/02/11 13:08:17 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: plan-nine.html
===================================================================
RCS file: /web/www/www/philosophy/plan-nine.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- plan-nine.html      28 Feb 2013 17:09:42 -0000      1.28
+++ plan-nine.html      11 Feb 2014 13:08:17 -0000      1.29
@@ -1,10 +1,9 @@
 <!--#include virtual="/server/header.html" -->
-
-<title>The Problems of the Plan 9 License - GNU Project - Free Software 
Foundation (FSF)</title>
-
+<!-- Parent-Version: 1.75 -->
+<title>The Problems of the Plan 9 License
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/plan-nine.translist" -->
 <!--#include virtual="/server/banner.html" -->
-   
 <h2>The Problems of the (Earlier) Plan 9 License</h2>
 
 <p>by <a href="http://www.stallman.org/";><strong>Richard 
Stallman</strong></a></p>
@@ -36,10 +35,10 @@
 <p>
 Here is a list of the problems that I found in the Plan 9 license.
 Some provisions restrict the Plan 9 software so that it is clearly
-non-free; others are just extremely obnoxious.</p>
+nonfree; others are just extremely obnoxious.</p>
 
 <p>
-First, here are the provisions that make the software non-free.</p>
+First, here are the provisions that make the software nonfree.</p>
 <p>
 <strong>
    You agree to provide the Original Contributor, at its request, with a
@@ -143,50 +142,65 @@
 disqualify the license as a free software license (if the other
 problems were corrected), it is unfortunate.</p>
 
-</div>
-
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-
 <div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a> 
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>
-Please see the 
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
 
-<p>
-Copyright &copy; 2000 Richard Stallman
-<br />
-This page is licensed under a <a rel="license"
+        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";>
+        &lt;address@hidden&gt;</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>
+
+<!-- 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 &copy; 2000 Richard Stallman</p>
+
+<p>This 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 License</a>.
-</p>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 17:09:42 $
+$Date: 2014/02/11 13:08:17 $
 <!-- timestamp end -->
 </p>
 </div>
-<!-- All pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. --> 
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
-
 </div>
 </body>
 </html>

Index: amazon-rms-tim.html
===================================================================
RCS file: /web/www/www/philosophy/amazon-rms-tim.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- amazon-rms-tim.html 28 Feb 2013 17:09:33 -0000      1.18
+++ amazon-rms-tim.html 11 Feb 2014 13:08:17 -0000      1.19
@@ -1,5 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>Amazon letter from RMS to Tim O'Reilly - GNU Project - Free Software 
Foundation (FSF)</title>
+<!-- Parent-Version: 1.75 -->
+<title>Amazon letter from RMS to Tim O'Reilly
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/amazon-rms-tim.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Letter from RMS to Tim O'Reilly</h2>
@@ -59,46 +61,65 @@
 Amazon.
 </pre>
 
-</div>
-
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
 
-<p>
-Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a> 
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>
-Please see the 
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</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";>
+        &lt;address@hidden&gt;</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>
+
+<!-- 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 &copy; 1999, 2007, 2008 Free Software Foundation, Inc.</p>
 
-<p>
-Copyright &copy; 1999, 2007, 2008 Free Software Foundation, Inc.,
-</p>
-<address>51 Franklin St, Fifth Floor, Boston, MA 02110, USA</address>
 <p>This 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 License</a>.
-</p>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 17:09:33 $
+$Date: 2014/02/11 13:08:17 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: amazon-nat.html
===================================================================
RCS file: /web/www/www/philosophy/amazon-nat.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- amazon-nat.html     28 Feb 2013 17:09:33 -0000      1.23
+++ amazon-nat.html     11 Feb 2014 13:08:17 -0000      1.24
@@ -1,8 +1,10 @@
 <!--#include virtual="/server/header.html" -->
-<title>Amazon letter from Nat - GNU Project - Free Software Foundation 
(FSF)</title>
+<!-- Parent-Version: 1.75 -->
+<title>Amazon Letter from Nat
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/amazon-nat.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2>Letter from Nat</h2>
+<h2>Amazon Letter from Nat</h2>
 
 <p>This is a letter from Nat Friedman regarding the Amazon Boycott.
 Please <a href="/philosophy/amazon.html">read more about this
@@ -37,46 +39,65 @@
 Nat
 </pre>
 
-</div>
-
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
 
-<p>
-Please send FSF &amp; GNU inquiries to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>
-Please see the
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</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";>
+        &lt;address@hidden&gt;</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>
+
+<!-- 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 &copy; 1999, 2007, 2008 Free Software Foundation, Inc.</p>
 
-<p>
-Copyright &copy; 1999, 2007, 2008 Free Software Foundation, Inc.,
-</p>
-<address>51 Franklin St, Fifth Floor, Boston, MA 02110, USA</address>
 <p>This 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 License</a>.
-</p>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 17:09:33 $
+$Date: 2014/02/11 13:08:17 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: lest-codeplex-perplex.html
===================================================================
RCS file: /web/www/www/philosophy/lest-codeplex-perplex.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- lest-codeplex-perplex.html  28 Feb 2013 17:09:39 -0000      1.12
+++ lest-codeplex-perplex.html  11 Feb 2014 13:08:18 -0000      1.13
@@ -1,6 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-
-<title>Lest CodePlex perplex - GNU Project - Free Software Foundation 
(FSF)</title>
+<!-- Parent-Version: 1.75 -->
+<title>Lest CodePlex perplex
+- GNU Project - Free Software Foundation</title>
 <link rel="canonical" 
href="http://www.fsf.org/blogs/rms/microsoft-codeplex-foundation"; />
 <!--#include virtual="/philosophy/po/lest-codeplex-perplex.translist" -->
 <!--#include virtual="/server/banner.html" -->
@@ -95,7 +96,7 @@
 
 <p>That would be harmful if it succeeds, because a program that
 doesn't run (or doesn't run well) in the Free World does not
-contribute to our freedom.  A non-free program takes away its users'
+contribute to our freedom.  A nonfree program takes away its users'
 freedom.  To avoid being harmed in that way, we need to reject
 proprietary system platforms as well as proprietary applications.
 CodePlex free add-ons to a proprietary base increase society's
@@ -111,7 +112,7 @@
 free, we must make freedom our goal.</p>
 
 <p>If the CodePlex Foundation wishes to be a real contributor to the
-free software community, it must not aim at free add-ons to non-free
+free software community, it must not aim at free add-ons to nonfree
 packages.  It needs to encourage development of portable software
 capable of running on free platforms based on GNU/Linux and other free
 operating systems.  If it tries to seduce us into going in the
@@ -125,41 +126,65 @@
 continues to act to harm us.  We would be fools indeed to let anything
 distract us from that.</p>
 
-</div>
-
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-
 <div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to
+
+<p>Please send general FSF &amp; GNU inquiries to
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>Please see the <a
+<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";>
+        &lt;address@hidden&gt;</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>
 
+<!-- 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 &copy; 2009 Richard Stallman</p>
+
 <p>This 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 License</a>.
-</p>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 17:09:39 $
+$Date: 2014/02/11 13:08:18 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>



reply via email to

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