* doc/extend.texi (Namespace Association): Alter cautionary text.

From-SVN: r189422

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 937eaa4ec7a646916639c6795a652888e4d05ca0..7c2a800e515deb9b9935e2f6a5eba843bb4f1bee 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-11  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+       * doc/extend.texi (Namespace Association): Alter cautionary text.
+
 2012-07-10  Oleg Endo  <olegendo@gcc.gnu.org>
 
        PR target/53911

diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index 91e7385d87f8b15881c7ab8750c8edfe137f1006..c3faf09effff713d3e7025e386accd90ab81a7d2 100644 (file)
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -15527,10 +15527,9 @@ See also @ref{Namespace Association}.
 @node Namespace Association
 @section Namespace Association
 
-@strong{Caution:} The semantics of this extension are not fully
-defined.  Users should refrain from using this extension as its
-semantics may change subtly over time.  It is possible that this
-extension will be removed in future versions of G++.
+@strong{Caution:} The semantics of this extension are equivalent
+to C++ 2011 inline namespaces.  Users should use inline namespaces
+instead as this extension will be removed in future versions of G++.
 
 A using-directive with @code{__attribute ((strong))} is stronger
 than a normal using-directive in two ways: