(system-type): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0375d5d..a22e595 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2008-07-16  Glenn Morris  <rgm@gnu.org>
 
+       * paths.el (rmail-spool-directory): Remove settings for systems that are
+       no longer supported.
+
+       * frame.el (ns-initialize-window-system): Declare for compiler.
+
        * term/ns-win.el: Add numerous declarations for compiler.
        (ns-pop-up-frames): Move definition before use. Doc fix.
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 9c55d09..ddc8b4c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-16  Glenn Morris  <rgm@gnu.org>
+
+       * emacs.c (system-type): Doc fix.
+
 2008-07-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * keyboard.c (parse_menu_item): Don't use cachelist, even under NS.

diff --git a/src/emacs.c b/src/emacs.c
index a6e59f8..869bdef 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2508,14 +2508,13 @@ Many arguments are deleted from the list as they are processed.  */);
   DEFVAR_LISP ("system-type", &Vsystem_type,
               doc: /* Value is symbol indicating type of operating system you are using.
 Special values:
+  `gnu'         compiled for a GNU Hurd system.
   `gnu/linux'   compiled for a GNU/Linux system.
   `darwin'      compiled for Darwin (GNU-Darwin, Mac OS X, ...).
-  `macos'       compiled for Mac OS 9.
   `ms-dos'      compiled as an MS-DOS application.
   `windows-nt'  compiled as a native W32 application.
   `cygwin'      compiled using the Cygwin library.
-  `vax-vms' or
-  `axp-vms'     compiled for a (Open)VMS system.
+  `vax-vms'     compiled for a (Open)VMS system.
 Anything else indicates some sort of Unix system.  */);
   Vsystem_type = intern (SYSTEM_TYPE);