3 files changed, 11 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8889c046f62..7c529d1f0d3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2014-08-07  Reuben Thomas  <rrt@sc3d.org>
+
+        Refer to MS-DOS using the same name everywhere.
+
+        * arc-mode.el: ``MS-DOG'', ``MSDOG'' and ``msdog'' become
+        ``MS-DOS''.
+        * frame.el: ditto.
+
 2014-08-07  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 37ddf87cfbf..f1bdbf1a325 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -4,7 +4,7 @@
 ;; Inc.
 
 ;; Author: Morten Welinder <terra@gnu.org>
-;; Keywords: files archives msdog editing major-mode
+;; Keywords: files archives ms-dos editing major-mode
 ;; Favorite-brand-of-beer: None, I hate beer.
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/frame.el b/lisp/frame.el
index d3e84d21024..d528eef6735 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1344,8 +1344,8 @@ frame's display)."
   (let ((frame-type (framep-on-display display)))
     (cond
      ((eq frame-type 'pc)
-      ;; MS-DOG frames support selections when Emacs runs inside
-      ;; the Windows' DOS Box.
+      ;; MS-DOS frames support selections when Emacs runs inside
+      ;; a Windows DOS Box.
       (with-no-warnings
        (not (null dos-windows-version))))
      ((memq frame-type '(x w32 ns))