[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www patent-examp/index.html philosophy/economic...
From: |
Pavel Kharitonov |
Subject: |
www patent-examp/index.html philosophy/economic... |
Date: |
Fri, 14 Feb 2014 09:44:39 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: Pavel Kharitonov <ineiev> 14/02/14 09:44:39
Modified files:
patent-examp : index.html
philosophy/economics_frank: frank.html
Log message:
Update to boilerplate v1.75.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/patent-examp/index.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/economics_frank/frank.html?cvsroot=www&r1=1.10&r2=1.11
Patches:
Index: patent-examp/index.html
===================================================================
RCS file: /web/www/www/patent-examp/index.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- patent-examp/index.html 9 Feb 2013 06:11:04 -0000 1.11
+++ patent-examp/index.html 14 Feb 2014 09:44:38 -0000 1.12
@@ -1,8 +1,10 @@
<!--#include virtual="/server/header.html" -->
-<title>Software patents that have harmed free software
+<!-- Parent-Version: 1.75 -->
+<title>Software Patents That have Harmed Free Software
- GNU Project - Free Software Foundation</title>
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
<!--#include virtual="/server/banner.html" -->
-<h2>Software patents that have harmed free software</h2>
+<h2>Software Patents That have Harmed Free Software</h2>
<p>[Please repost this widely, anywhere it's appropriate.]</p>
@@ -35,12 +37,6 @@
<p>Thanks.</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">
@@ -48,54 +44,58 @@
<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 © 2001, 2010 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 © 2001, 2010, 2014 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:04 $
+$Date: 2014/02/14 09:44:38 $
<!-- 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. -->
-
-<ul class="translations-list">
-<!-- English -->
-<li><a href="/server/standards/boilerplate.html">English</a> [en]</li>
-</ul>
-</div>
</div>
</body>
</html>
Index: philosophy/economics_frank/frank.html
===================================================================
RCS file: /web/www/www/philosophy/economics_frank/frank.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/economics_frank/frank.html 28 Feb 2013 17:09:45 -0000
1.10
+++ philosophy/economics_frank/frank.html 14 Feb 2014 09:44:39 -0000
1.11
@@ -1,5 +1,7 @@
<!--#include virtual="/server/header.html" -->
-<title>Does Studying Economics Inhibit Cooperation?</title>
+<!-- Parent-Version: 1.75 -->
+<title>Does Studying Economics Inhibit Cooperation?
+- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/economics_frank/po/frank.translist" -->
<!--#include virtual="/server/banner.html" -->
<h2>Does Studying Economics Inhibit Cooperation?</h2>
@@ -1007,45 +1009,65 @@
<p>Thank you very much for your cooperation.</p>
<p>_____________________________________________________________________</p>
-</div>
+</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
-<p>
-Please send FSF & GNU inquiries to
-<a href="mailto:address@hidden"><em>address@hidden</em></a>.
+<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"><em>address@hidden</em></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 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">
+ <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>
+
+<!-- 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>
-Copyright © 1999, 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"
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright © 1999, 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
-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/02/14 09:44:39 $
<!-- timestamp end -->
</p>
</div>
-
</div>
</body>
</html>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www patent-examp/index.html philosophy/economic...,
Pavel Kharitonov <=