f03852
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
f03852
index 3419483c532..a2a6b1c98be 100644
f03852
--- a/gcc/doc/invoke.texi
f03852
+++ b/gcc/doc/invoke.texi
f03852
@@ -255,7 +255,7 @@ in the following sections.
f03852
 -Wno-inherited-variadic-ctor  -Wno-init-list-lifetime @gol
f03852
 -Winvalid-imported-macros @gol
f03852
 -Wno-invalid-offsetof  -Wno-literal-suffix @gol
f03852
--Wno-mismatched-new-delete -Wmismatched-tags @gol
f03852
+-Wmismatched-new-delete -Wmismatched-tags @gol
f03852
 -Wmultiple-inheritance  -Wnamespaces  -Wnarrowing @gol
f03852
 -Wnoexcept  -Wnoexcept-type  -Wnon-virtual-dtor @gol
f03852
 -Wpessimizing-move  -Wno-placement-new  -Wplacement-new=@var{n} @gol
f03852
@@ -3966,7 +3966,7 @@ The warning is inactive inside a system header file, such as the STL, so
f03852
 one can still use the STL.  One may also instantiate or specialize
f03852
 templates.
f03852
 
f03852
-@item -Wno-mismatched-new-delete @r{(C++ and Objective-C++ only)}
f03852
+@item -Wmismatched-new-delete @r{(C++ and Objective-C++ only)}
f03852
 @opindex Wmismatched-new-delete
f03852
 @opindex Wno-mismatched-new-delete
f03852
 Warn for mismatches between calls to @code{operator new} or @code{operator
f03852
@@ -3998,7 +3998,7 @@ The related option @option{-Wmismatched-dealloc} diagnoses mismatches
f03852
 involving allocation and deallocation functions other than @code{operator
f03852
 new} and @code{operator delete}.
f03852
 
f03852
-@option{-Wmismatched-new-delete} is enabled by default.
f03852
+@option{-Wmismatched-new-delete} is included in @option{-Wall}.
f03852
 
f03852
 @item -Wmismatched-tags @r{(C++ and Objective-C++ only)}
f03852
 @opindex Wmismatched-tags
f03852
@@ -5543,6 +5543,8 @@ Options} and @ref{Objective-C and Objective-C++ Dialect Options}.
f03852
 -Wmemset-elt-size @gol
f03852
 -Wmemset-transposed-args @gol
f03852
 -Wmisleading-indentation @r{(only for C/C++)} @gol
f03852
+-Wmismatched-dealloc @gol
f03852
+-Wmismatched-new-delete @r{(only for C/C++)} @gol
f03852
 -Wmissing-attributes @gol
f03852
 -Wmissing-braces @r{(only for C/ObjC)} @gol
f03852
 -Wmultistatement-macros  @gol
f03852
@@ -6428,7 +6430,7 @@ Ignoring the warning can result in poorly optimized code.
f03852
 disable the warning, but this is not recommended and should be done only
f03852
 when non-existent profile data is justified.
f03852
 
f03852
-@item -Wno-mismatched-dealloc
f03852
+@item -Wmismatched-dealloc
f03852
 @opindex Wmismatched-dealloc
f03852
 @opindex Wno-mismatched-dealloc
f03852
 
f03852
@@ -6461,7 +6463,7 @@ void f (void)
f03852
 In C++, the related option @option{-Wmismatched-new-delete} diagnoses
f03852
 mismatches involving either @code{operator new} or @code{operator delete}.
f03852
 
f03852
-Option @option{-Wmismatched-dealloc} is enabled by default.
f03852
+Option @option{-Wmismatched-dealloc} is included in @option{-Wall}.
f03852
 
f03852
 @item -Wmultistatement-macros
f03852
 @opindex Wmultistatement-macros
f03852
@@ -7951,9 +7953,9 @@ Warnings controlled by the option can be disabled either by specifying
f03852
 Disable @option{-Wframe-larger-than=} warnings.  The option is equivalent
f03852
 to @option{-Wframe-larger-than=}@samp{SIZE_MAX} or larger.
f03852
 
f03852
-@item -Wno-free-nonheap-object
f03852
-@opindex Wno-free-nonheap-object
f03852
+@item -Wfree-nonheap-object
f03852
 @opindex Wfree-nonheap-object
f03852
+@opindex Wno-free-nonheap-object
f03852
 Warn when attempting to deallocate an object that was either not allocated
f03852
 on the heap, or by using a pointer that was not returned from a prior call
f03852
 to the corresponding allocation function.  For example, because the call
f03852
@@ -7970,7 +7972,7 @@ void f (char *p)
f03852
 @}
f03852
 @end smallexample
f03852
 
f03852
-@option{-Wfree-nonheap-object} is enabled by default.
f03852
+@option{-Wfree-nonheap-object} is included in @option{-Wall}.
f03852
 
f03852
 @item -Wstack-usage=@var{byte-size}
f03852
 @opindex Wstack-usage