diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 77791f3ab7fa948f6464237de699d0f52d0b75ba..b7e68d812a914b726996b05784ee2fb73fbc0672 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-11  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* include/std/iostream: Fix doxygen link.
+	* include/bits/forward_list.h: Fix doxygen markup.
+	* include/ext/vstring.h: Escape backslash in doxygen comment.
+	* include/bits/basic_string.h: Likewise.
+
 2009-03-10  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* doc/xml/faq.xml: Fix links to implementation status pages.
diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h
index 2a49837029dc738bc89ff6c82bc4db083eec808d..a5861d954b331df9bfd6e58484f9ce37a91d1f4d 100644
--- a/libstdc++-v3/include/bits/basic_string.h
+++ b/libstdc++-v3/include/bits/basic_string.h
@@ -458,7 +458,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
        *  @param  n  Number of characters to copy.
        *  @param  a  Allocator to use (default is default allocator).
        *
-       *  NB: @a s must have at least @a n characters, '\0' has no special
+       *  NB: @a s must have at least @a n characters, '\\0' has no special
        *  meaning.
        */
       basic_string(const _CharT* __s, size_type __n,
@@ -2140,7 +2140,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
        *  result of the comparison is nonzero returns it, otherwise the shorter
        *  one is ordered first.
        *
-       *  NB: s must have at least n2 characters, '\0' has no special
+       *  NB: s must have at least n2 characters, '\\0' has no special
        *  meaning.
       */
       int
diff --git a/libstdc++-v3/include/bits/forward_list.h b/libstdc++-v3/include/bits/forward_list.h
index 89ced313fe520a54f57b3f206ea33d4c0705b349..55029c9647a72a241213df3d26c6e684ddad2391 100644
--- a/libstdc++-v3/include/bits/forward_list.h
+++ b/libstdc++-v3/include/bits/forward_list.h
@@ -50,7 +50,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   using __gnu_cxx::__const_pointer_cast;
 
   /**
-   *  @brief  A helper basic node class for @forward_list.
+   *  @brief  A helper basic node class for %forward_list.
    *          This is just a linked list with nothing inside it.
    *          There are purely list shuffling utility methods here.
    */
@@ -111,7 +111,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     };
 
   /**
-   *  @brief  A helper node class for @forward_list.
+   *  @brief  A helper node class for %forward_list.
    *          This is just a linked list with a data value in each node.
    *          There is a sorting utility method.
    */
@@ -290,7 +290,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     { return __x._M_node != __y._M_node; }
 
   /**
-   *  @brief  Base class for @forward_list.
+   *  @brief  Base class for %forward_list.
    */
   template<typename _Tp, typename _Alloc = allocator<_Tp> >
     struct _Fwd_list_base
diff --git a/libstdc++-v3/include/ext/vstring.h b/libstdc++-v3/include/ext/vstring.h
index cea0f0a4fb2d19b3db4c3378d40af9565ece6d4d..3ca81771b54c545053bf316fd34f45c1e3429f82 100644
--- a/libstdc++-v3/include/ext/vstring.h
+++ b/libstdc++-v3/include/ext/vstring.h
@@ -204,7 +204,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
        *  @param  __n  Number of characters to copy.
        *  @param  __a  Allocator to use (default is default allocator).
        *
-       *  NB: @a __s must have at least @a __n characters, '\0' has no special
+       *  NB: @a __s must have at least @a __n characters, '\\0' has no special
        *  meaning.
        */
       __versa_string(const _CharT* __s, size_type __n,
@@ -2006,7 +2006,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
        *  the comparison is nonzero returns it, otherwise the shorter
        *  one is ordered first.
        *
-       *  NB: s must have at least n2 characters, '\0' has no special
+       *  NB: s must have at least n2 characters, '\\0' has no special
        *  meaning.
       */
       int
diff --git a/libstdc++-v3/include/std/iostream b/libstdc++-v3/include/std/iostream
index 5f2f23f1df0cef319f5e497dd6fa5bc2bd015a37..4b702f7daefa507829655125d83ec4ccdb086619 100644
--- a/libstdc++-v3/include/std/iostream
+++ b/libstdc++-v3/include/std/iostream
@@ -53,7 +53,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
    *  The &lt;iostream&gt; header declares the eight <em>standard stream
    *  objects</em>.  For other declarations, see
    *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt11ch24.html
-   *  and the @link s27_2_iosfwd I/O forward declarations @endlink
+   *  and the @link iosfwd I/O forward declarations @endlink
    *
    *  They are required by default to cooperate with the global C library's
    *  @c FILE streams, and to be available during program startup and