From: Glenn Morris <rgm@gnu.org>
Date: Fri, 13 Apr 2007 02:59:17 +0000 (+0000)
Subject: Fix typos.  emacserver is removed.
X-Git-Tag: emacs-pretest-22.0.98~111
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=178b60d7ee593140cf23eaa21569e9ebe098e0fa;p=emacs.git

Fix typos.  emacserver is removed.
---

diff --git a/etc/ChangeLog b/etc/ChangeLog
index a93960ea9ef..1bb9b2002cc 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-13  Glenn Morris  <rgm@gnu.org>
+
+	* MACHINES: emacserver is removed.
+
 2007-04-04  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>
 
 	* emacs.py (format_exception): New function.
diff --git a/etc/MACHINES b/etc/MACHINES
index 09abc4f0770..632c0868a6c 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -126,7 +126,7 @@ Apple PowerPC Macintosh running GNU/Linux
   Emacs distribution, and remove the "#if 0" and "#endif" directives
   which surround the following block near the end of the file:
 
-    #if 0  /* This breaks things on PPC GNU/Linux ecept for Yellowdog,
+    #if 0  /* This breaks things on PPC GNU/Linux except for Yellowdog,
 	      even with identical GCC, as, ld.  Let's take it out until we
 	      know what's really going on here.  */
     /* GCC 2.95 and newer on GNU/Linux PPC changed the load address to
@@ -156,9 +156,8 @@ Apollo running X Windows (m68k-apollo-bsd)
   installations may have to edit src/Makefile manually after it is created.
   There are too many versions of both cc and X to automate this easily.
 
-  In `lib-src/Makefile', emacsclient and emacsserver compile and work fine
-  under CC 6.9.  They now probably work under other versions of the compiler,
-  as well.
+  In `lib-src/Makefile', emacsclient compiles and works fine under CC 6.9.
+  It now probably works under other versions of the compiler, as well.
 
   The Apollo Domain CC compiler will issue quite a few warning messages,
   mostly complaining about incompatible pointers.  In general, these are
@@ -1395,7 +1394,7 @@ System V rel 3 (usg5.3)
   cannot be made to work.  Whether or not the GNU relocating malloc is
   used, the symptom is that the first call Emacs makes to sbrk(0) returns
   (char *)-1.  Sorry, you're stuck with character-only mode.  Try
-  installing Xfree86 to fix this.
+  installing XFree86 to fix this.
 
 System V rel 4.0.3 and 4.0.4 (usg5.4)