aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorReuben Thomas2014-08-07 10:55:09 +0100
committerReuben Thomas2014-08-07 10:55:09 +0100
commitdf514ccf9b9e6a4a3864d57c92425b7d7de1fd7b (patch)
treef041962dcd5ea00fa2875674950d9e02fdea7151 /doc
parentddc4ed129b9758985cc25d4d104e750de558df56 (diff)
downloademacs-df514ccf9b9e6a4a3864d57c92425b7d7de1fd7b.tar.gz
emacs-df514ccf9b9e6a4a3864d57c92425b7d7de1fd7b.zip
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')
-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 @@
12014-08-07 Reuben Thomas <rrt@sc3d.org>
2
3 Refer to MS-DOS using the same name everywhere.
4
5 * Makefile.in (EMACSSOURCES): ``MS-DOG'', ``MSDOG'' and ``msdog''
6 become ``MS-DOS''; ``msdog'' in filenames becomes ``msdos''.
7 * emacs-xtra.texi: ditto.
8 * emacs.texi: ditto.
9 * makefile.w32-in: ditto.
10 * msdog-xtra.texi: ditto, and rename file.
11 * msdog.texi: ditto, and rename file.
12
12014-07-21 Glenn Morris <rgm@gnu.org> 132014-07-21 Glenn Morris <rgm@gnu.org>
2 14
3 * emacs.texi (Intro): Workaround makeinfo 4 @acronym bug. (Bug#18040) 15 * 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= \
91 $(srcdir)/vc-xtra.texi \ 91 $(srcdir)/vc-xtra.texi \
92 $(srcdir)/vc1-xtra.texi \ 92 $(srcdir)/vc1-xtra.texi \
93 $(srcdir)/fortran-xtra.texi \ 93 $(srcdir)/fortran-xtra.texi \
94 $(srcdir)/msdog-xtra.texi 94 $(srcdir)/msdos-xtra.texi
95 95
96EMACSSOURCES= \ 96EMACSSOURCES= \
97 ${srcdir}/emacs.texi \ 97 ${srcdir}/emacs.texi \
@@ -135,7 +135,7 @@ EMACSSOURCES= \
135 ${srcdir}/xresources.texi \ 135 ${srcdir}/xresources.texi \
136 ${srcdir}/anti.texi \ 136 ${srcdir}/anti.texi \
137 ${srcdir}/macos.texi \ 137 ${srcdir}/macos.texi \
138 ${srcdir}/msdog.texi \ 138 ${srcdir}/msdos.texi \
139 ${srcdir}/gnu.texi \ 139 ${srcdir}/gnu.texi \
140 ${srcdir}/glossary.texi \ 140 ${srcdir}/glossary.texi \
141 ${srcdir}/ack.texi \ 141 ${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.
120 120
121@include fortran-xtra.texi 121@include fortran-xtra.texi
122 122
123@include msdog-xtra.texi 123@include msdos-xtra.texi
124 124
125@lowersections 125@lowersections
126@end iftex 126@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.
1574 1574
1575@include anti.texi 1575@include anti.texi
1576@include macos.texi 1576@include macos.texi
1577@c Includes msdog-xtra. 1577@c Includes msdos-xtra.
1578@include msdog.texi 1578@include msdos.texi
1579@include gnu.texi 1579@include gnu.texi
1580@include glossary.texi 1580@include glossary.texi
1581@ifnottex 1581@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=\
54 $(srcdir)/vc-xtra.texi \ 54 $(srcdir)/vc-xtra.texi \
55 $(srcdir)/vc1-xtra.texi \ 55 $(srcdir)/vc1-xtra.texi \
56 $(srcdir)/fortran-xtra.texi \ 56 $(srcdir)/fortran-xtra.texi \
57 $(srcdir)/msdog-xtra.texi 57 $(srcdir)/msdos-xtra.texi
58 58
59EMACSSOURCES= \ 59EMACSSOURCES= \
60 $(srcdir)/emacs.texi \ 60 $(srcdir)/emacs.texi \
@@ -97,7 +97,7 @@ EMACSSOURCES= \
97 $(srcdir)/xresources.texi \ 97 $(srcdir)/xresources.texi \
98 $(srcdir)/anti.texi \ 98 $(srcdir)/anti.texi \
99 $(srcdir)/macos.texi \ 99 $(srcdir)/macos.texi \
100 $(srcdir)/msdog.texi \ 100 $(srcdir)/msdos.texi \
101 $(srcdir)/gnu.texi \ 101 $(srcdir)/gnu.texi \
102 $(srcdir)/glossary.texi \ 102 $(srcdir)/glossary.texi \
103 $(srcdir)/ack.texi \ 103 $(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 @@
6@c printed version) or in the main Emacs manual (for the on-line version). 6@c printed version) or in the main Emacs manual (for the on-line version).
7@node MS-DOS 7@node MS-DOS
8@section Emacs and MS-DOS 8@section Emacs and MS-DOS
9@cindex MS-DOG
10@cindex MS-DOS peculiarities 9@cindex MS-DOS peculiarities
11 10
12 This section briefly describes the peculiarities of using Emacs on 11 This section briefly describes the peculiarities of using Emacs on
13the MS-DOS ``operating system'' (also known as ``MS-DOG''). 12the MS-DOS ``operating system''.
14@iftex 13@iftex
15Information about Emacs and Microsoft's current operating system 14Information about Emacs and Microsoft's current operating system
16Windows (also known as ``Losedows'') is in the main Emacs manual 15Windows is in the main Emacs manual
17(@pxref{Microsoft Windows,,, emacs, the Emacs Manual}). 16(@pxref{Microsoft Windows,,, emacs, the Emacs Manual}).
18@end iftex 17@end iftex
19@ifnottex 18@ifnottex
20Information about peculiarities common to MS-DOS and Microsoft's 19Information about peculiarities common to MS-DOS and Microsoft's
21current operating systems Windows (also known as ``Losedows'') is in 20current operating systems Windows is in
22@ref{Microsoft Windows}. 21@ref{Microsoft Windows}.
23@end ifnottex 22@end ifnottex
24 23
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 @@
9 9
10 This section describes peculiarities of using Emacs on Microsoft 10 This section describes peculiarities of using Emacs on Microsoft
11Windows. Some of these peculiarities are also relevant to Microsoft's 11Windows. Some of these peculiarities are also relevant to Microsoft's
12older MS-DOS ``operating system'' (also known as ``MS-DOG''). 12older MS-DOS operating system.
13However, Emacs features that are relevant @emph{only} to MS-DOS are 13However, Emacs features that are relevant @emph{only} to MS-DOS are
14described in a separate 14described in a separate
15@iftex 15@iftex
@@ -986,5 +986,5 @@ click-to-focus policy.
986@end ifnottex 986@end ifnottex
987 987
988@ifnottex 988@ifnottex
989@include msdog-xtra.texi 989@include msdos-xtra.texi
990@end ifnottex 990@end ifnottex