re PR libstdc++/38080 (dead links in libstdc++ headers)

2008-12-01  Benjamin Kosnik  <bkoz@redhat.com>

	PR libstdc++/38080
	* include/std/iostream: Correct URL.
	* include/std/streambuf: Same.
	* include/std/bitset: Same.
	* include/std/iosfwd: Same.
	* include/std/fstream: Same.
	* include/std/istream: Same.
	* include/std/ostream: Same.
	* include/std/sstream: Same.
	* include/bits/basic_ios.h: Same.
	* include/bits/stl_map.h: Same.
	* include/bits/stl_set.h: Same.
	* include/bits/stl_multimap.h: Same.
	* include/bits/ios_base.h: Same.
	* include/bits/stl_multiset.h: Same.
	* include/bits/char_traits.h: Same.
	* include/bits/stl_relops.h: Same.
	* testsuite/27_io/ios_base/cons/assign_neg.cc: Adjust line numbers.
	* testsuite/27_io/ios_base/cons/copy_neg.cc: Ditto.

From-SVN: r142344

19 files changed, 124 insertions, 106 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a963802..ee5100f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,25 @@
+2008-12-01  Benjamin Kosnik  <bkoz@redhat.com>
+
+	PR libstdc++/38080
+	* include/std/iostream: Correct URL.
+	* include/std/streambuf: Same.
+	* include/std/bitset: Same.
+	* include/std/iosfwd: Same.
+	* include/std/fstream: Same.
+	* include/std/istream: Same.
+	* include/std/ostream: Same.
+	* include/std/sstream: Same.
+	* include/bits/basic_ios.h: Same.
+	* include/bits/stl_map.h: Same.
+	* include/bits/stl_set.h: Same.
+	* include/bits/stl_multimap.h: Same.
+	* include/bits/ios_base.h: Same.
+	* include/bits/stl_multiset.h: Same.
+	* include/bits/char_traits.h: Same.
+	* include/bits/stl_relops.h: Same.
+	* testsuite/27_io/ios_base/cons/assign_neg.cc: Adjust line numbers.
+	* testsuite/27_io/ios_base/cons/copy_neg.cc: Ditto.
+
 2008-11-26  Janis Johnson  <janis187@us.ibm.com>
 
 	PR testsuite/28870
@@ -125,45 +147,45 @@
 	(_Fwd_list_node<>): Likewise.
 	(_Fwd_list_iterator<>): Likewise.
 	(_Fwd_list_const_iterator<>): Likewise.
-	(_Fwd_list_node_base::_M_next, _M_transfer_after, _M_reverse_after): 
+	(_Fwd_list_node_base::_M_next, _M_transfer_after, _M_reverse_after):
 	Use _Alloc<_Tp>::pointer.
 	(_Fwd_list_iterator<>::_M_node): Use _Node_base::_Pointer.
