*** empty log message ***

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 738df4b..633a65e 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -75,7 +75,7 @@
 ;doc strings kept in the DOC file rather than in core,
 ;you may load them with a "site-load.el" file.
 ;But you must also cause them to be scanned when the DOC file
-;is generated.  For VMS, you must edit ../etc/makedoc.com.
+;is generated.  For VMS, you must edit ../vms/makedoc.com.
 ;For other systems, you must edit ../src/ymakefile.
 (if (load "site-load" t)
     (garbage-collect))
@@ -94,8 +94,8 @@
        (setq name (concat (downcase (substring name 0 (match-beginning 0)))
                           "-"
                           (substring name (match-end 0)))))
-      (copy-file (expand-file-name "../etc/DOC")
-                (concat (expand-file-name "../etc/DOC-") name)
+      (copy-file (expand-file-name "../share-lib/DOC")
+                (concat (expand-file-name "../share-lib/DOC-") name)
                 t)
       (Snarf-documentation (concat "DOC-" name)))
     (Snarf-documentation "DOC"))

diff --git a/lisp/server.el b/lisp/server.el
index 2645fb7..73f6479 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -24,12 +24,12 @@
 ;;; a server for other processes.
 
 ;;; Load this library and do M-x server-edit to enable Emacs as a server.
-;;; Emacs runs the program ../etc/emacsserver as a subprocess
+;;; Emacs runs the program ../arch-lib/emacsserver as a subprocess
 ;;; for communication with clients.  If there are no client buffers to edit, 
 ;;; server-edit acts like (switch-to-buffer (other-buffer))
 
 ;;; When some other program runs "the editor" to edit a file,
-;;; "the editor" can be the Emacs client program ../etc/emacsclient.
+;;; "the editor" can be the Emacs client program ../lib-src/emacsclient.
 ;;; This program transmits the file names to Emacs through
 ;;; the server subprocess, and Emacs visits them and lets you edit them.
 
@@ -130,9 +130,6 @@ Prefix arg means just kill any existing server communications subprocess."
        (set-process-sentinel server-process nil)
        (condition-case () (delete-process server-process) (error nil))))
   (condition-case () (delete-file "~/.emacs_server") (error nil))
-  (condition-case ()
-      (delete-file (format "/tmp/esrv%d-%s" (user-uid) (system-name)))
-    (error nil))
   ;; If we already had a server, clear out associated status.
   (while server-clients
     (let ((buffer (nth 1 (car server-clients))))