From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 6 May 2006 08:16:15 +0000 (+0000)
Subject: Rename `Emacs and Microsoft Windows' into `Microsoft Windows'.
X-Git-Tag: emacs-pretest-22.0.90~2762
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=53c1041b667000297fa8d50cd227d84964a6290a;p=emacs.git

Rename `Emacs and Microsoft Windows' into `Microsoft Windows'.
---

diff --git a/man/ChangeLog b/man/ChangeLog
index f9acbc4be6a..302bed8cc9f 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-06  Eli Zaretskii  <eliz@gnu.org>
+
+	* msdog.texi (Microsoft Windows): Rename from "Emacs and Microsoft
+	Windows".  All references updated.
+
 2006-05-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* macos.texi (Mac Input): Mention input from Character Palette.
diff --git a/man/emacs.texi b/man/emacs.texi
index 3e14a4b9989..4faa4d8dab2 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -133,7 +133,7 @@ and Sending Mail and Registers and Minibuffer.
 * Glossary::	        The glossary.
 * Antinews::	        Information about Emacs version 21.
 * Mac OS::              Using Emacs in the Mac.
-* Emacs and Microsoft Windows::  Using Emacs on Microsoft Windows.
+* Microsoft Windows::   Using Emacs on Microsoft Windows and MS-DOS.
 * Manifesto::	        What's GNU?  Gnu's Not Unix!
 * Acknowledgments::     Major contributors to GNU Emacs.
 
@@ -927,8 +927,8 @@ This edition of the manual is intended for use with GNU Emacs
 installed on GNU and Unix systems.  GNU Emacs can also be used on VMS,
 MS-DOS (also called MS-DOG), Microsoft Windows, and Macintosh systems.
 Those systems use different file name syntax; in addition, VMS and
-MS-DOS do not support all GNU Emacs features.  @xref{Emacs and
-Microsoft Windows}, for information about using Emacs on Windows.
+MS-DOS do not support all GNU Emacs features.  @xref{Microsoft
+Windows}, for information about using Emacs on Windows.
 @xref{Mac OS}, for information about using Emacs on Macintosh.  We
 don't try to describe VMS usage in this manual.
 @end iftex
diff --git a/man/gnu.texi b/man/gnu.texi
index 6b050d7839a..27fe2e24953 100644
--- a/man/gnu.texi
+++ b/man/gnu.texi
@@ -2,7 +2,7 @@
 @c Copyright (C) 1985, 1986, 1987, 1993, 1995, 2002, 2003, 2004,
 @c   2005, 2006 Free Software Foundation, Inc.
 @ifclear justgnu
-@node Manifesto,, Emacs and Microsoft Windows, Top
+@node Manifesto,, Microsoft Windows, Top
 @unnumbered The GNU Manifesto
 @end ifclear
 @ifset justgnu
diff --git a/man/macos.texi b/man/macos.texi
index 59a6b88e04d..a6c1020fbc5 100644
--- a/man/macos.texi
+++ b/man/macos.texi
@@ -2,7 +2,7 @@
 @c Copyright (C) 2000, 2001, 2002, 2003, 2004,
 @c   2005, 2006 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
-@node Mac OS, Emacs and Microsoft Windows, Antinews, Top
+@node Mac OS, Microsoft Windows, Antinews, Top
 @appendix Emacs and Mac OS
 @cindex Mac OS
 @cindex Macintosh
diff --git a/man/msdog.texi b/man/msdog.texi
index 2f7cc229884..6ecdd12bd81 100644
--- a/man/msdog.texi
+++ b/man/msdog.texi
@@ -2,7 +2,7 @@
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
 @c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
-@node Emacs and Microsoft Windows, Manifesto, Mac OS, Top
+@node Microsoft Windows, Manifesto, Mac OS, Top
 @appendix Emacs and Microsoft Windows
 @cindex Microsoft Windows
 @cindex MS-Windows, Emacs peculiarities