www-commits
[Top][All Lists]
Advanced

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

www/philosophy privacyaction.html self-interest...


From: Pavel Kharitonov
Subject: www/philosophy privacyaction.html self-interest...
Date: Mon, 20 Jan 2014 09:10:22 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       14/01/20 09:10:22

Modified files:
        philosophy     : privacyaction.html self-interest.html 
                         wsis-2003.html push-copyright-aside.html 
                         guardian-article.html drdobbs-letter.html 
                         microsoft-antitrust.html 

Log message:
        Update to boilerplate v1.75.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/privacyaction.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/self-interest.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/wsis-2003.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/push-copyright-aside.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/guardian-article.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/drdobbs-letter.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/microsoft-antitrust.html?cvsroot=www&r1=1.29&r2=1.30

Patches:
Index: privacyaction.html
===================================================================
RCS file: /web/www/www/philosophy/privacyaction.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- privacyaction.html  28 Feb 2013 17:09:42 -0000      1.16
+++ privacyaction.html  20 Jan 2014 09:10:20 -0000      1.17
@@ -1,5 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>Protect Postal Privacy - GNU Project - Free Software Foundation 
(FSF)</title>
+<!-- Parent-Version: 1.75 -->
+<title>Protect Postal Privacy
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/privacyaction.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Protect Postal Privacy</h2>
@@ -63,54 +65,71 @@
 For further information, see the following web pages:
 
 <ul>
-<!--  <li><a href="http://www.postalwatch.org/";>Postal Watch</a> -->
-<!--  dead link, yavor, 9 Jun 07 -->
   <li><a href="http://www.privacy.org/";>Privacy.org</a></li>
-<!-- <li><a 
href="http://thomas.loc.gov/cgi-bin/query/C?c106:./temp/~c106MQgA5I";>HJR 
55</a></li> -->
-<!-- doesn't work, yavor, 9 Jun 07 -->
   <li><a href="http://www.house.gov/appropriations/";>
        House Appropriations Committee</a></li>
 </ul>
-</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; 1996, 1997, 1998, 2007, 2008 Free Software
+Foundation, Inc.</p>
 
-<p>
-Copyright &copy; 1996, 1997, 1998, 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:42 $
+$Date: 2014/01/20 09:10:20 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: self-interest.html
===================================================================
RCS file: /web/www/www/philosophy/self-interest.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- self-interest.html  28 Feb 2013 17:09:43 -0000      1.13
+++ self-interest.html  20 Jan 2014 09:10:21 -0000      1.14
@@ -1,5 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>Self-Interest - GNU Project - Free Software Foundation (FSF)</title>
+<!-- Parent-Version: 1.75 -->
+<title>Self-Interest
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/self-interest.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Self-Interest</h2>
@@ -132,44 +134,65 @@
 preservation of a cooperative spirit within communities of
 programmers, or maybe both of those at the same time.</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; 1998 Loyd
+        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; 1998 Loyd
 Fueston <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a></p>
+
 <p>Verbatim copying and distribution of this entire article is
-permitted in any medium, provided this notice is preserved.
-</p>
+permitted in any medium, provided this notice is preserved.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 17:09:43 $
+$Date: 2014/01/20 09:10:21 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: wsis-2003.html
===================================================================
RCS file: /web/www/www/philosophy/wsis-2003.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- wsis-2003.html      28 Feb 2013 17:09:45 -0000      1.16
+++ wsis-2003.html      20 Jan 2014 09:10:21 -0000      1.17
@@ -1,5 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>Stallman's Speech at WSIS, 16 July 2003 - GNU Project - Free Software 
Foundation (FSF)</title>
+<!-- Parent-Version: 1.75 -->
+<title>Stallman's Speech at WSIS, 16 July 2003
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/wsis-2003.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Speech at WSIS, 16 July 2003</h2>
@@ -76,44 +78,65 @@
 single company, that's not development, that's electronic
 colonization.</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; 2003 Richard M. 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; 2003 Richard M. 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:45 $
