summaryrefslogtreecommitdiff
path: root/doc/emacs
diff options
context:
space:
mode:
authorReuben Thomas <rrt@sc3d.org>2014-08-07 10:55:09 +0100
committerReuben Thomas <rrt@sc3d.org>2014-08-07 10:55:09 +0100
commitdf514ccf9b9e6a4a3864d57c92425b7d7de1fd7b (patch)
treef041962dcd5ea00fa2875674950d9e02fdea7151 /doc/emacs
parentddc4ed129b9758985cc25d4d104e750de558df56 (diff)
downloademacs-df514ccf9b9e6a4a3864d57c92425b7d7de1fd7b.tar.gz
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.
Diffstat (limited to 'doc/emacs')
-rw-r--r--doc/emacs/ChangeLog12
-rw-r--r--doc/emacs/Makefile.in4
-rw-r--r--doc/emacs/emacs-xtra.texi2
-rw-r--r--doc/emacs/emacs.texi4
-rw-r--r--doc/emacs/makefile.w32-in4
-rw-r--r--doc/emacs/msdos-xtra.texi (renamed from doc/emacs/msdog-xtra.texi)7
-rw-r--r--doc/emacs/msdos.texi (renamed from doc/emacs/msdog.texi)4
7 files changed, 24 insertions, 13 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index a1d2688470d..0fd60805692 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 98ff81791ac..e9894ac2207 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 dc1ab423db2..ba2b0f0d677 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 b1cb196c3c2..702aa64bc25 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 297ec496fe6..d492a50686a 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 876be52282a..c8f587cd9d1 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 7c5b3600728..a4d61e2e73a 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