Merge from trunk.

2 files changed, 6 insertions, 1 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 38cbaafa45d..d64980bd1c8 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * flymake.texi (Example -- Configuring a tool called via make):
+        Use /dev/null instead of the Windows "nul" (bug#8715).
+
 2011-07-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * widget.texi (Setting Up the Buffer): Remove mention of the
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index 74cf3d630da..625e9549444 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -483,7 +483,7 @@ our case this target might look like this:
 
 @verbatim
 check-syntax:
-        gcc -o nul -S ${CHK_SOURCES}
+        gcc -o /dev/null -S ${CHK_SOURCES}
 @end verbatim
 
 The format of error messages reported by @code{gcc} is already