diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6d5e2cc908d..803d8942281 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-21 Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+	* doc/invoke.texi (pedantic-errors): Explain better.
+
 2014-10-21  Joern Rennecke  <joern.rennecke@embecosm.com>
 	    Vidya Praveen <vidya.praveen@atmel.com>
 	    Praveen Kumar Kaushik <Praveen_Kumar.Kaushik@atmel.com>
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 644169e7b9a..c200399bac5 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -3328,8 +3328,12 @@ nothing to warn about.)
 
 @item -pedantic-errors
 @opindex pedantic-errors
-Like @option{-Wpedantic}, except that errors are produced rather than
-warnings.
+Give an error whenever the @dfn{base standard} (see @option{-Wpedantic})
+requires a diagnostic, in some cases where there is undefined behavior
+at compile-time and in some other cases that do not prevent compilation
+of programs that are valid according to the standard. This is not
+equivalent to @option{-Werror=pedantic}, since there are errors enabled
+by this option and not enabled by the latter and vice versa.
 
 @item -Wall
 @opindex Wall