2 files changed, 6 insertions, 7 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 8f50396b2b8..cc0da7e25f3 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-07  Reuben Thomas  <rrt@sc3d.org>
+
+        * ediff.texi (Merging and diff3): Don't mention lack of support
+        for VMS diff, we no longer support VMS.
+
 2014-08-07  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi (Remote shell setup): Explain, how to change command
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 9d373982fa8..4e1806de94d 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -350,8 +350,7 @@ All the above functions use the POSIX @code{diff} or @code{diff3} programs
 to find differences between two files.  They process the @code{diff} output
 and display it in a convenient form.  At present, Ediff understands only
 the plain output from diff.  Options such as @samp{-c} are not supported,
-nor is the format produced by incompatible file comparison programs such as
-the VMS version of @code{diff}.
+nor is the format produced by incompatible file comparison programs.
 
 The functions @code{ediff-files}, @code{ediff-buffers},
 @code{ediff-files3}, @code{ediff-buffers3} first display the coarse,
@@ -1945,11 +1944,6 @@ Specifies the default directory to look for patches.
 
 @end table
 
-@noindent
-@strong{Warning:} Ediff does not support the output format of VMS
-@code{diff}.  Instead, make sure you are using some implementation of POSIX
-@code{diff}, such as @code{gnudiff}.
-
 @node Merging and diff3
 @section Merging and diff3