+$Date: 2014/01/20 09:10:21 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: push-copyright-aside.html
===================================================================
RCS file: /web/www/www/philosophy/push-copyright-aside.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- push-copyright-aside.html   28 Feb 2013 17:09:42 -0000      1.28
+++ push-copyright-aside.html   20 Jan 2014 09:10:21 -0000      1.29
@@ -1,5 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>Science must &ldquo;push copyright aside&rdquo; - GNU Project - Free 
Software Foundation (FSF)</title>
+<!-- Parent-Version: 1.75 -->
+<title>Science must &ldquo;push copyright aside&rdquo;
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/push-copyright-aside.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Science must push copyright aside</h2>
@@ -133,50 +135,65 @@
 "open access" means something else, I refer to it as "redistributable
 publication" or "free-to-mirror publication".</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; 2001, 2012 Richard M. 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; 2001, 2012 Richard M. 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/01/20 09:10:21 $
 <!-- 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: guardian-article.html
===================================================================
RCS file: /web/www/www/philosophy/guardian-article.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- guardian-article.html       23 Mar 2013 02:59:51 -0000      1.27
+++ guardian-article.html       20 Jan 2014 09:10:21 -0000      1.28
@@ -1,5 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>Guardian Article on Software Patents - GNU Project - Free Software 
Foundation (FSF)</title>
+<!-- Parent-Version: 1.75 -->
+<title>Guardian Article on Software Patents
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/guardian-article.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Opposing The European Software Patent Directive</h2>
@@ -136,45 +138,65 @@
 to <a 
href="http://web.archive.org/web/20031216123801/http://www.softwarepatents.co.uk";>http://www.softwarepatents.co.uk
 [Archived Page]</a> to learn more, and then talk with the <abbr>MEP</abbr>s 
from
 your region.</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; 2003 Richard M Stallman and Nicholas R Hill
-<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; 2003 Richard M Stallman and Nicholas R Hill</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/03/23 02:59:51 $
+$Date: 2014/01/20 09:10:21 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: drdobbs-letter.html
===================================================================
RCS file: /web/www/www/philosophy/drdobbs-letter.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- drdobbs-letter.html 28 Feb 2013 17:09:35 -0000      1.25
+++ drdobbs-letter.html 20 Jan 2014 09:10:21 -0000      1.26
@@ -1,6 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>Letter to the Editor of Dr. Dobb's Journal - GNU Project - Free
-Software Foundation (FSF)</title>
+<!-- Parent-Version: 1.75 -->
+<title>Letter to the Editor of Dr. Dobb's Journal
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/drdobbs-letter.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Letter to the Editor of Dr. Dobb's Journal</h2>
@@ -77,46 +78,65 @@
 Free Software Foundation
 </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:
+
+        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, 2007 Free Software Foundation, Inc.</p>
 
-<p>
-Copyright &copy; 2000, 2007 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:35 $
+$Date: 2014/01/20 09:10:21 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: microsoft-antitrust.html
===================================================================
RCS file: /web/www/www/philosophy/microsoft-antitrust.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- microsoft-antitrust.html    28 Feb 2013 17:09:39 -0000      1.29
+++ microsoft-antitrust.html    20 Jan 2014 09:10:21 -0000      1.30
@@ -1,10 +1,9 @@
 <!--#include virtual="/server/header.html" -->
-
-<title>The Microsoft Antitrust Trial and Free Software - GNU Project - Free 
Software Foundation (FSF)</title>
-
+<!-- Parent-Version: 1.75 -->
+<title>The Microsoft Antitrust Trial and Free Software
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/microsoft-antitrust.translist" -->
 <!--#include virtual="/server/banner.html" -->
-   
 <h2>The Microsoft Antitrust Trial and Free Software</h2>
 
 <p>
@@ -112,51 +111,65 @@
 us to develop a truly superior alternative to Microsoft Windows,
 in whatever area Microsoft does not make Windows free software.</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:
+
+        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:39 $
+$Date: 2014/01/20 09:10:21 $
 <!-- 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>



reply via email to

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