[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy compromise.html
From: |
Joerg Kohne |
Subject: |
www/philosophy compromise.html |
Date: |
Mon, 06 May 2013 17:04:20 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: Joerg Kohne <joeko> 13/05/06 17:04:20
Modified files:
philosophy : compromise.html
Log message:
Update to boilerplate 1.75.
(Text change approved by RMS)
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/compromise.html?cvsroot=www&r1=1.28&r2=1.29
Patches:
Index: compromise.html
===================================================================
RCS file: /web/www/www/philosophy/compromise.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- compromise.html 5 May 2013 14:41:54 -0000 1.28
+++ compromise.html 6 May 2013 17:04:19 -0000 1.29
@@ -1,10 +1,9 @@
<!--#include virtual="/server/header.html" -->
-
-<title>Avoiding Ruinous Compromises - GNU Project - Free Software Foundation
(FSF)</title>
-
+<!-- Parent-Version: 1.75 -->
+<title>Avoiding Ruinous Compromises
+- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/compromise.translist" -->
<!--#include virtual="/server/banner.html" -->
-
<h2>Avoiding Ruinous Compromises</h2>
<div style="float: right; font-size: 90%; width: 30em; margin: 1em;
@@ -188,70 +187,48 @@
see <a
href="http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change">"'Nudge'
is not enough"</a>.
</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"><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>
-<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 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><!-- 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 © 2008, 2009 <a href="http://www.stallman.org/">Richard
Stallman</a>.</p>
-<p>Richard Stallman is the founder of the Free Software Foundation.
-You can copy and redistribute this article under the <a rel="license"
+<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 license</a>.</p>
-
-<!--
-<rdf:RDF xmlns="http://creativecommons.org/ns#"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<Work rdf:about="">
-<license rdf:resource="http://creativecommons.org/licenses/by-nd/3.0/" />
-</Work>
-
-<License rdf:about="http://creativecommons.org/licenses/by-nd/3.0/">
- <requires rdf:resource="http://creativecommons.org/ns#Attribution" />
- <permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
-
- <permits rdf:resource="http://creativecommons.org/ns#Distribution" />
- <requires rdf:resource="http://creativecommons.org/ns#Notice" />
-</License>
-
-</rdf:RDF>
-
--->
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/05/05 14:41:54 $
+$Date: 2013/05/06 17:04:19 $
<!-- 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>
</body>
</html>