diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e6b0343844d082592903f02b932a9479b87756fc..3fc2fd27abae719760e07dcb0e3e11b36b12dc96 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-17  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* docs/html/test.html: Fix paths and notes on running subset of tests.
+	* docs/html/ext/parallel_mode.html: Fix markup typos.
+	* docs/html/ext/pb_ds/index.html: Likewise.
+
 2007-12-17  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* testsuite/22_locale/global_templates/
diff --git a/libstdc++-v3/docs/html/ext/parallel_mode.html b/libstdc++-v3/docs/html/ext/parallel_mode.html
index 2e4f6624f8de2329707dc9092feb6ea7ed0ae209..7ca8dbe937cc75f9f01ee39066bca57661d05c29 100644
--- a/libstdc++-v3/docs/html/ext/parallel_mode.html
+++ b/libstdc++-v3/docs/html/ext/parallel_mode.html
@@ -425,7 +425,7 @@ For each algorithm, a minimum problem size can be stated,
 usually using the variable
 <code>__gnu_parallel::Settings::[algorithm]_minimal_n</code>.
 Please see <a href="latest-doxygen/settings_8h.html">
-<code>&lt;settings.h&gt;</code><a> for details.</p>
+<code>&lt;settings.h&gt;</code></a> for details.</p>
 
 
 
@@ -434,7 +434,7 @@ Please see <a href="latest-doxygen/settings_8h.html">
 <p>All parallel algorithms are intended to have signatures that are
 equivalent to the ISO C++ algorithms replaced. For instance, the
 <code>std::adjacent_find</code> function is declared as:
-
+</p>
 <pre>
 namespace std
 {
@@ -444,8 +444,10 @@ namespace std
 }
 </pre>
 
+<p>
 Which means that there should be something equivalent for the parallel
 version. Indeed, this is the case:
+</p>
 
 <pre>
 namespace std
@@ -495,7 +497,7 @@ of threads available, etc., and are denoted by the use of the enum
 
 <p> Putting all this together, the general view of overloads for the
 parallel algorithms look like this:
-<p>
+</p>
 <ul>
    <li>ISO C++ signature</li>
    <li>ISO C++ signature + sequential_tag argument</li>
diff --git a/libstdc++-v3/docs/html/ext/pb_ds/index.html b/libstdc++-v3/docs/html/ext/pb_ds/index.html
index 9288544d04c2c52ad8cabb6ada4270fdd9e288ab..4c73c2e915a30bc860c9f9908dd81569eccc805d 100644
--- a/libstdc++-v3/docs/html/ext/pb_ds/index.html
+++ b/libstdc++-v3/docs/html/ext/pb_ds/index.html
@@ -51,7 +51,7 @@
 
           <li><a href="concepts.html">Concepts</a></li>
 
-          <li><a href="interface.html">Specifics</a</li>
+          <li><a href="interface.html">Specifics</a></li>
         </ol>
       </li>
 
diff --git a/libstdc++-v3/docs/html/test.html b/libstdc++-v3/docs/html/test.html
index 67a666130b69e30df883a99fe2fa61d8328c0e89..8a8694c2d6ef9145edba6f299ce91bd88c8109ed 100644
--- a/libstdc++-v3/docs/html/test.html
+++ b/libstdc++-v3/docs/html/test.html
@@ -434,7 +434,7 @@ up in the normal.exp file.
 </pre>
 
    <p>
-    More examples can be found in the libstdc++/testsuite/*/*.cc files.
+    More examples can be found in the libstdc++-v3/testsuite/*/*.cc files.
    </p>
 
 <hr />
@@ -452,7 +452,7 @@ up in the normal.exp file.
    <pre> make check</pre>
    <p>in the <em>libbuilddir</em> directory.</p>
    <p>or</p>
-   <pre> make check-target-libstdc++</pre>
+   <pre> make check-target-libstdc++-v3</pre>
    <p>in the <em>gccbuilddir</em> directory.</p>
 
    <p>
