2010-05-01 Jonathan Wakely <jwakely.gcc@gmail.com>

	* doc/xml/faq.xml: Fix anachronisms.
	* doc/xml/manual/intro.xml (Make): Tweak grammar and whitespace.
	* doc/xml/manual/support.xml (NULL): Use inline <code> element
	instead of <programlisting> block.
	* doc/html/*: Regenerate.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158964 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 5 insertions, 6 deletions

diff --git a/libstdc++-v3/doc/html/faq.html b/libstdc++-v3/doc/html/faq.html
index 15798d68840..12d91a8e678 100644
--- a/libstdc++-v3/doc/html/faq.html
+++ b/libstdc++-v3/doc/html/faq.html
@@ -473,9 +473,8 @@
       Recent GNU/Linux glibc required?
     </p></td></tr><tr class="answer"><td align="left" valign="top"><a id="a-linux_glibc"></a></td><td align="left" valign="top"><p>When running on GNU/Linux, libstdc++ 3.2.1 (shared library version
          5.0.1) and later uses localization and formatting code from the system
-         C library (glibc) version 2.2.5.  That version of glibc is over a
-         year old and contains necessary bugfixes.  Many GNU/Linux distros make
-         glibc version 2.3.x available now.
+         C library (glibc) version 2.2.5 which contains necessary bugfixes.
+         Most GNU/Linux distros make more recent versions available now.
       </p><p>The guideline is simple:  the more recent the C++ library, the
          more recent the C library.  (This is also documented in the main
          GCC installation instructions.)
@@ -520,7 +519,7 @@
     For those people who are not part of the ISO Library Group
     (i.e., nearly all of us needing to read this page in the first
     place), a public list of the library defects is occasionally
-    published <a class="ulink" href="http://anubis.dkuug.dk/jtc1/sc22/wg21/" target="_top">here</a>.
+    published <a class="ulink" href="http://www.open-std.org/jtc1/sc22/wg21/" target="_top">here</a>.
     Some of these issues have resulted in code changes in libstdc++.
     </p><p>
     If you think you've discovered a new bug that is not listed,
diff --git a/libstdc++-v3/doc/html/manual/make.html b/libstdc++-v3/doc/html/manual/make.html
index d3066e93934..fb6d3a3f368 100644
--- a/libstdc++-v3/doc/html/manual/make.html
+++ b/libstdc++-v3/doc/html/manual/make.html
@@ -4,6 +4,6 @@
       <a class="ulink" href="http://gcc.gnu.org/install/" target="_top">GCC Installation
       Instructions</a> first.  Read <span class="emphasis"><em>all of them</em></span>.
       <span class="emphasis"><em>Twice.</em></span>
-   </p><p>Then type:<span class="command"><strong>make</strong></span>, and congratulations, you're
+   </p><p>Then type: <span class="command"><strong>make</strong></span>, and congratulations, you've
 started to build.
 </p></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="configure.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="setup.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="using.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Configure </td><td width="20%" align="center"><a accesskey="h" href="../spine.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 3. Using</td></tr></table></div></body></html>
diff --git a/libstdc++-v3/doc/html/manual/support.html b/libstdc++-v3/doc/html/manual/support.html
index 2a6dc2e717d..d351fdf8ee5 100644
--- a/libstdc++-v3/doc/html/manual/support.html
+++ b/libstdc++-v3/doc/html/manual/support.html
@@ -106,7 +106,7 @@
      to be <code class="constant">(void*)0</code>, which is often used in C.
     </p><p>
      For <span class="command"><strong>g++</strong></span>, <code class="constant">NULL</code> is
-     </p><pre class="programlisting">#define</pre><p>'d to be
+     <code class="code">#define</code>'d to be
      <code class="constant">__null</code>, a magic keyword extension of
      <span class="command"><strong>g++</strong></span>.
     </p><p>