Refer to MS-DOS using the same name everywhere.

* admin/FOR-RELEASE: ``MS-DOG'', ``MSDOG'' and ``msdog'' become
``MS-DOS''; ``msdog'' in filenames becomes ``msdos''.
* admin/MAINTAINERS: ditto.
* doc/emacs/Makefile.in (EMACSSOURCES): ditto.
* doc/emacs/emacs-xtra.texi: ditto.
* doc/emacs/emacs.texi: ditto.
* doc/emacs/makefile.w32-in: ditto.
* doc/emacs/msdog-xtra.texi: ditto, and rename file.
* doc/emacs/msdog.texi: ditto, and rename file.
* lisp/arc-mode.el: ditto.
* lisp/frame.el: ditto.

13 files changed, 46 insertions, 19 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 90d394ca9b..7da79325a9 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,11 @@
+2014-08-07  Reuben Thomas  <rrt@sc3d.org>
+
+	Refer to MS-DOS using the same name everywhere.
+
+	* FOR-RELEASE: ``MS-DOG'', ``MSDOG'' and ``msdog'' become
+	``MS-DOS''.
+	* MAINTAINERS: ditto.
+
 2014-07-14  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Use binary-io module, O_BINARY, and "b" flag (Bug#18006).
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index b5bf6739a8..bdd26947e4 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -202,8 +202,8 @@ mark.texi
 mini.texi         
 misc.texi         
 modes.texi        
-msdog.texi        
-msdog-xtra.texi   
+msdos.texi        
+msdos-xtra.texi   
 mule.texi         
 m-x.texi          
 package.texi      
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index efcc63081b..9a46b64c3e 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -36,7 +36,7 @@ Eli Zaretskii
 	    lisp/dos-fns.el
 	    lisp/dos-w32.el
 	    lisp/dos-vars.el
-	    doc/emacs/msdog.texi
+	    doc/emacs/msdos.texi
 
 Kenichi Handa
 	Mule
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index a1d2688470..0fd6080569 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,15 @@
+2014-08-07  Reuben Thomas  <rrt@sc3d.org>
+
+	Refer to MS-DOS using the same name everywhere.
+
+	* Makefile.in (EMACSSOURCES): ``MS-DOG'', ``MSDOG'' and ``msdog''
+	become ``MS-DOS''; ``msdog'' in filenames becomes ``msdos''.
+	* emacs-xtra.texi: ditto.
+	* emacs.texi: ditto.
+	* makefile.w32-in: ditto.
+	* msdog-xtra.texi: ditto, and rename file.
+	* msdog.texi: ditto, and rename file.
+
 2014-07-21  Glenn Morris  <rgm@gnu.org>
 
 	* emacs.texi (Intro): Workaround makeinfo 4 @acronym bug.  (Bug#18040)
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 98ff81791a..e9894ac220 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -91,7 +91,7 @@ EMACS_XTRA= \
 	$(srcdir)/vc-xtra.texi \
 	$(srcdir)/vc1-xtra.texi \
 	$(srcdir)/fortran-xtra.texi \
-	$(srcdir)/msdog-xtra.texi
+	$(srcdir)/msdos-xtra.texi
 
 EMACSSOURCES= \
 	${srcdir}/emacs.texi \
@@ -135,7 +135,7 @@ EMACSSOURCES= \
 	${srcdir}/xresources.texi \
 	${srcdir}/anti.texi \
 	${srcdir}/macos.texi \
-	${srcdir}/msdog.texi \
+	${srcdir}/msdos.texi \
 	${srcdir}/gnu.texi \
 	${srcdir}/glossary.texi \
 	${srcdir}/ack.texi \
diff --git a/doc/emacs/emacs-xtra.texi b/doc/emacs/emacs-xtra.texi
index dc1ab423db..ba2b0f0d67 100644
--- a/doc/emacs/emacs-xtra.texi
+++ b/doc/emacs/emacs-xtra.texi
@@ -120,7 +120,7 @@ the Emacs manual.
 
 @include fortran-xtra.texi
 
-@include msdog-xtra.texi
+@include msdos-xtra.texi
 
 @lowersections
 @end iftex
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index b1cb196c3c..702aa64bc2 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1574,8 +1574,8 @@ Lisp programming.
 
 @include anti.texi
 @include macos.texi
-@c Includes msdog-xtra.
-@include msdog.texi
+@c Includes msdos-xtra.
+@include msdos.texi
 @include gnu.texi
 @include glossary.texi
 @ifnottex
diff --git a/doc/emacs/makefile.w32-in b/doc/emacs/makefile.w32-in
index 297ec496fe..d492a50686 100644
--- a/doc/emacs/makefile.w32-in
+++ b/doc/emacs/makefile.w32-in
@@ -54,7 +54,7 @@ EMACS_XTRA=\
 	$(srcdir)/vc-xtra.texi \
 	$(srcdir)/vc1-xtra.texi \
 	$(srcdir)/fortran-xtra.texi \
-	$(srcdir)/msdog-xtra.texi
+	$(srcdir)/msdos-xtra.texi
 
 EMACSSOURCES= \
 	$(srcdir)/emacs.texi \
@@ -97,7 +97,7 @@ EMACSSOURCES= \
 	$(srcdir)/xresources.texi \
 	$(srcdir)/anti.texi \
 	$(srcdir)/macos.texi \
-	$(srcdir)/msdog.texi \
+	$(srcdir)/msdos.texi \
 	$(srcdir)/gnu.texi \
 	$(srcdir)/glossary.texi \
 	$(srcdir)/ack.texi \
diff --git a/doc/emacs/msdog-xtra.texi b/doc/emacs/msdos-xtra.texi
index 876be52282..c8f587cd9d 100644
--- a/doc/emacs/msdog-xtra.texi
+++ b/doc/emacs/msdos-xtra.texi
@@ -6,19 +6,18 @@
 @c printed version) or in the main Emacs manual (for the on-line version).
 @node MS-DOS
 @section Emacs and MS-DOS
-@cindex MS-DOG
 @cindex MS-DOS peculiarities
 
   This section briefly describes the peculiarities of using Emacs on
-the MS-DOS ``operating system'' (also known as ``MS-DOG'').
+the MS-DOS ``operating system''.
 @iftex
 Information about Emacs and Microsoft's current operating system
-Windows (also known as ``Losedows'') is in the main Emacs manual
+Windows is in the main Emacs manual
 (@pxref{Microsoft Windows,,, emacs, the Emacs Manual}).
 @end iftex
 @ifnottex
 Information about peculiarities common to MS-DOS and Microsoft's
-current operating systems Windows (also known as ``Losedows'') is in
+current operating systems Windows is in
 @ref{Microsoft Windows}.
 @end ifnottex
 
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdos.texi
index 7c5b360072..a4d61e2e73 100644
--- a/doc/emacs/msdog.texi
+++ b/doc/emacs/msdos.texi
@@ -9,7 +9,7 @@
 
   This section describes peculiarities of using Emacs on Microsoft
 Windows.  Some of these peculiarities are also relevant to Microsoft's
-older MS-DOS ``operating system'' (also known as ``MS-DOG'').
+older MS-DOS operating system.
 However, Emacs features that are relevant @emph{only} to MS-DOS are
 described in a separate
 @iftex
@@ -986,5 +986,5 @@ click-to-focus policy.
 @end ifnottex
 
 @ifnottex
-@include msdog-xtra.texi
+@include msdos-xtra.texi
 @end ifnottex
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8889c046f6..7c529d1f0d 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 37ddf87cfb..f1bdbf1a32 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 d3e84d2102..d528eef673 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))