www-commits
[Top][All Lists]
Advanced

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

www/philosophy sylvester-response.html kevin-co...


From: Pavel Kharitonov
Subject: www/philosophy sylvester-response.html kevin-co...
Date: Tue, 05 Jun 2012 05:24:43 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       12/06/05 05:24:43

Modified files:
        philosophy     : sylvester-response.html 
                         kevin-cole-response.html 

Log message:
        Update templates; add copyright notices; replace links inconsistent with
        linking policies RT #755441.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/sylvester-response.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/kevin-cole-response.html?cvsroot=www&r1=1.13&r2=1.14

Patches:
Index: sylvester-response.html
===================================================================
RCS file: /web/www/www/philosophy/sylvester-response.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- sylvester-response.html     18 May 2012 19:49:18 -0000      1.12
+++ sylvester-response.html     5 Jun 2012 05:24:25 -0000       1.13
@@ -1,5 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>A Response Letter to the Word Attachments</title>
+<!-- Parent-Version: 1.68 -->
+<title>A Response Letter to the Word Attachments
+- GNU Project - Free Software Foundation</title>
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software
 Foundation, Linux, general, public, license, gpl, general public
 license, freedom, software, power, rights, word, attachment, word
@@ -34,8 +36,8 @@
 <p>
 Receiving Word attachments is not good for you because they can carry
 viruses: see
-<a href="http://www.viruslist.com/en/virusesdescribed?chapter=153313603";>
-http://www.viruslist.com/en/virusesdescribed?chapter=153313603</a>.
+<a href="http://en.wikipedia.org/wiki/Macro_virus_(computing)">
+http://en.wikipedia.org/wiki/Macro_virus_(computing)</a>.
 </p>
 <p>
 Sending Word attachments is not good for you, because a Word document
@@ -138,8 +140,7 @@
 enter a name for the pdf file when requested, then attach that file to
 your email.  There are some cheap or even free programs to make PDF
 files: use the search function at
-<a href="http://www.download.com/";>http://www.download.com/</a> or
-<a href="http://www.tucows.com/";>http://www.tucows.com/</a>
+<a href="http://directory.fsf.org/";>http://directory.fsf.org/</a>
 to find them.
 </p>
 <p>
@@ -156,35 +157,66 @@
 good place to start.
 </p>
 
-</div>
+<!-- If needed, change the copyright block at the bottom. In general,
+     pages 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. -->
+
+
+</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><!-- 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>. -->
+
+For information on coordinating and submitting translations of this
+article, see <a
+href="/server/standards/README.translations.html">Translations README</a>.
 </p>
 
+<p>Copyright &copy; 2004 Martin Sylvester</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>
+
 <p>
 Last updated:
 <!-- timestamp start -->
-$Date: 2012/05/18 19:49:18 $
+$Date: 2012/06/05 05:24:25 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: kevin-cole-response.html
===================================================================
RCS file: /web/www/www/philosophy/kevin-cole-response.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- kevin-cole-response.html    18 May 2012 19:49:11 -0000      1.13
+++ kevin-cole-response.html    5 Jun 2012 05:24:25 -0000       1.14
@@ -1,5 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>A Response Letter to the Word Attachments</title>
+<!-- Parent-Version: 1.68 -->
+<title>A Response Letter to the Word Attachments
+- GNU Project - Free Software Foundation</title>
 
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, general, public, license, gpl, general public license, freedom, 
software, power, rights, word, attachment, word attachment, microsoft" />
 <!--#include virtual="/server/banner.html" -->
@@ -42,36 +44,66 @@
 U.S. Court of Appeals.)
 </p>
 
-</div>
+<!-- If needed, change the copyright block at the bottom. In general,
+     pages 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. -->
+
 
+</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><!-- 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>. -->
+
+For information on coordinating and submitting translations of this
+article, see <a
+href="/server/standards/README.translations.html">Translations README</a>.
 </p>
 
+<p>Copyright &copy; 2003 Kevin Cole</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>
+
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/05/18 19:49:11 $
+$Date: 2012/06/05 05:24:25 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>



reply via email to

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