www-commits
[Top][All Lists]
Advanced

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

www press/press.html philosophy/anonymous-respo...


From: Pavel Kharitonov
Subject: www press/press.html philosophy/anonymous-respo...
Date: Sat, 09 Feb 2013 05:07:36 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       13/02/09 05:07:35

Modified files:
        press          : press.html 
        philosophy     : anonymous-response.html 

Log message:
        Update boilerplate to 1.72.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/press/press.html?cvsroot=www&r1=1.64&r2=1.65
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/anonymous-response.html?cvsroot=www&r1=1.3&r2=1.4

Patches:
Index: press/press.html
===================================================================
RCS file: /web/www/www/press/press.html,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- press/press.html    30 Dec 2011 05:20:15 -0000      1.64
+++ press/press.html    9 Feb 2013 05:07:35 -0000       1.65
@@ -1,11 +1,10 @@
 <!--#include virtual="/server/header.html" -->
-
-  <title>
-    Press Information - GNU Project - Free Software Foundation (FSF)
-  </title>
-
+<!-- Parent-Version: 1.72 -->
+<title>Press Information
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/server/banner.html" -->
-   
+<!--#set var="article_name" value="/press/press" -->
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
   <h2>FSF and GNU Press Information</h2>
 
   <p><a href="/graphics/listen.html"><img src=
@@ -17,23 +16,27 @@
   archival copies of our press releases here, and other information
   of interest to those in the media.</p>
 
-  <h2 id="maillist">Press Mailing
-  List</h2>If you are interested in press-related information
+  <h2 id="maillist">Press Mailing List</h2>
+
+  <p>If you are interested in press-related information
   about the FSF and the GNU project, you can subscribe to <a href=
   "http://mail.gnu.org/mailman/listinfo/info-press";><code>info-press</code>
   mailing list by following this link</a> or sending an email
   message to <a href=
   "mailto:address@hidden";>&lt;address@hidden&gt;</a>
-
-  with the word "subscribe" in the message.
+  with the word &ldquo;subscribe&rdquo; in the message.</p>
 
   <p><a href="http://mail.gnu.org/pipermail/info-press/";>Archives
   of the <code>info-press</code> list are available</a>.</p>
 
-  <h2 id="releases">Press Releases</h2>(In
-  reverse chronological order)<br />
+  <h2 id="releases">Press Releases</h2>
+
+  <p>(In reverse chronological order)</p>
+
+  <p>
   For statements related to the SCO v. IBM lawsuit, please see the
   special <a href="/philosophy/sco">SCO section of our website</a>.
+  </p>
 
   <dl>
 
@@ -297,7 +300,6 @@
     Icaza</a>.</dd>
 
   </dl>
-  <hr />
 
   <h2 id="addinfo">Additional Information</h2>
 
@@ -313,16 +315,15 @@
     and the GNU project.</li>
 
   </ul>
-  <hr />
 
-  <h2 id="background">Background
-  Information</h2>On our <a href=
+  <h2 id="background">Background Information</h2>
+  <p>On our <a href=
   "/philosophy/philosophy.html">philosophy page</a>, we have a
   number of texts that describe the political, ethical and
   practical viewpoints of the Free Software Foundation and the GNU
   project. If you are doing background reading for an article about
   the FSF or GNU, we suggesting in particular the following
-  articles:
+  articles:</p>
 
   <ul>
     <li><a href="/philosophy/free-sw.html">The Free Software
@@ -341,65 +342,66 @@
     "GNU/Linux"</a></li>
   </ul>
 
-</div>
-
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
+<div id="footer">
 
-  <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="http://www.fsf.org/about/contact.html";>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>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-    2003, 2004, 2005, 2006, 2007<br />
-    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-    Boston, MA 02110-1301, USA<br />
-    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>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).
 
-    <p>Updated: <!-- timestamp start -->
-    $Date: 2011/12/30 05:20:15 $
-    <!-- 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 id="translations">
-    <h4>Translations of this page</h4>
-
-    <!-- Please keep this list alphabetical, and in the original -->
-    <!-- language if possible, otherwise default to English -->
-    <!-- If you do not have it English, please comment what the -->
-    <!-- English is.  If you add a new language here, please -->
-    <!-- advise address@hidden and add it to -->
-    <!--    - in /home/www/bin/nightly-vars either TAGSLANG or WEBLANG -->
-    <!--    - in /home/www/html/server/standards/README.translations.html -->
-    <!--      one of the lists under the section "Translations Underway" -->
-    <!--    - if there is a translation team, you also have to add an alias -->
-
-    <!--      to mail.gnu.org:/com/mailer/aliases -->
-    <!-- Please also check you have the 2 letter language code right versus -->
-    <!--     http://www.w3.org/WAI/ER/IG/ert/iso639.htm -->
-
-    <ul class="translations-list">
-      <li><a href="/press/press.en.html">English</a></li>
-      <!-- English -->
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
 
-      <li><a href="/press/press.pt-br.html">portugu&ecirc;s do Brasil</a></li>
+<p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+2003, 2004, 2005, 2006, 2007, 2013 Free Software Foundation, Inc.</p>
 
-      <!-- Brazilian Portuguese -->
-    </ul>
-  </div>
-  </div>
+<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>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2013/02/09 05:07:35 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
 </body>
 </html>

Index: philosophy/anonymous-response.html
===================================================================
RCS file: /web/www/www/philosophy/anonymous-response.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/anonymous-response.html  10 Jun 2012 08:06:05 -0000      1.3
+++ philosophy/anonymous-response.html  9 Feb 2013 05:07:35 -0000       1.4
@@ -1,5 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>A Response Letter to the Word Attachments</title>
+<!-- Parent-Version: 1.72 -->
+<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" />
  <meta http-equiv="Description" content="This essay explains why Microsoft 
Word attachments to email are bad, and describes what you can do to help stop 
this practice." />
@@ -68,27 +70,50 @@
 Word documents.
 </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; 2003 Anonymous contributor</p>
 
@@ -96,14 +121,12 @@
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
 Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
-<p>
-Last updated:
+<p>Updated:
 <!-- timestamp start -->
-$Date: 2012/06/10 08:06:05 $
+$Date: 2013/02/09 05:07:35 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>



reply via email to

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