@@ -472,19 +472,20 @@ specific argument to the variable RUNTESTFLAGS, as below.
 </p>
 
 <pre>
-make check-target-libstdc++ RUNTESTFLAGS="-v"
+make check-target-libstdc++-v3 RUNTESTFLAGS="-v"
 </pre>
 or
 <pre>
-make check-target-libstdc++ RUNTESTFLAGS="-v -v"
+make check-target-libstdc++-v3 RUNTESTFLAGS="-v -v"
 </pre>
 
-<p> To run a subset of the library tests, try using a command like the
-following from the <em>libbuilddir/testsuite</em> directory:
+<p>
+To run a subset of the library tests, you will need to generate the
+<em>testsuite_files</em> file by running <tt>make testsuite_files</tt>
+in the <em>libbuilddir/testsuite</em> directory, described below.
+Edit the file to remove the tests you don't want and then run the
+testsuite as normal.
 </p>
-<pre>
-runtest --tool libstdc++ normal.exp="`find $srcdir/17_intro -name *.cc`"
-</pre>
 
 
 <p>
@@ -494,20 +495,20 @@ specially crafted site.exp, or pass down --target_board flags.
 Example flags to pass down for various embedded builds are as follows:
 <pre>
 --target=powerpc-eabism (libgloss/sim)
-make check-target-libstdc++ RUNTESTFLAGS="--target_board=powerpc-sim"
+make check-target-libstdc++-v3 RUNTESTFLAGS="--target_board=powerpc-sim"
 
 --target=calmrisc32 (libgloss/sid)
-make check-target-libstdc++ RUNTESTFLAGS="--target_board=calmrisc32-sid"
+make check-target-libstdc++-v3 RUNTESTFLAGS="--target_board=calmrisc32-sid"
 
 --target=xscale-elf (newlib/sim)
-make check-target-libstdc++ RUNTESTFLAGS="--target_board=arm-sim"
+make check-target-libstdc++-v3 RUNTESTFLAGS="--target_board=arm-sim"
 </pre>
 
 <p> Also, here is an example of how to run the libstdc++ testsuite for a
 multilibed build directory with different ABI settings:
 </p>
 <pre>
-make check-target-libstdc++ RUNTESTFLAGS='--target_board \"unix{-mabi=32,,-mabi=64}\"'
+make check-target-libstdc++-v3 RUNTESTFLAGS='--target_board \"unix{-mabi=32,,-mabi=64}\"'
 </pre>
  
 <p>
@@ -518,9 +519,11 @@ you must also ensure that the directory containing the shared version
 of libstdc++ is in your <code>LD_LIBRARY_PATH</code>, or equivalent.
 If your GCC source tree is at <code>/path/to/gcc</code>, then you can
 run the tests as follows:
+</p>
 <pre>
-runtest --tool libstdc++ --srcdir=/path/to/gcc/libstdc++/testsuite
+runtest --tool libstdc++ --srcdir=/path/to/gcc/libstdc++-v3/testsuite
 </pre>
+<p>
 The testsuite will create a number of files in the directory in which you
 run this command,.  Some of those files might use the same name as
 files created by other testsuites (like the ones for GCC and G++), so
@@ -610,7 +613,7 @@ directory.
 <h2><a name="debug">Running debug-mode tests</a></h2>
 <p>To run the libstdc++ test suite under the <a
   href="debug.html#safe">debug mode</a>,
-  edit <code>libstdc++/scripts/testsuite_flags</code> to add the
+  edit <code>libstdc++-v3/scripts/testsuite_flags</code> to add the
   compile-time flag <code>-D_GLIBCXX_DEBUG</code> to the result
   printed by the <code>--build-cxx</code> option. Additionally, add
   the <code>-D_GLIBCXX_DEBUG_PEDANTIC</code> flag to turn on pedantic