[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www philosophy/ICT-for-prosperity.html fun/joke...
From: |
Pavel Kharitonov |
Subject: |
www philosophy/ICT-for-prosperity.html fun/joke... |
Date: |
Mon, 18 Feb 2013 07:49:18 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: Pavel Kharitonov <ineiev> 13/02/18 07:49:18
Modified files:
philosophy : ICT-for-prosperity.html
fun/jokes : purchase.agreement.html
software/help2man: help2man.html
Log message:
s/bug-baz/webmasters/; update boilerplate texts to 1.73.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/ICT-for-prosperity.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/purchase.agreement.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/software/help2man/help2man.html?cvsroot=www&r1=1.9&r2=1.10
Patches:
Index: philosophy/ICT-for-prosperity.html
===================================================================
RCS file: /web/www/www/philosophy/ICT-for-prosperity.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- philosophy/ICT-for-prosperity.html 9 Feb 2013 06:11:05 -0000 1.18
+++ philosophy/ICT-for-prosperity.html 18 Feb 2013 07:49:15 -0000 1.19
@@ -1,6 +1,7 @@
<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.73 -->
<title>Shaping Collaborative ICT Development and Initiatives for
-Global Prosperity - GNU Project - Free Software Foundation (FSF)</title>
+Global Prosperity - GNU Project - Free Software Foundation</title>
<!--#include virtual="/server/banner.html" -->
<!--#include virtual="/philosophy/po/ICT-for-prosperity.translist" -->
@@ -589,12 +590,6 @@
Free software empowers people who previously were kept out.
</p>
-<!-- If needed, change the copyright block at the bottom. In general,
- 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><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
@@ -602,32 +597,59 @@
<p>Please send general FSF & GNU inquiries to
<a href="mailto:address@hidden"><address@hidden></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"><address@hidden></a>.</p>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden"><address@hidden></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">
+ <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>. -->
+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 © 1996, 1997, 1998, 2007, 2008, 2010, 2011 Free
+<!-- 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 © 1996, 1997, 1998, 2007, 2008, 2010, 2011, 2013 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
-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/09 06:11:05 $
+$Date: 2013/02/18 07:49:15 $
<!-- timestamp end -->
</p>
</div>
-
</div>
</body>
</html>
Index: fun/jokes/purchase.agreement.html
===================================================================
RCS file: /web/www/www/fun/jokes/purchase.agreement.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- fun/jokes/purchase.agreement.html 9 Feb 2013 06:09:51 -0000 1.13
+++ fun/jokes/purchase.agreement.html 18 Feb 2013 07:49:16 -0000 1.14
@@ -1,7 +1,7 @@
-<!-- Parent-Version: 1.59 -->
<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.73 -->
<title>Disclaimer
-- GNU Project - Free Software Foundation (FSF)</title>
+- GNU Project - Free Software Foundation</title>
<!--#include virtual="/server/banner.html" -->
<!--#include virtual="/fun/jokes/po/purchase.agreement.translist" -->
<h2>Disclaimer!</h2>
@@ -13,10 +13,6 @@
<hr />
<pre>
-<!-- When using this boilerplate, remember to replace the
- "JokeTITLE" in both places above.
- And if it's a song, not a joke, change that word in the Disclaimer.
--->
Disclaimer to be used when purchasing software:
@@ -86,33 +82,56 @@
<p>The joke on this page was obtained from the FSF's
<a href="http://mail.gnu.org/">email archives</a>
-of the GNU Project.<br />
-The Free Software Foundation claims no copyrights on this joke.</p>
+of the GNU Project.</p>
-<!--
- * If needed, change the copyright block at the bottom. In general, 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.
--->
-</div>
+<p>The Free Software Foundation claims no copyrights on this joke.</p>
+
+</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
<p>Please send general FSF & GNU inquiries to
<a href="mailto:address@hidden"><address@hidden></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
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden"><address@hidden></a>.</p>
-<a 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:
-<p>Please see the <a
+ 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>. -->
+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 © 1999 Free Software Foundation, Inc.</p>
-<!--, 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA-->
+<!-- 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 © 2013 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
@@ -122,12 +141,10 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/02/09 06:09:51 $
+$Date: 2013/02/18 07:49:16 $
<!-- timestamp end -->
</p>
</div>
-
</div>
</body>
</html>
-
Index: software/help2man/help2man.html
===================================================================
RCS file: /web/www/www/software/help2man/help2man.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- software/help2man/help2man.html 9 Feb 2013 06:11:53 -0000 1.9
+++ software/help2man/help2man.html 18 Feb 2013 07:49:17 -0000 1.10
@@ -1,9 +1,8 @@
-<!-- Parent-Version: 1.57 -->
-
<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.73 -->
<title>help2man - GNU Project - Free Software Foundation</title>
<!--#include virtual="/server/banner.html" -->
-
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
<h2 class="settitle">`help2man' Reference Manual</h2>
<a name="Top"></a>
@@ -454,16 +453,45 @@
<p>Please send general FSF & GNU inquiries to
<a href="mailto:address@hidden"><address@hidden></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"><address@hidden></a>.</p>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a 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:
-<p>Please see the <a
+ 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>. -->
+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 © 2011 Free Software Foundation, Inc.</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 © 2013 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
@@ -473,38 +501,10 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/02/09 06:11:53 $
+$Date: 2013/02/18 07:49:17 $
<!-- timestamp end -->
</p>
</div>
-
-<div id="translations">
-<h4>Translations of this page</h4>
-
-<!-- Please keep this list alphabetical by language code.
- Comment what the language is for each type, i.e. de is German.
- Write the language name in its own language (Deutsch) in the text.
- If you add a new language here, please
- advise address@hidden and add it to
- - /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 language code right; see:
- http://www.loc.gov/standards/iso639-2/php/code_list.php
- If the 2-letter ISO 639-1 code is not available,
- use the 3-letter ISO 639-2.
- Please use W3C normative character entities.
-
- See also '(web-trans)Capitalization':
-
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
- -->
-
-<ul class="translations-list">
-<!-- English -->
-<li><a href="/server/standards/boilerplate.html">English</a> [en]</li>
-</ul>
-</div>
</div>
</body>
</html>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www philosophy/ICT-for-prosperity.html fun/joke...,
Pavel Kharitonov <=