[C++ PATCH] Deprecate -ffriend-injection

https://gcc.gnu.org/ml/gcc-patches/2018-02/msg01020.html
	* doc/extend.texi (Backwards Compatibility): Americanize 'behaviour'.

From-SVN: r257755

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5bf27188e92781bdd7a5f1ffd05e528d9f1eef0a..a2199d9e1178a4448bb1ad5242ab7c97b220fe21 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-16  Nathan Sidwell  <nathan@acm.org>
+
+       * doc/extend.texi (Backwards Compatibility): Americanize 'behaviour'.
+
 2018-02-16  Carl Love  <cel@us.ibm.com>
 
        * config/rs6000/rs6000-builtin.def: Add BU_P8V_VSX_2 macro definition.

diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index d38840e491291601f59df1a29f82a1a0d99b266b..b5240095ab6ee2abd8ac5d46a88cf75065b1c75c 100644 (file)
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -23882,13 +23882,13 @@ deprecated.   @xref{Deprecated Features}.
 If a variable is declared at for scope, it used to remain in scope
 until the end of the scope that contained the for statement (rather
 than just within the for scope).  The deprecated
-@option{-fno-for-scope} option enables this non-standard behaviour.
+@option{-fno-for-scope} option enables this non-standard behavior.
 Without the option, G++ retains this, but issues a warning, if such a
 variable is accessed outside the for scope.
 
-The behaviour is deprecated, only available with @option{-std=c++98}
+The behavior is deprecated, only available with @option{-std=c++98}
 @option{-std=gnu++98} languages and you must use the
-@option{-fpermissive} option to enable it.  The behaviour will be
+@option{-fpermissive} option to enable it.  The behavior will be
 removed.
 
 @item Friend Injection