Doc fix.

41 files changed, 51 insertions, 48 deletions

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 3c258b2689b..53939f92ca6 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -169,7 +169,7 @@ recently set ones come first, oldest ones come last)."
 
 
 (defcustom bookmark-automatically-show-annotations t
-  "*Nil means don't show annotations when jumping to a bookmark."
+  "*nil means don't show annotations when jumping to a bookmark."
   :type 'boolean
   :group 'bookmark)
 
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index e068cad01cc..8474f61fc0e 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -3269,7 +3269,7 @@ calc-kill calc-kill-region calc-yank))))
 
 ;;; Users can redefine this in their .emacs files.
 (defvar calc-keypad-user-menu nil
-  "If not NIL, this describes an additional menu for calc-keypad.
+  "If non-nil, this describes an additional menu for calc-keypad.
 It should contain a list of three rows.
 Each row should be a list of six keys.
 Each key should be a list of a label string, plus a Calc command name spec.
diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index 255abe8811b..7924161711c 100644
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -1475,7 +1475,7 @@ and ends on the last Sunday of October at 2 a.m."
 
 
 ;;; Compute the date a certain number of business days since Jan 1, 1 AD.
-;;; If this returns NIL, holiday table was adjusted; redo calculation.
+;;; If this returns nil, holiday table was adjusted; redo calculation.
 
 (defun math-from-business-day (num)
   (let* ((day (math-floor num))
diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el
index 0a14e05a7a1..c8440084b0b 100644
--- a/lisp/calc/calc-math.el
+++ b/lisp/calc/calc-math.el
@@ -271,7 +271,7 @@
     (math-floor (math-sqrt a))))
 
 
-;;; This returns (flag . result) where the flag is T if A is a perfect square.
+;;; This returns (flag . result) where the flag is t if A is a perfect square.
 (defun math-isqrt-bignum (a)   ; [P.l L]
   (let ((len (length a)))
     (if (= (% len 2) 0)
diff --git a/lisp/calc/calc-mtx.el b/lisp/calc/calc-mtx.el
index 3e3d2a37607..a56d3f8d698 100644
--- a/lisp/calc/calc-mtx.el
+++ b/lisp/calc/calc-mtx.el
@@ -219,7 +219,7 @@
       (math-det-step (1- n) (math-mul prod (nth n (nth n lu))))
     prod))
 
-;;; This returns a list (LU index d), or NIL if not possible.
+;;; This returns a list (LU index d), or nil if not possible.
 ;;; Argument M must be a square matrix.
 (defvar math-lud-cache nil)
 (defun math-matrix-lud (m)
diff --git a/lisp/cvs-status.el b/lisp/cvs-status.el
index 37836f5d70e..4970c19d1fe 100644
--- a/lisp/cvs-status.el
+++ b/lisp/cvs-status.el
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs cvs status tree
-;; Revision: $Id: cvs-status.el,v 1.9 2000/12/06 19:50:12 fx Exp $
+;; Revision: $Id: cvs-status.el,v 1.10 2000/12/18 03:17:31 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -306,7 +306,7 @@ BEWARE:  because of stability issues, this is not a symetric operation."
 
 (defun cvs-status-get-tags ()
   "Look for a list of tags, read them in and delete them.
-Returns NIL if there was an empty list of tags and T if there wasn't
+Return nil if there was an empty list of tags and t if there wasn't
 even a list.  Else, return the list of tags where each element of
 the list is a three-string list TAG, KIND, REV."
   (let ((tags nil))
@@ -516,6 +516,9 @@ Optional prefix ARG chooses between two representations."
 
 ;;; Change Log:
 ;; $Log: cvs-status.el,v $
+;; Revision 1.10  2000/12/18 03:17:31  monnier
+;; Remove useless Version.
+;;
 ;; Revision 1.9  2000/12/06 19:50:12  fx
 ;; Fix copyright years.
 ;;
diff --git a/lisp/dired.el b/lisp/dired.el
index e1b4552411e..76f65d4064b 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1944,7 +1944,7 @@ Optional argument means return a file name relative to `default-directory'."
 
 (defcustom dired-recursive-deletes nil ; Default only delete empty directories.
   "*Decide whether recursive deletes are allowed.
-Nil means no recursive deletes.
+nil means no recursive deletes.
 `always' means delete recursively without asking.  This is DANGEROUS!
 `top' means ask for each directory at top level, but delete its subdirectories
 without asking.
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 5242014eb7e..88034dbbd56 100644
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -82,7 +82,7 @@ STRING4
 (defcustom ediff-show-clashes-only nil
   "*If t, show only those diff regions where both buffers disagree with the ancestor.
 This means that regions that have status prefer-A or prefer-B will be
-skipped over.  Nil means show all regions."
+skipped over.  nil means show all regions."
   :type 'boolean
   :group 'ediff-merge
   )
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index dbe039866e0..37fe9f187e1 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -1235,7 +1235,7 @@
 (defun disassemble-offset ()
   "Don't call this!"
   ;; fetch and return the offset for the current opcode.
-  ;; return NIL if this opcode has no offset
+  ;; return nil if this opcode has no offset
   ;; OP, PTR and BYTES are used and set dynamically
   (defvar op)
   (defvar ptr)
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 873032efdff..7026ece12b9 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2376,7 +2376,7 @@ Otherwise, return result of last FORM."
           v)
       (if (eq x (car v)) (cdr v) '(t)))))
 
-;;; Count number of times X refers to Y.  Return NIL for 0 times.
+;;; Count number of times X refers to Y.  Return nil for 0 times.
 (defun cl-expr-contains (x y)
   (cond ((equal y x) 1)
         ((and (consp x) (not (memq (car-safe x) '(quote function function*))))
diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el
index 32538c45580..0471db3de93 100644
--- a/lisp/emacs-lisp/elint.el
+++ b/lisp/emacs-lisp/elint.el
@@ -214,7 +214,7 @@ Returns the forms."
 
 (defun elint-find-next-top-form ()
   "Find the next top form from point.
-Returns nil if there are no more forms, T otherwise."
+Return nil if there are no more forms, t otherwise."
   (parse-partial-sexp (point) (point-max) nil t)
   (not (eobp)))
 
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index 0b081b8e901..7c06c7cb1a0 100644
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -177,7 +177,7 @@ functions will be displayed."
   :group 'elp)
 
 (defcustom elp-recycle-buffers-p t
-  "*Nil says to not recycle the `elp-results-buffer'.
+  "*nil says to not recycle the `elp-results-buffer'.
 In other words, a new unique buffer is create every time you run
 \\[elp-results]."
   :type 'boolean
diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el
index 66509589467..d870929c21a 100644
--- a/lisp/emacs-lisp/ewoc.el
+++ b/lisp/emacs-lisp/ewoc.el
@@ -375,7 +375,7 @@ Returns nil if NODE is nil or the first element."
 
 (defun ewoc-nth (ewoc n)
   "Return the Nth node.
-N counts from zero. Nil is returned if there is less than N elements.
+N counts from zero.  Return nil if there is less than N elements.
 If N is negative, return the -(N+1)th last element.
 Thus, (ewoc-nth dll 0) returns the first node,
 and (ewoc-nth dll -1) returns the last node.
diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index 7f74ab60f95..1d492d9b59c 100644
--- a/lisp/emulation/edt-mapper.el
+++ b/lisp/emulation/edt-mapper.el
@@ -119,7 +119,7 @@
 ;;;  Determine Window System, and X Server Vendor (if appropriate).
 ;;;
 (defconst edt-x-emacs-p (string-match "XEmacs" emacs-version)
-  "Non-NIL if we are running XEmacs version 19, or higher.")
+  "Non-nil if we are running XEmacs version 19, or higher.")
 
 (defconst edt-emacs-variant (if edt-x-emacs-p "xemacs" "gnu")
   "Indicates Emacs variant:  GNU Emacs or XEmacs \(aka Lucid Emacs\).")
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index d54c0bba8cb..48b08ecc1a3 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -337,7 +337,7 @@ When select mode is inactive, it is set to an empty string.")
 
 (defvar edt-default-map-active nil
   "Non-nil indicates that default EDT emulation key bindings are active.
-Nil means user-defined custom bindings are active.")
+nil means user-defined custom bindings are active.")
 
 (defvar edt-user-map-configured nil
   "Non-nil indicates that user custom EDT key bindings are configured.
diff --git a/lisp/emulation/tpu-mapper.el b/lisp/emulation/tpu-mapper.el
index 39aae2cf2a7..e6a50c074dc 100644
--- a/lisp/emulation/tpu-mapper.el
+++ b/lisp/emulation/tpu-mapper.el
@@ -80,7 +80,7 @@
 ;;;  Decide whether we're running Lucid Emacs or Emacs itself.
 ;;;
 (defconst tpu-lucid-emacs19-p (string-match "Lucid" emacs-version)
-  "Non-NIL if we are running Lucid Emacs version 19.")
+  "Non-nil if we are running Lucid Emacs version 19.")
 
 
 ;;;
diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el
index 50340e90785..5441af33044 100644
--- a/lisp/emulation/ws-mode.el
+++ b/lisp/emulation/ws-mode.el
@@ -369,7 +369,7 @@ the distance between the end of the text and `fill-column'."
 
 (defvar ws-search-string nil "String of last search in WordStar mode.")
 (defvar ws-search-direction t 
-  "Direction of last search in WordStar mode. T if forward, NIL if backward.")
+  "Direction of last search in WordStar mode. t if forward, nil if backward.")
 
 (defvar ws-last-cursorposition nil 
   "Position before last search etc. in WordStar mode.")
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 225ef3572b4..e3b560eaa7b 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1963,7 +1963,7 @@ Put point at the beginning of the signature separator."
 
 (defun gnus-article-check-hidden-text (type arg)
   "Return nil if hiding is necessary.
-Arg can be nil or a number.  Nil and positive means hide, negative
+Arg can be nil or a number.  nil and positive means hide, negative
 means show, 0 means toggle."
   (save-excursion
     (save-restriction
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index caee55d4785..bc172f4b509 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -5972,7 +5972,7 @@ be displayed."
   (unless (eq major-mode 'gnus-summary-mode)
     (set-buffer gnus-summary-buffer))
   (let ((article (or article (gnus-summary-article-number)))
-        (all-headers (not (not all-headers))) ;Must be T or NIL.
+        (all-headers (not (not all-headers))) ;Must be t or nil.
         gnus-summary-display-article-function)
     (and (not pseudo)
          (gnus-summary-article-pseudo-p article)
diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index 3d0d599b2fa..89a643fa57b 100644
--- a/lisp/gnus/mailcap.el
+++ b/lisp/gnus/mailcap.el
@@ -274,7 +274,7 @@ to return a true or false shell value for the validity.")
 
 (defcustom mailcap-download-directory nil
   "*Directory to which `mailcap-save-binary-file' downloads files by default.
-Nil means your home directory."
+nil means your home directory."
   :type '(choice (const :tag "Home directory" nil)
                  directory)
   :group 'mailcap)
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index afe9f6cdbec..e752bf7ee06 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -491,7 +491,7 @@ If the charset is `composition', return the actual one."
 
 (defun mm-find-mime-charset-region (b e &optional hack-charsets)
   "Return the MIME charsets needed to encode the region between B and E.
-Nil means ASCII, a single-element list represents an appropriate MIME
+nil means ASCII, a single-element list represents an appropriate MIME
 charset, and a longer list means no appropriate charset."
   (let (charsets)
     ;; The return possibilities of this function are a mess...
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index 8ed7a4a5973..8ba41d95072 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -99,7 +99,7 @@ message, a huge time saver for large mailboxes.")
 (defvoo nnfolder-file-coding-system mm-text-coding-system)
 (defvoo nnfolder-file-coding-system-for-write nnheader-file-coding-system
   "Coding system for save nnfolder file.
-If NIL, NNFOLDER-FILE-CODING-SYSTEM is used.")
+If nil, `nnfolder-file-coding-system' is used.")
 
 
 
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 9234325eac0..ad28361ebd8 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -318,7 +318,7 @@ GROUP: Mail will be stored in GROUP (a string).
 \(FIELD VALUE [- RESTRICT [- RESTRICT [...]]] SPLIT): If the message
   field FIELD (a regexp) contains VALUE (a regexp), store the messages 
   as specified by SPLIT.  If RESTRICT (a regexp) matches some string
-  after FIELD and before the end of the matched VALUE, return NIL,
+  after FIELD and before the end of the matched VALUE, return nil,
   otherwise process SPLIT.  Multiple RESTRICTs add up, further
   restricting the possibility of processing SPLIT.
 
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index dca1ebbd89c..9f2eb5be2a3 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -113,7 +113,7 @@ option will have no effect until you restart Emacs."
         (t '(links uid gid)))           ; GNU ls
   "*A list of optional file attributes that ls-lisp should display.
 It should contain none or more of the symbols: links, uid, gid.
-Nil (or an empty list) means display none of them.
+nil (or an empty list) means display none of them.
 
 Concepts come from UNIX: `links' means count of names associated with
 the file\; `uid' means user (owner) identifier\; `gid' means group
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 8a69ae7802d..a7f4a15c982 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -684,7 +684,7 @@ in the saved message if you use Fcc:."
 
 (defcustom feedmail-fiddle-headers-upwardly t
   "*Non-nil means fiddled header fields should go at the top of the header.
-Nil means insert them at the bottom.  This is mostly a novelty issue since
+nil means insert them at the bottom.  This is mostly a novelty issue since
 the standards define the ordering of header fields to be immaterial and it's
 fairly likely that some MTA along the way will have its own idea of what the
 order should be, regardless of what you specify."
diff --git a/lisp/mail/mh-pick.el b/lisp/mail/mh-pick.el
index c00a8d78dda..f49f0d76dbf 100644
--- a/lisp/mail/mh-pick.el
+++ b/lisp/mail/mh-pick.el
@@ -1,5 +1,5 @@
 ;;; mh-pick.el --- make a search pattern and search for a message in mh-e
-;; Time-stamp: <2001-07-14 13:09:34 pavel>
+;; Time-stamp: <2001-12-20 18:55:31 pavel>
 
 ;; Copyright (C) 1993, 1995 Free Software Foundation, Inc.
 
@@ -26,7 +26,7 @@
 
 ;;; Change Log:
 
-;; $Id: mh-pick.el,v 1.5 1996/01/14 07:34:30 erik Exp $
+;; $Id: mh-pick.el,v 1.6 2001/07/15 19:53:53 pj Exp $
 
 ;;; Code:
 
@@ -154,7 +154,7 @@ Add the messages found to the sequence named `search'."
   ;; Return the next piece of a pick argument that can be extracted from the
   ;; BUFFER.
   ;; Return a list like ("--fieldname" "pattern") or ("-search" "bodypat")
-  ;; or NIL if no pieces remain.
+  ;; or nil if no pieces remain.
   (set-buffer buffer)
   (let ((case-fold-search t))
     (cond ((eobp)
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index e1bac745bfc..a7bf6e7370e 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -1866,7 +1866,7 @@ entered, regardless of the value of `sc-electric-references-p'.  See
 
 (defun sc-toggle-var (variable)
   "Boolean toggle VARIABLE's value.
-VARIABLE must be a bound symbol.  Nil values change to t, non-nil
+VARIABLE must be a bound symbol.  nil values change to t, non-nil
 values are changed to nil."
   (message "%s changed from %s to %s"
            variable (symbol-value variable)
diff --git a/lisp/msb.el b/lisp/msb.el
index 7eb26338373..822b1e40429 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -282,7 +282,7 @@ that differs by this value or more."
 (defcustom msb-max-menu-items 15
   "*The maximum number of items in a menu.
 If this variable is set to 15 for instance, then the submenu will be
-split up in minor parts, 15 items each.  Nil means no limit."
+split up in minor parts, 15 items each.  nil means no limit."
   :type '(choice integer (const nil))
   :set 'msb-custom-set
   :group 'msb)
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 82cd661bd02..98db59145ee 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -13,7 +13,7 @@
 ;;      (Jari Aalto+mail.emacs) jari.aalto@poboxes.com
 ;; Maintainer: (Stefan Monnier) monnier+lists/cvs/pcl@flint.cs.yale.edu
 ;; Keywords: CVS, version control, release management
-;; Revision: $Id: pcvs.el,v 1.30 2001/10/30 04:41:28 monnier Exp $
+;; Revision: $Id: pcvs.el,v 1.31 2001/12/02 07:40:43 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -2079,7 +2079,7 @@ Sensible values are `cvs-examine', `cvs-status' and `cvs-quickdir'."
 ;;;###autoload
 (defcustom cvs-dired-use-hook '(4)
   "Whether or not opening a CVS directory should run PCL-CVS.
-NIL means never do it.
+nil means never do it.
 ALWAYS means to always do it unless a prefix argument is given to the
   command that prompted the opening of the directory.
 Anything else means to do it only if the prefix arg is equal to this value."
diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el
index 88c9bc043fb..c8c9dbb486f 100644
--- a/lisp/play/decipher.el
+++ b/lisp/play/decipher.el
@@ -100,7 +100,7 @@
 
 (defcustom decipher-force-uppercase t
   "*Non-nil means to convert ciphertext to uppercase.
-Nil means the case of the ciphertext is preserved.
+nil means the case of the ciphertext is preserved.
 This variable must be set before typing `\\[decipher]'."
   :type 'boolean
   :group 'decipher)
diff --git a/lisp/play/mpuz.el b/lisp/play/mpuz.el
index c0323610ab1..9d7a1d7a165 100644
--- a/lisp/play/mpuz.el
+++ b/lisp/play/mpuz.el
@@ -39,7 +39,7 @@
 (random t)                              ; randomize
 
 (defcustom mpuz-silent nil
-  "*Set this to T if you don't want dings on inputs."
+  "*Set this to t if you don't want dings on inputs."
   :type 'boolean
   :group 'mpuz)
 
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 4d29dd1650a..7707e50ea3b 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -7,7 +7,7 @@
 ;;      Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
 ;;      Emmanuel Briot  <briot@gnat.com>
 ;; Maintainer: Emmanuel Briot <briot@gnat.com>
-;; Ada Core Technologies's version:   $Revision: 1.45 $
+;; Ada Core Technologies's version:   $Revision: 1.46 $
 ;; Keywords: languages ada
 
 ;; This file is part of GNU Emacs.
@@ -241,7 +241,7 @@ For instance:
 
 (defcustom ada-indent-comment-as-code t
   "*Non-nil means indent comment lines as code.
-Nil means do not auto-indent comments."
+nil means do not auto-indent comments."
   :type 'boolean :group 'ada)
 
 (defcustom ada-indent-is-separate t
diff --git a/lisp/terminal.el b/lisp/terminal.el
index 865b917d20a..303bb695f42 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -60,7 +60,7 @@ This variable is local to each terminal-emulator buffer."
   :type 'character
   :group 'terminal)
 
-(defcustom terminal-scrolling t ;;>> Setting this to T sort-of defeats my whole aim in writing this package...
+(defcustom terminal-scrolling t ;;>> Setting this to t sort-of defeats my whole aim in writing this package...
   "*If non-nil, the terminal-emulator will losingly `scroll' when output occurs
 past the bottom of the screen.  If nil, output will win and `wrap' to the top
 of the screen.
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 50830816f6d..d12808a9562 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2104,7 +2104,7 @@ scrolling the current window.  Leave the new window selected."
    ORIGINAL-WORD is a string of the possibly misspelled word.
    OFFSET is an integer giving the line offset of the word.
    MISS-LIST and GUESS-LIST are possibly null lists of guesses and misses.
-4: Nil when an error has occurred.
+4: nil when an error has occurred.
 
 Optional second arg ACCEPT-LIST is list of words already accepted.
 Optional third arg SHIFT is an offset to apply based on previous corrections."
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 9f8a82d432b..6bcf2c77308 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -5,7 +5,7 @@
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-cvs.el,v 1.27 2001/11/25 23:52:51 monnier Exp $
+;; $Id: vc-cvs.el,v 1.28 2001/11/30 13:47:39 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -561,7 +561,7 @@ encoded as fractional days."
 
 (defun vc-cvs-annotate-time ()
   "Return the time of the next annotation (as fraction of days)
-systime , or NIL if there is none."
+systime, or nil if there is none."
   (let ((time-stamp 
          "^\\S-+\\s-+\\S-+\\s-+\\([0-9]+\\)-\\(\\sw+\\)-\\([0-9]+\\)): "))
     (if (looking-at time-stamp)
diff --git a/src/keymap.c b/src/keymap.c
index 33e3244c061..cc70f6331c7 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1045,7 +1045,7 @@ the front of KEYMAP.  */)
     }
 }
 
-/* Value is number if KEY is too long; NIL if valid but has no definition. */
+/* Value is number if KEY is too long; nil if valid but has no definition. */
 /* GC is possible in this function if it autoloads a keymap.  */
 
 DEFUN ("lookup-key", Flookup_key, Slookup_key, 2, 3, 0,
diff --git a/src/lread.c b/src/lread.c
index 80463c1e18e..824e34ae47b 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3229,8 +3229,8 @@ defvar_int (namestring, address)
   SET_SYMBOL_VALUE (sym, val);
 }
 
-/* Similar but define a variable whose value is T if address contains 1,
-   NIL if address contains 0 */
+/* Similar but define a variable whose value is t if address contains 1,
+   nil if address contains 0 */
 void
 defvar_bool (namestring, address)
      char *namestring;
diff --git a/src/w32term.c b/src/w32term.c
index 19e51266dac..96b4821a815 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -11113,7 +11113,7 @@ wide as that tab on the display.  */);
   DEFVAR_BOOL ("x-use-underline-position-properties",
                &x_use_underline_position_properties,
                doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties.
-Nil means ignore them.  If you encounter fonts with bogus
+nil means ignore them.  If you encounter fonts with bogus
 UNDERLINE_POSITION font properties, for example 7x13 on XFree prior
 to 4.1, set this to nil.  */);
   x_use_underline_position_properties = 1;
diff --git a/src/xdisp.c b/src/xdisp.c
index 1dd5f0fa985..320075ba49d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -14952,7 +14952,7 @@ go back to their normal size.  */);
   DEFVAR_BOOL ("cursor-in-non-selected-windows",
                &cursor_in_non_selected_windows,
     doc: /* *Non-nil means display a hollow cursor in non-selected windows.
-Nil means don't display a cursor there.  */);
+nil means don't display a cursor there.  */);
   cursor_in_non_selected_windows = 1;
   
   DEFVAR_BOOL ("automatic-hscrolling", &automatic_hscrolling_p,
diff --git a/src/xfaces.c b/src/xfaces.c
index f1477fdea4c..704a31d9b35 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3330,7 +3330,7 @@ merge_face_vectors (f, from, to, cycle_check)
    elements, this macro begins consing in order to keep more precise
    track of elements.
 
-   Returns NIL if a cycle was detected, otherwise a new value for CHECK
+   Returns nil if a cycle was detected, otherwise a new value for CHECK
    that includes EL.
 
    CHECK is evaluated multiple times, EL and SUSPICIOUS 0 or 1 times, so
diff --git a/src/xterm.c b/src/xterm.c
index 51b94c9fb37..ccc54c7fb14 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -14871,7 +14871,7 @@ wide as that tab on the display.  */);
   DEFVAR_BOOL ("x-use-underline-position-properties",
                &x_use_underline_position_properties,
      doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties.
-Nil means ignore them.  If you encounter fonts with bogus
+nil means ignore them.  If you encounter fonts with bogus
 UNDERLINE_POSITION font properties, for example 7x13 on XFree prior
 to 4.1, set this to nil.  */);
   x_use_underline_position_properties = 1;