www/licenses gcc-exception-3.1-faq.html

[Joerg Kohne]

CVSROOT:        /web/www
Module name:    www
Changes by:     Joerg Kohne <joeko>     13/02/07 21:30:06

Modified files:
        licenses       : gcc-exception-3.1-faq.html 

Log message:
        Validation error fixed; update to boilerplate v1.72.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gcc-exception-3.1-faq.html?cvsroot=www&r1=1.11&r2=1.12

Patches:
Index: gcc-exception-3.1-faq.html
===================================================================
RCS file: /web/www/www/licenses/gcc-exception-3.1-faq.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gcc-exception-3.1-faq.html  7 Feb 2013 20:14:00 -0000       1.11
+++ gcc-exception-3.1-faq.html  7 Feb 2013 21:30:04 -0000       1.12
@@ -1,19 +1,15 @@
-1;3201;0c
 <!--#include virtual="/server/header.html" -->
-<title>GCC Runtime Library Exception Rationale and FAQ - GNU Project - Free 
Software Foundation</title>
+<!-- Parent-Version: 1.72 -->
+<title>GCC Runtime Library Exception Rationale and FAQ
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/server/banner.html" -->
 <!--#include virtual="/licenses/po/gcc-exception-3.1-faq.translist" -->
 <h2>GCC Runtime Library Exception Rationale and FAQ</h2>
 
 <h3>Introduction</h3>
 
-<<<<<<< gcc-exception-3.1-faq.html
-<p>On June 29th, 2007 the Free Software Foundation released GPLv3.  It
-was immediately adopted by fifteen GNU projects, and more made the
-=======
 <p>On June 29th, 2007, the Free Software Foundation released GPLv3.
 It was immediately adopted by fifteen GNU projects, and more made the
->>>>>>> 1.10
 switch in the following months.  Most of the GCC codebase migrated to
 the new license in the 4.2.2 release, and now we are preparing to
 finish that process.</p>
@@ -281,40 +277,44 @@
 <!--#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>.
-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 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>
 
-<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>Copyright &copy; 2008 Free Software Foundation, Inc.</p>
 
-<p>
-Copyright &copy; 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:
 <!-- timestamp start -->
-$Date: 2013/02/07 20:14:00 $
+$Date: 2013/02/07 21:30:04 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>