-	(_Fwd_list_base<>::_M_get_node, _M_create_node, _M_create_node, 
+	(_Fwd_list_base<>::_M_get_node, _M_create_node, _M_create_node,
 	_M_insert_after, _M_put_node, _M_erase_after): Likewise.
 	(_Fwd_list_const_iterator<>::_M_node): use _Node_base::_Const_pointer.
 	(forward_list<>): Use __static_pointer_cast in place of static_cast,
 	and __const_pointer_cast in place of const_cast.
 	* include/bits/forward_list.tcc
-	(_Fwd_list_node<>::_M_sort_after): Using _Pointer typedefs in place 
+	(_Fwd_list_node<>::_M_sort_after): Using _Pointer typedefs in place
 	of standard pointers, __static_pointer_cast in place of static_cast.
 	(_Fwd_list_base<>::_Fwd_list_base, _M_insert_after, _M_erase_after):
 	Likewise.
-	(forward_list<>::_M_initialize_dispatch, _M_fill_initialize, 
+	(forward_list<>::_M_initialize_dispatch, _M_fill_initialize,
 	splice_after, remove, remove_if, merge): Likewise.
 	* testsuite/23_containers/forward_list/ext_pointer/modifiers/1.cc: New.
-	* testsuite/23_containers/forward_list/ext_pointer/modifiers/2.cc: 
+	* testsuite/23_containers/forward_list/ext_pointer/modifiers/2.cc:
 	Likewise.
-	* testsuite/23_containers/forward_list/ext_pointer/modifiers/3.cc: 
+	* testsuite/23_containers/forward_list/ext_pointer/modifiers/3.cc:
 	Likewise.
-	* testsuite/23_containers/forward_list/ext_pointer/modifiers/4.cc: 
+	* testsuite/23_containers/forward_list/ext_pointer/modifiers/4.cc:
 	Likewise.
-	* testsuite/23_containers/forward_list/ext_pointer/modifiers/5.cc: 
+	* testsuite/23_containers/forward_list/ext_pointer/modifiers/5.cc:
 	Likewise.
-	* testsuite/23_containers/forward_list/ext_pointer/operations/1.cc: 
+	* testsuite/23_containers/forward_list/ext_pointer/operations/1.cc:
 	Likewise.
-	* testsuite/23_containers/forward_list/ext_pointer/operations/2.cc: 
+	* testsuite/23_containers/forward_list/ext_pointer/operations/2.cc:
 	Likewise.
-	* testsuite/23_containers/forward_list/ext_pointer/operations/3.cc: 
+	* testsuite/23_containers/forward_list/ext_pointer/operations/3.cc:
 	Likewise.
-	* testsuite/23_containers/forward_list/ext_pointer/operations/4.cc: 
+	* testsuite/23_containers/forward_list/ext_pointer/operations/4.cc:
 	Likewise.
-	* testsuite/23_containers/forward_list/ext_pointer/operations/5.cc: 
+	* testsuite/23_containers/forward_list/ext_pointer/operations/5.cc:
 	Likewise.
-	* testsuite/23_containers/forward_list/ext_pointer/operations/6.cc: 
+	* testsuite/23_containers/forward_list/ext_pointer/operations/6.cc:
 	Likewise.
-	* testsuite/23_containers/forward_list/ext_pointer/operations/7.cc: 
+	* testsuite/23_containers/forward_list/ext_pointer/operations/7.cc:
 	Likewise.
-	* testsuite/23_containers/forward_list/ext_pointer/requirements/1.cc: 
+	* testsuite/23_containers/forward_list/ext_pointer/requirements/1.cc:
 	Likewise.
 	* testsuite/23_containers/forward_list/ext_pointer/requirements/
 	explicit_instantiation/1.cc: Likewise.
@@ -196,7 +218,7 @@
 	* include/precompiled/extc++.h: Likewise.
 	* include/Makefile.in: Regenerate.
 	* testsuite/ext/ext_pointer/1.cc: New.
-	* testsuite/ext/ext_pointer/1_neg.cc: Likewise.	
+	* testsuite/ext/ext_pointer/1_neg.cc: Likewise.
 	* testsuite/23_containers/vector/ext_pointer/citerators.cc: New.
 	* testsuite/23_containers/vector/ext_pointer/data_access.cc: Likewise.
 	* testsuite/23_containers/vector/ext_pointer/resize.cc: Likewise.
@@ -274,35 +296,35 @@
 
 2008-11-01  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
-        * include/bits/shared_ptr.h: Update comparisons to match WP.
-        (_Sp_counted_ptr): Make copy and assignment members deleted.
-        (_Sp_counted_deleter): Remove private copy and assignment members.
-        (__shared_count::_M_less,__weak_count::_M_less,operator<): Replace
-        friend operator< with overloaded _M_less member functions to allow
-        comparison with either shared_count or weak_count.
-        (__shared_ptr::_M_less,__weak_ptr::_M_less): Replace with...
-        (__shared_ptr::owner_before,__weak_ptr::owner_before): New overloads
-        for ownership-based ordering.
-        (operator<(__shared_ptr,__shared_ptr)): Compare stored pointers,
-        make non-friend.
-        (operator==(__shared_ptr,__shared_ptr)): Make non-friend.
-        (operator!=(__shared_ptr,__shared_ptr)): Likewise.
-        (less<__shared_ptr<>>,less<shared_ptr<>>,_Sp_less): Explicitly call
-        pointer specialization.
-        (__weak_ptr::operator<,weak_ptr::operator<=,weak_ptr::operator>,
-        weak_ptr::operator>=): Remove operator< and delete all comparisons.
-        (_Sp_owner_less,owner_less): Predicate for ownership-based ordering.
-        (operator<(shared_ptr,shared_ptr): Overload for derived shared_ptr.
-        (operator==(shared_ptr,shared_ptr): Likewise.
-        (operator!=(shared_ptr,shared_ptr): Likewise.
-        (swap(shared_ptr,shared_ptr)): Fix parameter types.
-        (swap(weak_ptr,weak_ptr)): Add missing overload.
-        * testsuite/20_util/owner_less/cmp.cc: New.
-        * testsuite/20_util/shared_ptr/comparison/cmp.cc: Test other ops.
-        * testsuite/20_util/shared_ptr/comparison/less.cc: New.
-        * testsuite/20_util/shared_ptr/observers/owner_before.cc: New.
-        * testsuite/20_util/weak_ptr/observers/owner_before.cc: New.
-        * testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: New.
+	* include/bits/shared_ptr.h: Update comparisons to match WP.
+	(_Sp_counted_ptr): Make copy and assignment members deleted.
+	(_Sp_counted_deleter): Remove private copy and assignment members.
+	(__shared_count::_M_less,__weak_count::_M_less,operator<): Replace
+	friend operator< with overloaded _M_less member functions to allow
+	comparison with either shared_count or weak_count.
+	(__shared_ptr::_M_less,__weak_ptr::_M_less): Replace with...
+	(__shared_ptr::owner_before,__weak_ptr::owner_before): New overloads
+	for ownership-based ordering.
+	(operator<(__shared_ptr,__shared_ptr)): Compare stored pointers,
+	make non-friend.
+	(operator==(__shared_ptr,__shared_ptr)): Make non-friend.
+	(operator!=(__shared_ptr,__shared_ptr)): Likewise.
+	(less<__shared_ptr<>>,less<shared_ptr<>>,_Sp_less): Explicitly call
+	pointer specialization.
+	(__weak_ptr::operator<,weak_ptr::operator<=,weak_ptr::operator>,
+	weak_ptr::operator>=): Remove operator< and delete all comparisons.
+	(_Sp_owner_less,owner_less): Predicate for ownership-based ordering.
+	(operator<(shared_ptr,shared_ptr): Overload for derived shared_ptr.
+	(operator==(shared_ptr,shared_ptr): Likewise.
+	(operator!=(shared_ptr,shared_ptr): Likewise.
+	(swap(shared_ptr,shared_ptr)): Fix parameter types.
+	(swap(weak_ptr,weak_ptr)): Add missing overload.
+	* testsuite/20_util/owner_less/cmp.cc: New.
+	* testsuite/20_util/shared_ptr/comparison/cmp.cc: Test other ops.
+	* testsuite/20_util/shared_ptr/comparison/less.cc: New.
+	* testsuite/20_util/shared_ptr/observers/owner_before.cc: New.
+	* testsuite/20_util/weak_ptr/observers/owner_before.cc: New.
+	* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: New.
 
 2008-10-31  Paolo Carlini  <paolo.carlini@oracle.com>
 
@@ -331,7 +353,7 @@
 
 	PR libstdc++/37522
 	* config/os/mingw32/os_defines.h: Define _GLIBCXX_HAVE_BROKEN_VSWPRINTF
-	* include/bits/basic_string.h: Guard string conversions with 
+	* include/bits/basic_string.h: Guard string conversions with
 	!defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF) too.
 	* testsuite/lib/libstdc++.exp (check_v3_target_string_conversions):
 	New.
@@ -382,7 +404,7 @@
 	* include/std/system_error (is_error_code_enum): Specialize for errc.
 	(error_category::error_category): Defaulted and protected.
 	(error_category::~error_category): New, virtual.
-	(error_category::error_category(const error_category&), 
+	(error_category::error_category(const error_category&),
 	error_category::operator=(const error_category&)): Deleted.
 	(get_system_category, get_posix_category): Remove (DR 890).
 	(system_category): External linkage (DR 890).
@@ -391,11 +413,11 @@
 	(error_code::error_code<>(_ErrorCodeEnum)): Use generic_category.
 	(error_code::clear, error_code::operator=<>(_ErrorCodeEnum)): Forward to
 	error_code::assign, use generic_category.
-	(error_condition::error_condition, 
-	error_condition::error_condition<>(_ErrorConditionEnum)): Use 
+	(error_condition::error_condition,
+	error_condition::error_condition<>(_ErrorConditionEnum)): Use
 	generic_category.
-	(error_condition::clear, 
-	error_condition::operator=<>(_ErrorConditionEnum)): Forward to 
+	(error_condition::clear,
+	error_condition::operator=<>(_ErrorConditionEnum)): Forward to
 	error_code::assign, use generic_category.
 	(make_error_code, make_error_condition): Define in namespace std.
 	* include/std/mutex (unique_lock<>::lock, unique_lock<>::try_lock,
@@ -412,21 +434,21 @@
 	* config/os/generic/error_constants.h (posix_errno): Rename to errc, use
 	enum class type. Fix spelling.
 	* config/os/mingw32/error_constants.h (posix_errno): Likewise.
-	* testsuite/19_diagnostics/error_code/cons/1.cc: Use errc and 
+	* testsuite/19_diagnostics/error_code/cons/1.cc: Use errc and
 	generic_category.
 	* testsuite/19_diagnostics/error_code/operators/bool.cc: Use errc.
 	* testsuite/19_diagnostics/error_code/operators/equal.cc: Likewise.
 	* testsuite/19_diagnostics/error_code/operators/not_equal.cc: Likewise.
-	* testsuite/19_diagnostics/error_category/cons/copy_neg.cc: Update 
+	* testsuite/19_diagnostics/error_category/cons/copy_neg.cc: Update
 	dg-error line numbers.
-	* testsuite/19_diagnostics/error_condition/cons/1.cc: Use 
+	* testsuite/19_diagnostics/error_condition/cons/1.cc: Use
 	generic_category.
 	* testsuite/19_diagnostics/error_condition/operators/bool.cc: Use errc.
 	* testsuite/19_diagnostics/error_condition/operators/equal.cc: Likewise.
-	* testsuite/19_diagnostics/error_condition/operators/not_equal.cc: 
+	* testsuite/19_diagnostics/error_condition/operators/not_equal.cc:
 	Likewise.
 	* testsuite/19_diagnostics/headers/system_error/errc_std_c++0x.cc: New.
-	* testsuite/19_diagnostics/headers/system_error/types_std_c++0x.cc: 
+	* testsuite/19_diagnostics/headers/system_error/types_std_c++0x.cc:
 	Remove using tests since errc is not a namespace.
 	* testsuite/19_diagnostics/system_error/cons-1.cc: Use errc.
 	* testsuite/19_diagnostics/system_error/what-4.cc: Likewise.
@@ -435,7 +457,7 @@
 	* testsuite/27_io/basic_ostream/inserters_other/char/error_code.cc:
 	Likewise.
 	* testsuite/30_threads/unique_lock/locking/2.cc: Likewise.
-	
+
 2008-10-20  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/tr1_impl/hashtable_policy.h (_Hash_node<>::_Hash_node<>
@@ -499,7 +521,7 @@
 	* include/bits/forward_list.h: Factor list construction to dispatch
 	routines.
 	* include/bits/forward_list.tcc: Likewise.
-	* testsuite/23_containers/forward_list/modifiers/2.cc: 
+	* testsuite/23_containers/forward_list/modifiers/2.cc:
 
 2008-10-16  Paolo Carlini  <paolo.carlini@oracle.com>
 
@@ -630,7 +652,7 @@
 	(operator<<(basic_ostream<>&, const error_code&)): Define here.
 	* include/std/ostream (operator<<(basic_ostream<>&,
 	const error_code&)): Do not define here.
-	* testsuite/19_diagnostics/error_condition/cons/1.cc: New.	
+	* testsuite/19_diagnostics/error_condition/cons/1.cc: New.
 	* testsuite/19_diagnostics/error_condition/operators/bool.cc: Likewise.
 	* testsuite/19_diagnostics/error_condition/operators/bool_neg.cc:
 	Likewise.
@@ -647,10 +669,10 @@
 	* testsuite/util/testsuite_hooks.cc: Avoid uninitialized warning.
 
 2008-10-10  Chris Fairles  <cfairles@gcc.gnu.org>
-  
-	* testsuite/20_util/duration/cons/1.cc: Remove invalid check of 
+
+	* testsuite/20_util/duration/cons/1.cc: Remove invalid check of
 	uninitialized duration.
-        
+
 2008-10-08  Bob Walters  <bob.s.walters@gmail.com>
 
 	* include/bits/stl_vector.h (_Vector_base<>::_Vector_impl::_M_start,
@@ -689,7 +711,7 @@
 
 2008-09-30  Chris Fairles  <cfairles@gcc.gnu.org>
 
-	* include/std/tuple (tuple<>::swap): Implement swap for tuple as per 
+	* include/std/tuple (tuple<>::swap): Implement swap for tuple as per
 	DR 522 [Ready].
 	* testsuite/20_util/tuple/swap.cc: New.
 
@@ -732,9 +754,9 @@
 	* testsuite/30_threads/recursive_timed_mutex/cons/assign_neg.cc:
 	Likewise.
 	* testsuite/30_threads/recursive_timed_mutex/cons/copy_neg.cc: Likewise.
-	
+
 2008-09-26  Peter O'Gorman  <pogma@thewrittenword.com>
-            Steve Ellcey  <sje@cup.hp.com>
+	    Steve Ellcey  <sje@cup.hp.com>
 
 	* configure: Regenerate for new libtool.
 	* aclocal.m4: Ditto.
diff --git a/libstdc++-v3/include/bits/basic_ios.h b/libstdc++-v3/include/bits/basic_ios.h
index 66d90f6..3b1052b 100644
--- a/libstdc++-v3/include/bits/basic_ios.h
+++ b/libstdc++-v3/include/bits/basic_ios.h
@@ -398,7 +398,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
        *  with this stream, calls that buffer's @c pubimbue(loc).
        *
        *  Additional l10n notes are at
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/22_locale/howto.html
+       *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/localization.html
       */
       locale
       imbue(const locale& __loc);
@@ -418,7 +418,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
        *  @endcode
        *
        *  Additional l10n notes are at
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/22_locale/howto.html
+       *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/localization.html
       */
       char
       narrow(char_type __c, char __dfault) const
@@ -437,7 +437,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
        *  @endcode
        *
        *  Additional l10n notes are at
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/22_locale/howto.html
+       *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/localization.html
       */
       char_type
       widen(char __c) const
diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h
index 77a634b..5c0c914 100644
--- a/libstdc++-v3/include/bits/char_traits.h
+++ b/libstdc++-v3/include/bits/char_traits.h
@@ -87,7 +87,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
    *  may not be specialized for fundamental types, but classes in
    *  namespace __gnu_cxx may be.
    *
-   *  See http://gcc.gnu.org/onlinedocs/libstdc++/21_strings/howto.html#5
+   *  See http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt05ch13s03.html
    *  for advice on how to make use of this class for "unusual" character
    *  types. Also, check out include/ext/pod_char_traits.h.  
    */
@@ -228,7 +228,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
    *  __gnu_cxx::char_traits, it is possible to achieve a more
    *  appropriate definition by specializing __gnu_cxx::char_traits.
    *
-   *  See http://gcc.gnu.org/onlinedocs/libstdc++/21_strings/howto.html#5
+   *  See http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt05ch13s03.html
    *  for advice on how to make use of this class for "unusual" character
    *  types. Also, check out include/ext/pod_char_traits.h.
   */
diff --git a/libstdc++-v3/include/bits/ios_base.h b/libstdc++-v3/include/bits/ios_base.h
index 6e2cef6..db040b8 100644
--- a/libstdc++-v3/include/bits/ios_base.h
+++ b/libstdc++-v3/include/bits/ios_base.h
@@ -223,7 +223,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       failure(const string& __str) throw();
 
       // This declaration is not useless:
-      // http://gcc.gnu.org/onlinedocs/gcc-3.0.2/gcc_6.html#SEC118
+      // http://gcc.gnu.org/onlinedocs/gcc-4.3.2/gcc/Vague-Linkage.html
       virtual
       ~failure() throw();
 
@@ -376,8 +376,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 
     /// Perform input and output in binary mode (as opposed to text mode).
     /// This is probably not what you think it is; see
-    /// http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#3 and
-    /// http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#7 for more.
+    /// http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt11ch27s02.html
     static const openmode binary =	_S_bin;
 
     /// Open for input.  Default for @c ifstream and fstream.
@@ -671,7 +670,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
      *  The synchronization referred to is @e only that between the standard
      *  C facilities (e.g., stdout) and the standard C++ objects (e.g.,
      *  cout).  User-declared streams are unaffected.  See
-     *  http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#8 for more.
+     *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt11ch28s02.html
     */
     static bool
     sync_with_stdio(bool __sync = true);
diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h
index 3fe69c9..a456ea9 100644
--- a/libstdc++-v3/include/bits/stl_map.h
+++ b/libstdc++-v3/include/bits/stl_map.h
@@ -536,7 +536,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
        *  cause no gains in efficiency.
        *
        *  See
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/23_containers/howto.html#4
+       *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt07ch17.html
        *  for more on "hinting".
        *
        *  Insertion requires logarithmic time (if the hint is not taken).
diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h
index 64a23b9..af64600 100644
--- a/libstdc++-v3/include/bits/stl_multimap.h
+++ b/libstdc++-v3/include/bits/stl_multimap.h
@@ -458,8 +458,8 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
        *  improve the performance of the insertion process.  A bad hint would
        *  cause no gains in efficiency.
        *
-       *  See http://gcc.gnu.org/onlinedocs/libstdc++/23_containers/howto.html#4
-       *  for more on "hinting".
+       *  For more on "hinting," see:
+       *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt07ch17.html
        *
        *  Insertion requires logarithmic time (if the hint is not taken).
        */
@@ -468,7 +468,8 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
       { return _M_t._M_insert_equal_(__position, __x); }
 
       /**
-       *  @brief A template function that attempts to insert a range of elements.
+       *  @brief A template function that attempts to insert a range
+       *  of elements.
        *  @param  first  Iterator pointing to the start of the range to be
        *                 inserted.
        *  @param  last  Iterator pointing to the end of the range.
diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h
index 1875755..3721d99 100644
--- a/libstdc++-v3/include/bits/stl_multiset.h
+++ b/libstdc++-v3/include/bits/stl_multiset.h
@@ -420,7 +420,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
        *  improve the performance of the insertion process.  A bad hint would
        *  cause no gains in efficiency.
        *
-       *  See http://gcc.gnu.org/onlinedocs/libstdc++/23_containers/howto.html#4
+       *  See http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt07ch17.html
        *  for more on "hinting".
        *
        *  Insertion requires logarithmic time (if the hint is not taken).
diff --git a/libstdc++-v3/include/bits/stl_relops.h b/libstdc++-v3/include/bits/stl_relops.h
index 376a6b1..be93cc6 100644
--- a/libstdc++-v3/include/bits/stl_relops.h
+++ b/libstdc++-v3/include/bits/stl_relops.h
@@ -60,8 +60,8 @@
  *  Inclusion of this file has been removed from
  *  all of the other STL headers for safety reasons, except std_utility.h.
  *  For more information, see the thread of about twenty messages starting
- *  with http://gcc.gnu.org/ml/libstdc++/2001-01/msg00223.html , or the
- *  FAQ at http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#4_4 .
+ *  with http://gcc.gnu.org/ml/libstdc++/2001-01/msg00223.html, or
+ *  http://gcc.gnu.org/onlinedocs/libstdc++/faq.html#faq.ambiguous_overloads
  *
  *  Short summary:  the rel_ops operators should be avoided for the present.
  */
diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h
index 65dc135..8ea0a59 100644
--- a/libstdc++-v3/include/bits/stl_set.h
+++ b/libstdc++-v3/include/bits/stl_set.h
@@ -432,9 +432,9 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
        *  potentially improve the performance of the insertion process.  A bad
        *  hint would cause no gains in efficiency.
        *
-       *  See http://gcc.gnu.org/onlinedocs/libstdc++/23_containers/howto.html#4
-       *  for more on "hinting".
-       *
+       *  For more on "hinting", see:
+       *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt07ch17.html
+       *  
        *  Insertion requires logarithmic time (if the hint is not taken).
        */
       iterator
@@ -442,7 +442,8 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
       { return _M_t._M_insert_unique_(__position, __x); }
 
       /**
-       *  @brief A template function that attempts to insert a range of elements.
+       *  @brief A template function that attempts to insert a range
+       *  of elements.
        *  @param  first  Iterator pointing to the start of the range to be
        *                 inserted.
        *  @param  last  Iterator pointing to the end of the range.
diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset
index 10d6005..67dfd69 100644
--- a/libstdc++-v3/include/std/bitset
+++ b/libstdc++-v3/include/std/bitset
@@ -634,7 +634,8 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
    *     }
    *  @endcode
    *
-   *  Also see http://gcc.gnu.org/onlinedocs/libstdc++/ext/sgiexts.html#ch23
+   *  Also see:
+   *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt12ch33s02.html
    *  for a description of extensions.
    *
    *  Most of the actual code isn't contained in %bitset<> itself, but in the
diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream
index 2bbbcc1..46b6307 100644
--- a/libstdc++-v3/include/std/fstream
+++ b/libstdc++-v3/include/std/fstream
@@ -325,7 +325,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
        *  If no file has been opened, and both @a s and @a n are zero, then
        *  the stream becomes unbuffered.  Otherwise, @c s is used as a
        *  buffer; see
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#2
+       *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt11ch25s02.html
        *  for more.
       */
       virtual __streambuf_type*
diff --git a/libstdc++-v3/include/std/iosfwd b/libstdc++-v3/include/std/iosfwd
index 5c0bbba..6f8129e 100644
--- a/libstdc++-v3/include/std/iosfwd
+++ b/libstdc++-v3/include/std/iosfwd
@@ -125,7 +125,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
    *  themselves (e.g., "class ostream;") is not valid ISO C++.
    *
    *  For more specific declarations, see
-   *  http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#10
+   *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt11ch24.html
    *
    *  @{
   */
diff --git a/libstdc++-v3/include/std/iostream b/libstdc++-v3/include/std/iostream
index a4bdf86..5f2f23f 100644
--- a/libstdc++-v3/include/std/iostream
+++ b/libstdc++-v3/include/std/iostream
@@ -1,6 +1,6 @@
 // Standard iostream objects -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2001, 2002, 2005
+// Copyright (C) 1997, 1998, 1999, 2001, 2002, 2005, 2008
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -52,8 +52,8 @@ _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++/27_io/howto.html#10 and the
-   *  @link s27_2_iosfwd I/O forward declarations @endlink
+   *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt11ch24.html
+   *  and the @link s27_2_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
diff --git a/libstdc++-v3/include/std/istream b/libstdc++-v3/include/std/istream
index caf670b..8b87c73 100644
--- a/libstdc++-v3/include/std/istream
+++ b/libstdc++-v3/include/std/istream
@@ -630,10 +630,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
    *  Objects of this class are created before all of the standard
    *  extractors are run.  It is responsible for "exception-safe prefix and
    *  suffix operations," although only prefix actions are currently required
-   *  by the standard.  Additional actions may be added by the
-   *  implementation, and we list them in
-   *  http://gcc.gnu.org/onlinedocs/libstdc++/17_intro/howto.html#5
-   *  under [27.6] notes.
+   *  by the standard. 
   */
   template<typename _CharT, typename _Traits>
     class basic_istream<_CharT, _Traits>::sentry
diff --git a/libstdc++-v3/include/std/ostream b/libstdc++-v3/include/std/ostream
index 913986e..93a7d6e 100644
--- a/libstdc++-v3/include/std/ostream
+++ b/libstdc++-v3/include/std/ostream
@@ -375,10 +375,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
    *
    *  Objects of this class are created before all of the standard
    *  inserters are run.  It is responsible for "exception-safe prefix and
-   *  suffix operations."  Additional actions may be added by the
-   *  implementation, and we list them in
-   *  http://gcc.gnu.org/onlinedocs/libstdc++/17_intro/howto.html#5
-   *  under [27.6] notes.
+   *  suffix operations." 
   */
   template <typename _CharT, typename _Traits>
     class basic_ostream<_CharT, _Traits>::sentry
diff --git a/libstdc++-v3/include/std/sstream b/libstdc++-v3/include/std/sstream
index 2a81242..6d3366b 100644
--- a/libstdc++-v3/include/std/sstream
+++ b/libstdc++-v3/include/std/sstream
@@ -193,7 +193,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
        *
        *  If no buffer has already been created, and both @a s and @a n are
        *  non-zero, then @c s is used as a buffer; see
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#2
+       *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt11ch25s02.html
        *  for more.
       */
       virtual __streambuf_type*
diff --git a/libstdc++-v3/include/std/streambuf b/libstdc++-v3/include/std/streambuf
index a2e4750..c7ff5bf 100644
--- a/libstdc++-v3/include/std/streambuf
+++ b/libstdc++-v3/include/std/streambuf
@@ -563,8 +563,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
        *
        *  Each derived class provides its own appropriate behavior.  See
        *  the next-to-last paragraph of 
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#2 for
-       *  more on this function.
+       *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt11ch25s02.html
+       *  for more on this function.
        *
        *  @note  Base class version does nothing, returns @c this.
       */
@@ -660,7 +660,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
        *
        *  A functioning input streambuf can be created by overriding only
        *  this function (no buffer area will be used).  For an example, see
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#6
+       *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt11ch25.html
        *
        *  @note  Base class version does nothing, returns eof().
       */
diff --git a/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc b/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc
index 7df9d46..1cfa6ef 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc
@@ -43,5 +43,5 @@ void test01()
 }
 // { dg-error "synthesized" "" { target *-*-* } 42 } 
 // { dg-error "within this context" "" { target *-*-* } 35 } 
-// { dg-error "is private" "" { target *-*-* } 794 } 
+// { dg-error "is private" "" { target *-*-* } 793 } 
 // { dg-error "operator=" "" { target *-*-* } 0 } 
diff --git a/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc b/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc
index 8f17ac6..01300ab 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc
@@ -43,5 +43,5 @@ void test02()
 }
 // { dg-error "within this context" "" { target *-*-* } 36 } 
 // { dg-error "synthesized" "" { target *-*-* } 42 } 
-// { dg-error "is private" "" { target *-*-* } 791 } 
+// { dg-error "is private" "" { target *-*-* } 790 } 
 // { dg-error "copy constructor" "" { target *-*-* } 0 }