[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www philosophy/stophr3028.html philosophy/wipo-...
|
From: |
Pavel Kharitonov |
|
Subject: |
www philosophy/stophr3028.html philosophy/wipo-... |
|
Date: |
Tue, 25 Mar 2014 11:11:21 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: Pavel Kharitonov <ineiev> 14/03/25 11:11:21
Modified files:
philosophy : stophr3028.html
wipo-PublicAwarenessOfCopyright-2002.html
greve-clown.html fire.html
music : free-birthday-song.html
Log message:
Update to boilerplate v1.76.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/stophr3028.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/wipo-PublicAwarenessOfCopyright-2002.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/greve-clown.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fire.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/music/free-birthday-song.html?cvsroot=www&r1=1.2&r2=1.3
Patches:
Index: philosophy/stophr3028.html
===================================================================
RCS file: /web/www/www/philosophy/stophr3028.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- philosophy/stophr3028.html 28 Feb 2013 17:09:44 -0000 1.13
+++ philosophy/stophr3028.html 25 Mar 2014 11:11:19 -0000 1.14
@@ -1,20 +1,11 @@
<!--#include virtual="/server/header.html" -->
-
-<title>Stop H.R. 3028 - Protect the Net - Stop the Trademark
Monopolists</title>
-
+<!-- Parent-Version: 1.76 -->
+<title>Stop H.R. 3028
+- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/stophr3028.translist" -->
<!--#include virtual="/server/banner.html" -->
-
<h2>Stop H.R. 3028 - Protect the Net - Stop the Trademark Monopolists</h2>
-<!-- This document uses XHTML 1.0 Strict, but may be served as -->
-<!-- text/html. Please ensure that markup style considers -->
-<!-- appendex C of the XHTML 1.0 standard. See validator.w3.org. -->
-
-<!-- Please ensure links are consistent with Apache's MultiView. -->
-<!-- Change include statements to be consistent with the relevant -->
-<!-- language, where necessary. -->
-
<p>
This is posted on behalf of Marc Rotenberg
<a href="mailto:address@hidden";><address@hidden></a>.
@@ -133,53 +124,67 @@
Letter from ACM, Legal Experts on Problems with H.R. 3028</a></li>
</ul>
-</div>
-
-<!-- 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." -->
-<!-- for id="content", starts in the include above -->
-
+</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>.
+<div class="unprintable">
+
+<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:
-<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"
+ 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>
+</div>
+
+<!-- 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 © 1999, 2008, 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:
+<p></p><p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2013/02/28 17:09:44 $
+$Date: 2014/03/25 11:11:19 $
<!-- timestamp end -->
</p>
</div>
-
</div>
</body>
</html>
Index: philosophy/wipo-PublicAwarenessOfCopyright-2002.html
===================================================================
RCS file: /web/www/www/philosophy/wipo-PublicAwarenessOfCopyright-2002.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/wipo-PublicAwarenessOfCopyright-2002.html 28 Feb 2013
17:09:45 -0000 1.16
+++ philosophy/wipo-PublicAwarenessOfCopyright-2002.html 25 Mar 2014
11:11:19 -0000 1.17
@@ -1,5 +1,7 @@
<!--#include virtual="/server/header.html" -->
-<title>Public Awareness of Copyright, WIPO, June 2002</title>
+<!-- Parent-Version: 1.76 -->
+<title>Public Awareness of Copyright, WIPO
+- GNU Project - Free Software Foundation</title>
<meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, WIPO,
Intellectual Property" />
@@ -7,14 +9,6 @@
<!--#include virtual="/server/banner.html" -->
<h2>Public Awareness of Copyright, WIPO, June 2002</h2>
-<!-- This document uses XHTML 1.0 Strict, but may be served as -->
-<!-- text/html. Please ensure that markup style considers -->
-<!-- appendex C of the XHTML 1.0 standard. See validator.w3.org. -->
-
-<!-- Please ensure links are consistent with Apache's MultiView. -->
-<!-- Change include statements to be consistent with the relevant -->
-<!-- language, where necessary. -->
-
<p>by <a href="http://www.stallman.org";>Richard Stallman</a></p>
<p>Geofrey Yu, Assistant Director General in charge of Copyright at
@@ -92,56 +86,68 @@
term ourselves. If we did, we would be spreading WIPO-style
hypocrisy, whether we intended to or not.</p>
-</div>
-
-<!-- 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." -->
-<!-- for id="content", starts in the include above -->
-
+</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
-
<div id="footer">
+<div class="unprintable">
-<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>
+</div>
+
+<!-- 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, 2003, 2004, 2008, 2014 Free Software
+Foundation, Inc.</p>
-<p>Copyright © 2001, 2003, 2004, 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:
+<p></p><p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2013/02/28 17:09:45 $
+$Date: 2014/03/25 11:11:19 $
<!-- timestamp end -->
</p>
-
</div>
-
-
</div>
</body>
</html>
Index: philosophy/greve-clown.html
===================================================================
RCS file: /web/www/www/philosophy/greve-clown.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/greve-clown.html 28 Feb 2013 17:09:38 -0000 1.11
+++ philosophy/greve-clown.html 25 Mar 2014 11:11:19 -0000 1.12
@@ -1,5 +1,7 @@
<!--#include virtual="/server/header.html" -->
-<title>Speech at the CLOWN - GNU Project - Free Software Foundation
(FSF)</title>
+<!-- Parent-Version: 1.76 -->
+<title>Speech at the CLOWN
+- GNU Project - Free Software Foundation</title>
<!-- top-addendum is disabled because the original text was written in German
rather than in English, which is clearly stated in the article itself -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
@@ -7,31 +9,22 @@
<!--#include virtual="/server/banner.html" -->
<h2>Speech by Georg C. F. Greve in Paderborn (Germany), 5. 12. 98 at the
CLOWN.</h2>
-<!-- Changed by: Georg C. F. Greve, 16-Dec-1998 -->
+<p>Georg C. F. Greve
+<a href="mailto:address@hidden";><address@hidden></a></p>
-<p style="text-align:center">
-<small>
- Copyright © 1998 Georg C. F. Greve.<br />
- Permission statement <a href="#Permission">below</a><br />
-<br />
-Dies ist eine Übersetzung der Rede, das<br />
-<a href="/philosophy/greve-clown.de.html">Deutsche Original</a><br />
-ist ebenfalls verfügbar und wird empfohlen.<br />
-</small>
-</p>
-<h3><a href="http://gnu.org";>Georg C. F. Greve</a>
-<a href="mailto:address@hidden";><address@hidden></a><br />
- History and Philosophy of the<br />
- GNU Project<br />
-</h3>
-<p style="text-align:center">
-<em>This speech was given at the CLOWN (Cluster of Working Nodes), <br />
-a 512-node Cluster project of Debian GNU/Linux machines in the<br />
-University of Paderborn, Germany.<br />
-<br />
- 5. December 1998
-</em>
-</p>
+<p>History and Philosophy of the GNU Project</p>
+
+<blockquote>
+<p>This is a translation of the speech, the
+<a href="/philosophy/greve-clown.de.html">German original</a>
+is also available. Reading the original is recommended.</p>
+
+<p>This speech was given at the CLOWN (Cluster of Working Nodes),
+a 512-node Cluster project of Debian GNU/Linux machines in the
+University of Paderborn, Germany.</p>
+
+<p>5. December 1998</p>
+</blockquote>
<p>
<strong>
@@ -377,43 +370,70 @@
to discuss some things, I'll be here all night and all questions are
welcome. I wish everyone a very interesting night. Thank you.</p>
-</div>
-
+</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
+<div class="unprintable">
-<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.</p>
-<p>
-Please send comments on this speech to Georg Greve
-<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>Please send comments on this speech to Georg Greve
+<a href="mailto:address@hidden";><address@hidden></a></p>
-<p>
-Copyright © 1998 Georg C. F. Greve
-<br />
-<a id="Permission">Permission</a> is granted to make and distribute
+<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>
+</div>
+
+<!-- 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 © 1998 Georg C. F. Greve</p>
+
+<p id="Permission">Permission is granted to make and distribute
verbatim copies of this transcript as long as the copyright and this
permission notice appear.</p>
<!--#include virtual="/server/bottom-notes.html" -->
-<p>Updated:
+<p></p><p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2013/02/28 17:09:38 $
+$Date: 2014/03/25 11:11:19 $
<!-- timestamp end -->
</p>
</div>
-
</div>
</body>
</html>
Index: philosophy/fire.html
===================================================================
RCS file: /web/www/www/philosophy/fire.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- philosophy/fire.html 28 Feb 2013 17:09:36 -0000 1.22
+++ philosophy/fire.html 25 Mar 2014 11:11:19 -0000 1.23
@@ -25,30 +25,69 @@
threw me out the door.</p>
<p>--Ian Clarke</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>. 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>
-
-<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>
+<div class="unprintable">
+
+<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. Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";><address@hidden></a>.</p>
+
+<p>Please send comments on this speech to Georg Greve
+<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:
+
+ 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>
+</div>
+
+<!-- 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 © 2014 Ian Clarke</p>
+
+<p>Verbatim copying and distribution of this entire article is
+permitted in any medium, provided this notice is preserved.</p>
<!--#include virtual="/server/bottom-notes.html" -->
-<p>Updated:
+<p></p><p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2013/02/28 17:09:36 $
+$Date: 2014/03/25 11:11:19 $
<!-- timestamp end -->
</p>
</div>
-
</div>
</body>
</html>
Index: music/free-birthday-song.html
===================================================================
RCS file: /web/www/www/music/free-birthday-song.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- music/free-birthday-song.html 18 Mar 2014 11:58:04 -0000 1.2
+++ music/free-birthday-song.html 25 Mar 2014 11:11:20 -0000 1.3
@@ -1,5 +1,5 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: $Revision: 1.2 $ -->
+<!-- Parent-Version: Revision: 1.76 -->
<title>The Free Birthday Song - GNU Project - Free Software Foundation</title>
@@ -45,9 +45,6 @@
<a href="https://creativecommons.org/licenses/by-sa/4.0/";>Creative
Commons Attribution-ShareAlike 4.0 International</a> license.</p>
-<p>The lyrics of the Free Birthday Song are
-copyrighted © 2014 Steven Sheffey.</p>
-
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
@@ -98,6 +95,8 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
+<p>Copyright © 2014 Steven Sheffey (the lyrics).</p>
+
<p>Copyright © 2014 Free Software Foundation (text other than lyrics.)</p>
<p>This page is licensed under a <a rel="license"
@@ -108,7 +107,7 @@
<p></p><p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/03/18 11:58:04 $
+$Date: 2014/03/25 11:11:20 $
<!-- timestamp end -->
</p>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www philosophy/stophr3028.html philosophy/wipo-...,
Pavel Kharitonov <=