* mh-alias.el (mh-alias-grab-from-field): Remove leading * from

docstring. Does this mean something in a defun?

* mh-customize.el (bw-new-face-to-old, bw-old-face-to-new): Checkdoc
fix.

* mh-e.el (mh-inc-folder): Rename maildrop-name argument to file so it
reads better in docstring and manual. Sync docstring with manual.

* mh-init.el (mh-defface-compat): Remove trailing space (checkdoc).

* mh-alias.el (mh-alias-apropos): Sync docstring with manual.

* mh-comp.el (mh-redistribute, mh-to-field, mh-to-fcc)
(mh-insert-auto-fields, mh-send-letter, mh-yank-cur-msg)
(mh-fully-kill-draft, mh-open-line, mh-letter-complete)
(mh-letter-complete-or-space, mh-letter-confirm-address)
(mh-letter-next-header-field-or-indent)
(mh-letter-previous-header-field): Ditto.

* mh-customize.el (mh-alias-completion-ignore-case-flag)
(mh-default-folder-for-message-function, mh-mml-method-default)
(mh-signature-file-name, mh-yank-behavior, mh-show-hook)
(mh-show-mode-hook) Ditto.

* mh-e.el (mh-refile-or-write-again, mh-toggle-showing): Ditto.

* mh-funcs.el (mh-pipe-msg, mh-sort-folder, mh-undo-folder)
(mh-store-msg, mh-store-buffer): Ditto

* mh-index.el (mh-index-search, mh-index-do-search)
(mh-index-next-folder, mh-index-sequenced-messages): Ditto.

* mh-junk.el (mh-spamassassin-blacklist): Ditto.

* mh-mime.el (mh-mh-compose-external-compressed-tar)
(mh-mh-compose-external-type, mh-mh-to-mime, mh-mh-to-mime-undo)
(mh-mml-secure-message-sign, mh-mml-secure-message-encrypt)
(mh-mml-secure-message-signencrypt): Ditto

* mh-pick.el (mh-search-folder): Ditto.

* mh-seq.el (mh-widen): Ditto.

* mh-utils.el (mh-show, mh-modify): Ditto.

13 files changed, 360 insertions, 266 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index a8e130bcc1b..9e68139065a 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,52 @@
+2006-01-02  Bill Wohler  <wohler@newt.com>
+
+        * mh-alias.el (mh-alias-grab-from-field): Remove leading * from
+        docstring. Does this mean something in a defun?
+
+        * mh-customize.el (bw-new-face-to-old, bw-old-face-to-new):
+        Checkdoc fix.
+
+        * mh-e.el (mh-inc-folder): Rename maildrop-name argument to file
+        so it reads better in docstring and manual. Sync docstring with
+        manual.
+
+        * mh-init.el (mh-defface-compat): Remove trailing space (checkdoc).
+
+        * mh-alias.el (mh-alias-apropos): Sync docstring with manual.
+
+        * mh-comp.el (mh-redistribute, mh-to-field, mh-to-fcc)
+        (mh-insert-auto-fields, mh-send-letter, mh-yank-cur-msg)
+        (mh-fully-kill-draft, mh-open-line, mh-letter-complete)
+        (mh-letter-complete-or-space, mh-letter-confirm-address)
+        (mh-letter-next-header-field-or-indent)
+        (mh-letter-previous-header-field): Ditto.
+
+        * mh-customize.el (mh-alias-completion-ignore-case-flag)
+        (mh-default-folder-for-message-function, mh-mml-method-default)
+        (mh-signature-file-name, mh-yank-behavior, mh-show-hook)
+        (mh-show-mode-hook) Ditto.
+
+        * mh-e.el (mh-refile-or-write-again, mh-toggle-showing): Ditto.
+
+        * mh-funcs.el (mh-pipe-msg, mh-sort-folder, mh-undo-folder)
+        (mh-store-msg, mh-store-buffer): Ditto
+
+        * mh-index.el (mh-index-search, mh-index-do-search)
+        (mh-index-next-folder, mh-index-sequenced-messages): Ditto.
+
+        * mh-junk.el (mh-spamassassin-blacklist): Ditto.
+
+        * mh-mime.el (mh-mh-compose-external-compressed-tar)
+        (mh-mh-compose-external-type, mh-mh-to-mime, mh-mh-to-mime-undo)
+        (mh-mml-secure-message-sign, mh-mml-secure-message-encrypt)
+        (mh-mml-secure-message-signencrypt): Ditto
+
+        * mh-pick.el (mh-search-folder): Ditto.
+
+        * mh-seq.el (mh-widen): Ditto.
+
+        * mh-utils.el (mh-show, mh-modify): Ditto.
+
 2006-01-02  Mark D. Baushke  <mdb@gnu.org>
 
         * mh-mime.el (mh-mml-unsecure-message): Remove unused argument.
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index 397cd9ea782..d9d77b6430d 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -1,7 +1,7 @@
 ;;; mh-alias.el --- MH-E mail alias completion and expansion
 ;;
 ;; Copyright (C) 1994, 1995, 1996, 1997,
-;;  2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -580,7 +580,7 @@ filing messages."
 
 ;;;###mh-autoload
 (defun mh-alias-grab-from-field ()
-  "*Add alias for the sender of the current message."
+  "Add alias for the sender of the current message."
   (interactive)
   (mh-alias-reload-maybe)
   (save-excursion
@@ -609,7 +609,7 @@ filing messages."
 
 ;;;###mh-autoload
 (defun mh-alias-apropos (regexp)
-  "Show all aliases or addresses that match REGEXP."
+  "Show all aliases or addresses that match a regular expression REGEXP."
   (interactive "sAlias regexp: ")
   (if mh-alias-local-users
       (mh-alias-reload-maybe))
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 113572153af..63c35fd221f 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -1,7 +1,7 @@
 ;;; mh-comp.el --- MH-E functions for composing messages
 
 ;; Copyright (C) 1993, 1995, 1997,
-;;  2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -462,7 +462,7 @@ the message had come from the original sender. When you run this
 command, you are prompted for the TO and CC recipients. The
 default MESSAGE is the current message.
 
-Also investigate the \\[mh-edit-again] command for another way to
+Also investigate the command \\[mh-edit-again] for another way to
 redistribute messages.
 
 See also `mh-redist-full-contents-flag'."
@@ -1114,10 +1114,12 @@ lines."
 ;;;###mh-autoload
 (defun mh-to-field ()
   "Move to specified header field.
-The field is indicated by the previous keystroke (the last keystroke
-of the command) according to the list in the variable
-`mh-to-field-choices'. Create the field if it does not exist. Set the
-mark to point before moving."
+
+The field is indicated by the previous keystroke (the last
+keystroke of the command) according to the list in the variable
+`mh-to-field-choices'.
+Create the field if it does not exist.
+Set the mark to point before moving."
   (interactive)
   (expand-abbrev)
   (let ((target (cdr (or (assoc (char-to-string (logior last-input-char ?`))
@@ -1146,8 +1148,9 @@ mark to point before moving."
 ;;;###mh-autoload
 (defun mh-to-fcc (&optional folder)
   "Move to \"Fcc:\" header field.
-This command will prompt you for the FOLDER name in which to file a
-copy of the draft."
+
+This command will prompt you for the FOLDER name in which to file
+a copy of the draft."
   (interactive)
   (or folder
       (setq folder (mh-prompt-for-folder
@@ -1333,10 +1336,9 @@ The versions of MH-E, Emacs, and MH are shown."
 (defun mh-insert-auto-fields (&optional non-interactive)
   "Insert custom fields if recipient is found in `mh-auto-fields-list'.
 
-Sets buffer-local `mh-insert-auto-fields-done-local' when done
-and inserted something. If NON-INTERACTIVE is non-nil, do not be
-verbose and only attempt matches if
-`mh-insert-auto-fields-done-local' is nil.
+Sets buffer-local `mh-insert-auto-fields-done-local' if header
+fields were added. If NON-INTERACTIVE is non-nil, perform actions
+quietly and only if `mh-insert-auto-fields-done-local' is nil.
 
 An `identity' entry is skipped if one was already entered
 manually.
@@ -1476,9 +1478,9 @@ command. You can give a prefix argument ARG to monitor the first stage
 of the delivery\; this output can be found in a buffer called \"*MH-E
 Mail Delivery*\".
 
-The hook `mh-before-send-letter-hook' is run at the beginning of the
-this command. For example, if you want to check your spelling in your
-message before sending, add the `ispell-message' function.
+The hook `mh-before-send-letter-hook' is run at the beginning of
+this command. For example, if you want to check your spelling in
+your message before sending, add the function `ispell-message'.
 
 In case the MH \"send\" program is installed under a different name,
 use `mh-send-prog' to tell MH-E the name."
@@ -1607,12 +1609,13 @@ text from the message to which you're replying, and inserting
 `mh-ins-buf-prefix' (`> ') before each line.
 
 The attribution consists of the sender's name and email address
-followed by the content of the `mh-extract-from-attribution-verb'
-option.
+followed by the content of the option
+`mh-extract-from-attribution-verb'.
 
-You can also turn on the `mh-delete-yanked-msg-window-flag'
-option to delete the window containing the original message after
-yanking it to make more room on your screen for your reply.
+You can also turn on the option
+`mh-delete-yanked-msg-window-flag' to delete the window
+containing the original message after yanking it to make more
+room on your screen for your reply.
 
 You can control how the message to which you are replying is
 yanked into your reply using `mh-yank-behavior'.
@@ -1741,9 +1744,10 @@ Otherwise, simply insert MH-INS-STRING before each line."
 ;;;###mh-autoload
 (defun mh-fully-kill-draft ()
   "Quit editing and delete draft message.
+
 If for some reason you are not happy with the draft, you can use
-the this command to kill the draft buffer and delete the draft
-message. Use the \\[kill-buffer] command if you don't want to
+this command to kill the draft buffer and delete the draft
+message. Use the command \\[kill-buffer] if you don't want to
 delete the draft message."
   (interactive)
   (if (y-or-n-p "Kill draft message? ")
@@ -1771,9 +1775,9 @@ delete the draft message."
 
 ;;;###mh-autoload
 (defun mh-open-line ()
-  "Insert a newline and leave point after it.
+  "Insert a newline and leave point before it.
 
-This command is similar to the \\[open-line] command in that it
+This command is similar to the command \\[open-line] in that it
 inserts a newline after point. It differs in that it also inserts
 the right number of quoting characters and spaces so that the
 next line begins in the same column as it was. This is useful
@@ -1865,12 +1869,13 @@ Any match found replaces the text from BEGIN to END."
 
 (defun mh-letter-complete (arg)
   "Perform completion on header field or word preceding point.
+
 If the field contains addresses (for example, \"To:\" or \"Cc:\")
-or folders (for example, \"Fcc:\") then this command will
-provide alias completion. In the body of the message, this
-command runs `mh-letter-complete-function' instead, which is set
-to \"'ispell-complete-word\" by default. This command takes a
-prefix argument ARG that is passed to the
+or folders (for example, \"Fcc:\") then this command will provide
+alias completion. In the body of the message, this command runs
+`mh-letter-complete-function' instead, which is set to
+`ispell-complete-word' by default. This command takes a prefix
+argument ARG that is passed to the
 `mh-letter-complete-function'."
   (interactive "P")
   (let ((func nil))
@@ -1883,11 +1888,11 @@ prefix argument ARG that is passed to the
 
 (defun mh-letter-complete-or-space (arg)
   "Perform completion or insert space.
-Turn on the `mh-compose-space-does-completion-flag' option to use
-this command to perform completion in the header. Otherwise, a
-space is inserted.
 
-ARG is the number of spaces inserted."
+Turn on the option `mh-compose-space-does-completion-flag' to use
+this command to perform completion in the header. Otherwise, a
+space is inserted; use a prefix argument ARG to specify more than
+one space."
   (interactive "p")
   (let ((func nil)
         (end-of-prev (save-excursion
@@ -1904,9 +1909,10 @@ ARG is the number of spaces inserted."
 
 (defun mh-letter-confirm-address ()
   "Flash alias expansion.
-Addresses are separated by a comma\; and when you press the
-comma, this command flashes the alias expansion in the minibuffer
-if `mh-alias-flash-on-comma' is turned on."
+
+Addresses are separated by a comma\; when you press the comma,
+this command flashes the alias expansion in the minibuffer if
+`mh-alias-flash-on-comma' is turned on."
   (interactive)
   (cond ((not (mh-in-header-p)) (self-insert-command 1))
         ((eq (cdr (assoc (mh-letter-header-field-at-point)
@@ -1929,9 +1935,11 @@ downcasing the field name."
 
 ;;;###mh-autoload
 (defun mh-letter-next-header-field-or-indent (arg)
-  "Move to next field or indent depending on point.
+  "Cycle to next field.
+
 Within the header of the message, this command moves between
-fields, but skips those fields listed in
+fields that are highlighted with the face
+`mh-letter-header-field', skipping those fields listed in
 `mh-compose-skipped-header-fields'. After the last field, this
 command then moves point to the message body before cycling back
 to the first field. If point is already past the first line of
@@ -1969,10 +1977,11 @@ body."
 ;;;###mh-autoload
 (defun mh-letter-previous-header-field ()
   "Cycle to the previous header field.
+
 This command moves backwards between the fields and cycles to the
-body of the message after the first field. Unlike the
-\\[mh-letter-next-header-field-or-indent] command, it will always
-take point to the last field from anywhere in the body."
+body of the message after the first field. Unlike the command
+\\[mh-letter-next-header-field-or-indent], it will always take
+point to the last field from anywhere in the body."
   (interactive)
   (let ((header-end (mh-mail-header-end)))
     (if (>= (point) header-end)
diff --git a/lisp/mh-e/mh-customize.el b/lisp/mh-e/mh-customize.el
index edd6ee41b01..a2b667769bf 100644
--- a/lisp/mh-e/mh-customize.el
+++ b/lisp/mh-e/mh-customize.el
@@ -1,6 +1,6 @@
 ;;; mh-customize.el --- MH-E customization
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -260,7 +260,7 @@ accordingly."
   "*Non-nil means don't consider case significant in MH alias completion.
 
 As MH ignores case in the aliases, so too does MH-E. However, you
-may turn this option off to make case significant which can be
+may turn off this option to make case significant which can be
 used to segregate completion of your aliases. You might use
 lowercase for mailing lists and uppercase for people."
   :type 'boolean
@@ -435,7 +435,7 @@ an alternate view. For example, \"'(\"-nolimit\" \"-textfield\"
 ;;; Folder Selection (:group 'mh-folder-selection)
 
 (defcustom mh-default-folder-for-message-function nil
-  "Function to select a default folder for refiling or \"Fcc\".
+  "Function to select a default folder for refiling or \"Fcc:\".
 
 The current buffer is set to the message being refiled with point
 at the start of the message. This function should return the
@@ -898,10 +898,11 @@ vanilla \"PGP\" and \"S/MIME\".
 The `pgg' customization group may have some settings which may
 interest you (see Info node `(pgg)').
 
-In particular, I set the option `pgg-encrypt-for-me' to t so that all
-messages I encrypt are encrypted with my public key as well. If you
-keep a copy of all of your outgoing mail with a \"Fcc:\" header field,
-this setting is vital so that you can read the mail you write!"
+In particular, I turn on the option `pgg-encrypt-for-me' so that
+all messages I encrypt are encrypted with my public key as well.
+If you keep a copy of all of your outgoing mail with a \"Fcc:\"
+header field, this setting is vital so that you can read the mail
+you write!"
   :type '(choice (const :tag "PGP (MIME)" "pgpmime")
                  (const :tag "PGP" "pgp")
                  (const :tag "S/MIME" "smime")
@@ -925,8 +926,8 @@ said separator). The function `mh-signature-separator-p', which
 reports t if the buffer contains a separator, may be useful as well.
 
 The signature is inserted into your message with the command
-\\<mh-letter-mode-map>\\[mh-insert-signature] or with the
-`mh-identity-list' option."
+\\<mh-letter-mode-map>\\[mh-insert-signature] or with the option
+`mh-identity-list'."
   :type 'file
   :group 'mh-letter)
 
@@ -971,33 +972,33 @@ this option doesn't exist."
 (defcustom mh-yank-behavior 'attribution
   "*Controls which part of a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg].
 
-To include the entire message, including the entire header, use \"Body
-and Header\". Use \"Body\" to yank just the body without the header.
-To yank only the portion of the message following the point, set this
-option to \"Below Point\".
+To include the entire message, including the entire header, use
+\"Body and Header\". Use \"Body\" to yank just the body without
+the header. To yank only the portion of the message following the
+point, set this option to \"Below Point\".
 
 Choose \"Invoke supercite\" to pass the entire message and header
 through supercite.
 
-If the \"Body With Attribution\" setting is used, then the message
-minus the header is yanked and a simple attribution line is added at
-the top using the value of the `mh-extract-from-attribution-verb'
-option. This is the default.
-
-If the \"Invoke supercite\" or \"Body With Attribution\" settings are
-used, the \"-noformat\" argument is passed to the \"repl\" program to
-override a \"-filter\" or \"-format\" argument. These settings also
-have \"Automatically\" variants that perform the action automatically
-when you reply so that you don't need to use \\[mh-yank-cur-msg] at
-all. Note that this automatic action is only performed if the show
-buffer matches the message being replied to. People who use the
-automatic variants tend to turn on the
-`mh-delete-yanked-msg-window-flag' option as well so that the show
-window is never displayed.
-
-If the show buffer has a region, the `mh-yank-behavior' option is
-ignored unless its value is one of Attribution variants in which case
-the attribution is added to the yanked region.
+If the \"Body With Attribution\" setting is used, then the
+message minus the header is yanked and a simple attribution line
+is added at the top using the value of the option
+`mh-extract-from-attribution-verb'. This is the default.
+
+If the \"Invoke supercite\" or \"Body With Attribution\" settings
+are used, the \"-noformat\" argument is passed to the \"repl\"
+program to override a \"-filter\" or \"-format\" argument. These
+settings also have \"Automatically\" variants that perform the
+action automatically when you reply so that you don't need to use
+\\[mh-yank-cur-msg] at all. Note that this automatic action is
+only performed if the show buffer matches the message being
+replied to. People who use the automatic variants tend to turn on
+the option `mh-delete-yanked-msg-window-flag' as well so that the
+show window is never displayed.
+
+If the show buffer has a region, the option `mh-yank-behavior' is
+ignored unless its value is one of Attribution variants in which
+case the attribution is added to the yanked region.
 
 If this option is set to one of the supercite flavors, the hook
 `mail-citation-hook' is ignored and `mh-ins-buf-prefix' is not
@@ -2460,7 +2461,7 @@ See also `mh-before-quit-hook'."
 
 It is the last thing called after messages are displayed. It's
 used to affect the behavior of MH-E in general or when
-`mh-show-mode-hook' is too early."
+`mh-show-mode-hook' is too early. See `mh-show-mode-hook'."
   :type 'hook
   :group 'mh-hooks
   :group 'mh-show)
@@ -2470,7 +2471,7 @@ used to affect the behavior of MH-E in general or when
 
 This hook is called early on in the process of the message
 display. It is usually used to perform some action on the
-message's content."
+message's content. See `mh-show-hook'."
   :type 'hook
   :group 'mh-hooks
   :group 'mh-show)
@@ -2802,7 +2803,7 @@ The background and foreground are used in the image."
          (setq bw-face-generation 'new))))
 
 (defun bw-new-face-to-old ()
-  "Sets old faces."
+  "Set old faces."
   (face-spec-set 'mh-folder-body
     (mh-defface-compat
      '((((class color) (min-colors 88) (background light))
@@ -2858,7 +2859,7 @@ The background and foreground are used in the image."
        (:bold t)))))
 
 (defun bw-old-face-to-new ()
-  "Sets new faces."
+  "Set new faces."
   (face-spec-set 'mh-folder-body
     '((((class color))
        (:inherit mh-folder-msg-number))
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 1deb465c1fe..19024ffc6f6 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1985, 1986, 1987, 1988,
 ;;  1990, 1992, 1993, 1994, 1995, 1997, 1999,
-;;  2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -711,21 +711,18 @@ Use the command \\[mh-show] to show the message normally again."
       (mh-recenter 0))
     (setq mh-showing-with-headers t)))
 
-(defun mh-inc-folder (&optional maildrop-name folder)
+(defun mh-inc-folder (&optional file folder)
   "Incorporate new mail into a folder.
 
 You can incorporate mail from any file into the current folder by
 specifying a prefix argument; you'll be prompted for the name of
-the file to use as well as the destination folder
+the FILE to use as well as the destination FOLDER
 
 The hook `mh-inc-folder-hook' is run after incorporating new
-mail. Do not call this function from outside MH-E; use
-\\[mh-rmail] instead.
+mail.
 
-In a program optional argument MAILDROP-NAME specifies an
-alternate maildrop from the default. The optional argument FOLDER
-specifies where to incorporate mail instead of the default named
-by `mh-inbox'."
+Do not call this function from outside MH-E; use \\[mh-rmail]
+instead."
   (interactive (list (if current-prefix-arg
                          (expand-file-name
                           (read-file-name "inc mail from file: "
@@ -745,7 +742,7 @@ by `mh-inbox'."
             ((not (eq (current-buffer) (get-buffer folder)))
              (switch-to-buffer folder)
              (setq mh-previous-window-config config))))
-    (mh-get-new-mail maildrop-name)
+    (mh-get-new-mail file)
     (when (and threading-needed-flag
                (save-excursion
                  (goto-char (point-min))
@@ -892,8 +889,10 @@ DONT-UPDATE-LAST-DESTINATION-FLAG is non-nil."
 (defun mh-refile-or-write-again (range &optional interactive-flag)
   "Repeat last output command.
 
-If you are refiling several messages into the same folder, you can use
-this command to repeat the last refile or write. You can use a range.
+If you are refiling several messages into the same folder, you
+can use this command to repeat the last
+refile (\\[mh-refile-msg]) or write (\\[mh-write-msg-to-file]).
+You can use a range.
 
 Check the documentation of `mh-interactive-range' to see how RANGE is
 read in interactive use.
@@ -1255,7 +1254,14 @@ the command \\[mh-refile-or-write-again]."
       (append-to-file (point) (point-max) output-file))))
 
 (defun mh-toggle-showing ()
-  "Toggle the scanning mode/showing mode of displaying messages."
+  "Toggle between MH-Folder and MH-Folder Show modes.
+
+This command switches between MH-Folder mode and MH-Folder Show
+mode. MH-Folder mode turns off the associated show buffer so that
+you can perform operations on the messages quickly without
+reading them. This is an excellent way to prune out your junk
+mail or to refile a group of messages to another folder for later
+examination."
   (interactive)
   (if mh-showing-mode
       (mh-set-scan-mode)
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index 800ff96b510..4fb64b4cd17 100644
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -1,7 +1,7 @@
 ;;; mh-funcs.el --- MH-E functions not everyone will use right away
 
 ;; Copyright (C) 1993, 1995,
-;;  2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -214,9 +214,9 @@ Display RANGE after packing, or the entire folder if RANGE is nil."
   "Pipe message through shell command COMMAND.
 
 You are prompted for the Unix command through which you wish to
-run your message. If you give an argument INCLUDE-HEADER to this
-command, the message header is included in the text passed to the
-command."
+run your message. If you give a prefix argument INCLUDE-HEADER to
+this command, the message header is included in the text passed
+to the command."
   (interactive
    (list (read-string "Shell command on message: ") current-prefix-arg))
   (let ((msg-file-to-pipe (mh-msg-filename (mh-get-msg-num t)))
@@ -266,12 +266,11 @@ command."
 
 ;;;###mh-autoload
 (defun mh-sort-folder (&optional extra-args)
-  "Sort the messages in the current folder by date.
+  "Sort folder.
 
-Calls the MH program sortm to do the work.
-
-The arguments in the list `mh-sortm-args' are passed to sortm if
-the optional argument EXTRA-ARGS is given."
+By default, messages are sorted by date. The option
+`mh-sortm-args' holds extra arguments to pass on to the command
+\"sortm\" when a prefix argument EXTRA-ARGS is used."
   (interactive "P")
   (mh-process-or-undo-commands mh-current-folder)
   (setq mh-next-direction 'forward)
@@ -288,7 +287,7 @@ the optional argument EXTRA-ARGS is given."
 
 ;;;###mh-autoload
 (defun mh-undo-folder ()
-  "Undo all pending deletes and refiles in current folder."
+  "Undo all refiles and deletes in the current folder."
   (interactive)
   (cond ((or mh-do-not-confirm-flag
              (yes-or-no-p "Undo all commands in folder? "))
@@ -310,7 +309,9 @@ however, you have a chance to specify a different extraction
 directory. The next time you use this command, the default
 directory is the last directory you used. If you would like to
 change the initial default directory, customize the option
-`mh-store-default-directory'."
+`mh-store-default-directory', change the value from \"Current\"
+to \"Directory\", and then enter the name of the directory for
+storing the content of these messages."
   (interactive (list (let ((udir (or mh-store-default-directory
                                      default-directory)))
                        (read-file-name "Store message in directory: "
@@ -324,12 +325,9 @@ change the initial default directory, customize the option
 
 ;;;###mh-autoload
 (defun mh-store-buffer (directory)
-  "Store the file(s) contained in the current buffer into DIRECTORY.
-
-The buffer can contain a shar file or uuencoded file.
+  "Unpack buffer created with \"uudecode\" or \"shar\".
 
-Default directory is the last directory used, or initially the
-value of `mh-store-default-directory' or the current directory."
+See `mh-store-msg' for a description of DIRECTORY."
   (interactive (list (let ((udir (or mh-store-default-directory
                                      default-directory)))
                        (read-file-name "Store buffer in directory: "
diff --git a/lisp/mh-e/mh-index.el b/lisp/mh-e/mh-index.el
index c8ec7fb399b..08775c557b1 100644
--- a/lisp/mh-e/mh-index.el
+++ b/lisp/mh-e/mh-index.el
@@ -1,6 +1,6 @@
 ;;; mh-index  --  MH-E interface to indexing programs
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -359,46 +359,52 @@ construct the base name."
                         &optional window-config)
   "Perform an indexed search in an MH mail folder.
 
-Use a prefix argument to repeat the search.
+Use a prefix argument to repeat the last search.
 
-Unlike regular searches, the prompt for the folder to search can be
-\"all\" to search all folders; in addition, the search works recursively
-on the listed folder. The search criteria are entered in an MH-Pick
-buffer as described in `mh-search-folder'.
+Unlike regular searches, the prompt for the folder to search can
+be \"all\" to search all folders; in addition, the search works
+recursively on the listed folder. The search criteria are entered
+in an MH-Pick buffer as described in `mh-search-folder'.\\<mh-pick-mode-map>
 
-To perform the search, type \\<mh-pick-mode-map>\\[mh-do-search].
-Another difference from the regular searches is that because the
-search operates on more than one folder, the messages that are found
-are put in a temporary sub-folder of \"+mhe-index\" and are displayed in
-an MH-Folder buffer. This buffer is special because it displays
+To perform the search, type \\[mh-do-search]. Another difference
+from the regular searches is that because the search operates on
+more than one folder, the messages that are found are put in a
+temporary sub-folder of \"+mhe-index\" and are displayed in an
+MH-Folder buffer. This buffer is special because it displays
 messages from multiple folders; each set of messages from a given
-folder has a heading with the folder name.
-
-In addition, the \\<mh-folder-mode-map>\\[mh-index-visit-folder]
-command can be used to visit the folder of the message at point.
-Initially, only the messages that matched the search criteria are
-displayed in the folder. While the temporary buffer has its own set of
-message numbers, the actual messages numbers are shown in the visited
-folder. Thus, the \\[mh-index-visit-folder] command is useful to find
-the actual message number of an interesting message, or to view
-surrounding messages with the \\[mh-rescan-folder] command.
-
-Because this folder is temporary, you'll probably get in the habit of
-killing it when you're done with \\[mh-kill-folder].
-
-If you have run the \\[mh-search-folder] command, but change your mind
-while entering the search criteria and actually want to run an indexed
-search, then you can use the
-\\<mh-pick-mode-map>\\[mh-index-do-search] command in the MH-Pick
-buffer.
-
-The \\<mh-folder-mode-map>\\[mh-index-search] command runs the command
-defined by the `mh-index-program' option. The default value is
-\"Auto-detect\" which means that MH-E will automatically choose one of
+folder has a heading with the folder name.\\<mh-folder-mode-map>
+
+The appearance of the heading can be modified by customizing the
+face `mh-index-folder'. You can jump back and forth between the
+headings using the commands \\[mh-index-next-folder] and
+\\[mh-index-previous-folder].
+
+In addition, the command \\[mh-index-visit-folder] can be used to
+visit the folder of the message at point. Initially, only the
+messages that matched the search criteria are displayed in the
+folder. While the temporary buffer has its own set of message
+numbers, the actual messages numbers are shown in the visited
+folder. Thus, the command \\[mh-index-visit-folder] is useful to
+find the actual message number of an interesting message, or to
+view surrounding messages with the command \\[mh-rescan-folder].
+
+Because this folder is temporary, you'll probably get in the
+habit of killing it when you're done with
+\\[mh-kill-folder].
+
+If you have run the command \\[mh-search-folder], but change your
+mind while entering the search criteria and actually want to run
+an indexed search, then you can use the command
+\\<mh-pick-mode-map>\\[mh-index-do-search] in the MH-Pick
+buffer.\\<mh-folder-mode-map>
+
+The command \\[mh-index-search] runs the command defined by the
+option `mh-index-program'. The default value is \"Auto-detect\"
+which means that MH-E will automatically choose one of
 \"swish++\", \"swish-e\", \"mairix\", \"namazu\", \"pick\" and
-\"grep\" in that order. If, for example, you have both \"swish++\" and
-\"mairix\" installed and you want to use \"mairix\", then you can set
-this option to \"mairix\".
+\"grep\" in that order. If, for example, you have both
+\"swish++\" and \"mairix\" installed and you want to use
+\"mairix\", then you can set this option to \"mairix\".
 
                                 *NOTE*
 
@@ -621,7 +627,7 @@ PROC is used to convert the value to actual data."
 
 ;;;###mh-autoload
 (defun mh-index-do-search ()
-  "Construct appropriate regexp and call `mh-index-search'."
+  "Find messages that match the qualifications in the current pattern buffer."
   (interactive)
   (unless (mh-index-choose) (error "No indexing program found"))
   (let* ((regexp-list (mh-pick-parse-search-buffer))
@@ -736,8 +742,7 @@ parsed."
 ;;;###mh-autoload
 (defun mh-index-next-folder (&optional backward-flag)
   "Jump to the next folder marker.
-The function is only applicable to folders displaying index search
-results.
+
 With non-nil optional argument BACKWARD-FLAG, jump to the previous
 group of results."
   (interactive "P")
@@ -1305,11 +1310,12 @@ recursively. All parameters ARGS are ignored."
 
 ;;;###mh-autoload
 (defun mh-index-sequenced-messages (folders sequence)
-  "Display messages from FOLDERS in SEQUENCE.
-All messages in the sequence you provide from the folders in
-`mh-new-messages-folders' are listed. With a prefix argument,
-enter a space-separated list of folders, or nothing to search all
-folders."
+  "Display messages in any sequence.
+
+All messages from the FOLDERS in `mh-new-messages-folders' in the
+SEQUENCE you provide are listed. With a prefix argument, enter a
+space-separated list of folders at the prompt, or nothing to
+search all folders."
   (interactive
    (list (if current-prefix-arg
              (split-string (read-string "Search folder(s) (default all): "))
diff --git a/lisp/mh-e/mh-init.el b/lisp/mh-e/mh-init.el
index 2818674afae..ba78c269439 100644
--- a/lisp/mh-e/mh-init.el
+++ b/lisp/mh-e/mh-init.el
@@ -334,7 +334,7 @@ there. Otherwise, the images directory is added to the
 
 (defun mh-defface-compat (spec)
   "Convert SPEC for defface if necessary to run on older platforms.
-Modifies SPEC in place and returns it. See `defface' for the spec definition. 
+Modifies SPEC in place and returns it. See `defface' for the spec definition.
 
 When `mh-min-colors-defined-flag' is nil, this function finds a
 display with a single \"class\" requirement with a \"color\"
diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el
index 5d2bf87581e..71d3fbf7b8b 100644
--- a/lisp/mh-e/mh-junk.el
+++ b/lisp/mh-e/mh-junk.el
@@ -1,6 +1,6 @@
 ;;; mh-junk.el --- Interface to anti-spam measures
 
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>,
 ;;         Bill Wohler <wohler@newt.com>
@@ -108,10 +108,12 @@ RANGE is read in interactive use."
 (defun mh-spamassassin-blacklist (msg)
   "Blacklist MSG with SpamAssassin.
 
-SpamAssassin is one of the more popular spam filtering programs. Get
-it from your local distribution or from http://spamassassin.org/.
+SpamAssassin is one of the more popular spam filtering programs.
+Get it from your local distribution or from
+http://spamassassin.org/.
 
-To use SpamAssassin, add the following recipes to \".procmailrc\":
+To use SpamAssassin, add the following recipes to
+\".procmailrc\":
 
     MAILDIR=$HOME/`mhparam Path`
 
@@ -130,56 +132,59 @@ To use SpamAssassin, add the following recipes to \".procmailrc\":
 
 If you don't use \"spamc\", use \"spamassassin -P -a\".
 
-Note that one of the recipes above throws away messages with a score
-greater than or equal to 10. Here's how you can determine a value that
-works best for you.
+Note that one of the recipes above throws away messages with a
+score greater than or equal to 10. Here's how you can determine a
+value that works best for you.
 
-First, run \"spamassassin -t\" on every mail message in your archive and
-use Gnumeric to verify that the average plus the standard deviation of
-good mail is under 5, the SpamAssassin default for \"spam\".
+First, run \"spamassassin -t\" on every mail message in your
+archive and use Gnumeric to verify that the average plus the
+standard deviation of good mail is under 5, the SpamAssassin
+default for \"spam\".
 
-Using Gnumeric, sort the messages by score and view the messages with
-the highest score. Determine the score which encompasses all of your
-interesting messages and add a couple of points to be conservative.
-Add that many dots to the \"X-Spam-Level:\" header field above to send
-messages with that score down the drain.
+Using Gnumeric, sort the messages by score and view the messages
+with the highest score. Determine the score which encompasses all
+of your interesting messages and add a couple of points to be
+conservative. Add that many dots to the \"X-Spam-Level:\" header
+field above to send messages with that score down the drain.
 
-In the example above, messages with a score of 5-9 are set aside in
-the \"+spam\" folder for later review. The major weakness of rules-based
-filters is a plethora of false positives so it is worthwhile to check.
+In the example above, messages with a score of 5-9 are set aside
+in the \"+spam\" folder for later review. The major weakness of
+rules-based filters is a plethora of false positives so it is
+worthwhile to check.
 
-If SpamAssassin classifies a message incorrectly, or is unsure, you
-can use the MH-E commands \\[mh-junk-blacklist] and
+If SpamAssassin classifies a message incorrectly, or is unsure,
+you can use the MH-E commands \\[mh-junk-blacklist] and
 \\[mh-junk-whitelist].
 
-The \\[mh-junk-blacklist] command adds a \"blacklist_from\" entry to
-\"~/spamassassin/user_prefs\", deletes the message, and sends the
-message to the Razor, so that others might not see this spam. If the
-\"sa-learn\" command is available, the message is also recategorized as
-spam.
+The command \\[mh-junk-blacklist] adds a \"blacklist_from\" entry
+to \"~/spamassassin/user_prefs\", deletes the message, and sends
+the message to the Razor, so that others might not see this spam.
+If the \"sa-learn\" command is available, the message is also
+recategorized as spam.
 
-The \\[mh-junk-whitelist] command adds a \"whitelist_from\" rule to the
-\"~/.spamassassin/user_prefs\" file. If the \"sa-learn\" command is
-available, the message is also recategorized as ham.
+The command \\[mh-junk-whitelist] adds a \"whitelist_from\" rule
+to the \"~/.spamassassin/user_prefs\" file. If the \"sa-learn\"
+command is available, the message is also recategorized as ham.
 
 Over time, you'll observe that the same host or domain occurs
-repeatedly in the \"blacklist_from\" entries, so you might think that
-you could avoid future spam by blacklisting all mail from a particular
-domain. The utility function `mh-spamassassin-identify-spammers' helps
-you do precisely that. This function displays a frequency count of the
-hosts and domains in the \"blacklist_from\" entries from the last blank
-line in \"~/.spamassassin/user_prefs\" to the end of the file. This
+repeatedly in the \"blacklist_from\" entries, so you might think
+that you could avoid future spam by blacklisting all mail from a
+particular domain. The utility function
+`mh-spamassassin-identify-spammers' helps you do precisely that.
+This function displays a frequency count of the hosts and domains
+in the \"blacklist_from\" entries from the last blank line in
+\"~/.spamassassin/user_prefs\" to the end of the file. This
 information can be used so that you can replace multiple
 \"blacklist_from\" entries with a single wildcard entry such as:
 
     blacklist_from *@*amazingoffersdirect2u.com
 
 In versions of SpamAssassin (2.50 and on) that support a Bayesian
-classifier, \\[mh-junk-blacklist] uses the \"sa-learn\" program to
-recategorize the message as spam. Neither MH-E, nor SpamAssassin,
-rebuilds the database after adding words, so you will need to run
-\"sa-learn --rebuild\" periodically. This can be done by adding the
-following to your crontab:
+classifier, \\[mh-junk-blacklist] uses the program \"sa-learn\"
+to recategorize the message as spam. Neither MH-E, nor
+SpamAssassin, rebuilds the database after adding words, so you
+will need to run \"sa-learn --rebuild\" periodically. This can be
+done by adding the following to your crontab:
 
     0 * * * *   sa-learn --rebuild > /dev/null 2>&1"
   (unless mh-spamassassin-executable
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index bcf7948964b..9edcf10b36d 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -1,7 +1,7 @@
 ;;; mh-mime.el --- MH-E support for composing MIME messages
 
 ;; Copyright (C) 1993, 1995,
-;;  2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -318,9 +318,10 @@ set of ATTRIBUTES and an optional COMMENT can also be included."
 ;;;###mh-autoload
 (defun mh-mh-compose-anon-ftp (host filename type description)
   "Add tag to include anonymous ftp reference to a file.
-You can even have your message initiate an \"ftp\" transfer when
-the recipient reads the message. You are prompted for the remote
-HOST and FILENAME, the media TYPE, and the content DESCRIPTION.
+
+You can have your message initiate an \"ftp\" transfer when the
+recipient reads the message. You are prompted for the remote HOST
+and FILENAME, the media TYPE, and the content DESCRIPTION.
 
 See also \\[mh-mh-to-mime]."
   (interactive (list
@@ -334,8 +335,9 @@ See also \\[mh-mh-to-mime]."
 ;;;###mh-autoload
 (defun mh-mh-compose-external-compressed-tar (host filename description)
   "Add tag to include anonymous ftp reference to a compressed tar file.
+
 In addition to retrieving the file via anonymous \"ftp\" as per
-the \\[mh-mh-compose-anon-ftp] command, the file will also be
+the command \\[mh-mh-compose-anon-ftp], the file will also be
 uncompressed and untarred. You are prompted for the remote HOST
 and FILENAME and the content DESCRIPTION.
 
@@ -356,6 +358,7 @@ See also \\[mh-mh-to-mime]."
                                                 attributes parameters
                                                 comment)
   "Add tag to refer to a remote file.
+
 This command is a general utility for referencing external files.
 In fact, all of the other commands that insert directives to
 access external files call this command. You are prompted for the
@@ -435,14 +438,14 @@ Typically, you send a message with attachments just like any other
 message. However, you may take a sneak preview of the MIME encoding if
 you wish by running this command.
 
-If you wish to pass additional arguments to \"mhbuild\" (\"mhn\") to
-affect how it builds your message, use the `mh-mh-to-mime-args'
-option. For example, you can build a consistency check into the
-message by setting `mh-mh-to-mime-args' to \"-check\". The recipient
-of your message can then run \"mhbuild -check\" on the
-message--\"mhbuild\" (\"mhn\") will complain if the message has been
-corrupted on the way. This command only consults this option when
-given a prefix argument EXTRA-ARGS.
+If you wish to pass additional arguments to \"mhbuild\" (\"mhn\")
+to affect how it builds your message, use the option
+`mh-mh-to-mime-args'. For example, you can build a consistency
+check into the message by setting `mh-mh-to-mime-args' to
+\"-check\". The recipient of your message can then run \"mhbuild
+-check\" on the message--\"mhbuild\" (\"mhn\") will complain if
+the message has been corrupted on the way. This command only
+consults this option when given a prefix argument EXTRA-ARGS.
 
 The hook `mh-mh-to-mime-hook' is called after the message has been
 formatted.
@@ -484,8 +487,10 @@ This function will quote all such characters."
 ;;;###mh-autoload
 (defun mh-mh-to-mime-undo (noconfirm)
   "Undo effects of \\[mh-mh-to-mime].
-Optional non-nil argument NOCONFIRM means don't ask for
-confirmation."
+
+It does this by reverting to a backup file. You are prompted to
+confirm this action, but you can avoid the confirmation by adding
+a prefix argument NOCONFIRM."
   (interactive "*P")
   (if (null buffer-file-name)
       (error "Buffer does not seem to be associated with any file"))
@@ -654,7 +659,7 @@ IDENTITY is optionally the default-user-id to use."
   "Add tag to sign the message.
 
 A proper multipart message is created for you when you send the
-message. Use the \\[mh-mml-unsecure-message] command to remove
+message. Use the command \\[mh-mml-unsecure-message] to remove
 this tag. Use a prefix argument METHOD to be prompted for one of
 the possible security methods (see `mh-mml-method-default')."
   (interactive (list (mh-mml-query-cryptographic-method)))
@@ -665,7 +670,7 @@ the possible security methods (see `mh-mml-method-default')."
   "Add tag to encrypt the message.
 
 A proper multipart message is created for you when you send the
-message. Use the \\[mh-mml-unsecure-message] command to remove
+message. Use the command \\[mh-mml-unsecure-message] to remove
 this tag. Use a prefix argument METHOD to be prompted for one of
 the possible security methods (see `mh-mml-method-default')."
   (interactive (list (mh-mml-query-cryptographic-method)))
@@ -676,7 +681,7 @@ the possible security methods (see `mh-mml-method-default')."
   "Add tag to encrypt and sign the message.
 
 A proper multipart message is created for you when you send the
-message. Use the \\[mh-mml-unsecure-message] command to remove
+message. Use the command \\[mh-mml-unsecure-message] to remove
 this tag. Use a prefix argument METHOD to be prompted for one of
 the possible security methods (see `mh-mml-method-default')."
   (interactive (list (mh-mml-query-cryptographic-method)))
diff --git a/lisp/mh-e/mh-pick.el b/lisp/mh-e/mh-pick.el
index 03314ffa6c6..8089d3e8ae7 100644
--- a/lisp/mh-e/mh-pick.el
+++ b/lisp/mh-e/mh-pick.el
@@ -1,7 +1,7 @@
 ;;; mh-pick.el --- make a search pattern and search for a message in MH-E
 
 ;; Copyright (C) 1993, 1995,
-;;  2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -54,13 +54,14 @@
 (defun mh-search-folder (folder window-config)
   "Search FOLDER for messages matching a pattern.
 
-With this command, you can search a folder for messages to or from a
-particular person or about a particular subject. In fact, you can also
-search for messages containing selected strings in any arbitrary
-header field or any string found within the messages.
+With this command, you can search a folder for messages to or
+from a particular person or about a particular subject. In fact,
+you can also search for messages containing selected strings in
+any arbitrary header field or any string found within the
+messages.
 
-You are first prompted for the name of the folder to search and then
-placed in the following buffer in MH-Pick mode:
+You are first prompted for the name of the folder to search and
+then placed in the following buffer in MH-Pick mode:
 
      From:
      To:
@@ -69,26 +70,27 @@ placed in the following buffer in MH-Pick mode:
      Subject:
      --------
 
-Edit this template by entering your search criteria in an appropriate
-header field that is already there, or create a new field yourself. If
-the string you're looking for could be anywhere in a message, then
-place the string underneath the row of dashes. The
-\\[mh-search-folder] command uses the MH command \"pick\" to do the
-real work.
-
-There are no semantics associated with the search criteria--they are
-simply treated as strings. Case is ignored when all lowercase is used,
-and regular expressions (a la \"ed\") are available. It is all right
-to specify several search criteria. What happens then is that a
-logical _and_ of the various fields is performed. If you prefer a
-logical _or_ operation, run \\[mh-search-folder] multiple times.
-
-As an example, let's say that we want to find messages from Ginnean
-about horseback riding in the Kosciusko National Park (Australia)
-during January, 1994. Normally we would start with a broad search and
-narrow it down if necessary to produce a manageable amount of data,
-but we'll cut to the chase and create a fairly restrictive set of
-criteria as follows:
+Edit this template by entering your search criteria in an
+appropriate header field that is already there, or create a new
+field yourself. If the string you're looking for could be
+anywhere in a message, then place the string underneath the row
+of dashes. The command \\[mh-search-folder] uses the MH command
+\"pick\" to do the real work.
+
+There are no semantics associated with the search criteria--they
+are simply treated as strings. Case is ignored when all lowercase
+is used, and regular expressions (a la \"ed\") are available. It
+is all right to specify several search criteria. What happens
+then is that a logical _and_ of the various fields is performed.
+If you prefer a logical _or_ operation, run \\[mh-search-folder]
+multiple times.
+
+As an example, let's say that we want to find messages from
+Ginnean about horseback riding in the Kosciusko National
+Park (Australia) during January, 1994. Normally we would start
+with a broad search and narrow it down if necessary to produce a
+manageable amount of data, but we'll cut to the chase and create
+a fairly restrictive set of criteria as follows:
 
      From: ginnean
      To:
@@ -98,31 +100,32 @@ criteria as follows:
      --------
 
 As with MH-Letter mode, MH-Pick provides commands like
-\\<mh-pick-mode-map>\\[mh-to-field] to help you fill in the blanks.
+\\<mh-pick-mode-map>\\[mh-to-field] to help you fill in the
+blanks.
 
-To perform the search, type \\[mh-do-search]. The selected messages
-are placed in the \"search\" sequence, which you can use later in
-forwarding, printing, or narrowing your field of view. Subsequent
-searches are appended to the \"search\" sequence. If, however, you
-wish to start with a clean slate, first delete the \"search\"
-sequence.
+To perform the search, type \\[mh-do-search]. The selected
+messages are placed in the \"search\" sequence, which you can use
+later in forwarding, printing, or narrowing your field of view.
+Subsequent searches are appended to the \"search\" sequence. If,
+however, you wish to start with a clean slate, first delete the
+\"search\" sequence.
 
 If you're searching in a folder that is already displayed in an
-MH-Folder buffer, only those messages contained in the buffer are used
-for the search. Therefore, if you want to search in all messages,
-first kill the folder's buffer with
-\\<mh-folder-mode-map>\\[kill-buffer] or scan the entire folder with
-\\[mh-rescan-folder].
-
-If you find that you do the same thing over and over when editing the
-search template, you may wish to bind some shortcuts to keys. This can
-be done with the variable `mh-pick-mode-hook', which is called when
-\\[mh-search-folder] is run on a new pattern.
-
-If you have run the \\[mh-index-search] command, but change your mind
-while entering the search criteria and actually want to run a regular
-search, then you can use the \\<mh-pick-mode-map>\\[mh-pick-do-search]
-command.
+MH-Folder buffer, only those messages contained in the buffer are
+used for the search. Therefore, if you want to search in all
+messages, first kill the folder's buffer with
+\\<mh-folder-mode-map>\\[kill-buffer] or scan the entire folder
+with \\[mh-rescan-folder].
+
+If you find that you do the same thing over and over when editing
+the search template, you may wish to bind some shortcuts to keys.
+This can be done with the variable `mh-pick-mode-hook', which is
+called when \\[mh-search-folder] is run on a new pattern.
+
+If you have run the \\[mh-index-search] command, but change your
+mind while entering the search criteria and actually want to run
+a regular search, then you can use the command
+\\<mh-pick-mode-map>\\[mh-pick-do-search] in the MH-Pick buffer.
 
 In a program, argument WINDOW-CONFIG is the current window
 configuration and is used when the search folder is dismissed."
diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el
index 6fb70e61de8..dffb831ad2b 100644
--- a/lisp/mh-e/mh-seq.el
+++ b/lisp/mh-e/mh-seq.el
@@ -1,7 +1,7 @@
 ;;; mh-seq.el --- MH-E sequences support
 
 ;; Copyright (C) 1993, 1995,
-;;  2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -177,6 +177,7 @@ you want to delete the messages, use \"\\[universal-argument]
 ;;;###mh-autoload
 (defun mh-list-sequences ()
   "List all sequences in folder.
+
 The list appears in a buffer named \"*MH-E Sequences*\"."
   (interactive)
   (let ((folder mh-current-folder)
@@ -219,6 +220,7 @@ The list appears in a buffer named \"*MH-E Sequences*\"."
 ;;;###mh-autoload
 (defun mh-msg-is-in-seq (message)
   "Display the sequences in which the current message appears.
+
 Use a prefix argument to display the sequences in which another
 MESSAGE appears."
   (interactive "P")
@@ -329,8 +331,10 @@ OP is one of 'widen and 'unthread."
 ;;;###mh-autoload
 (defun mh-widen (&optional all-flag)
   "Remove last restriction.
-If optional prefix argument ALL-FLAG is non-nil, remove all
-limits."
+
+Each limit or sequence restriction can be undone in turn with
+this command. Give this command a prefix argument ALL-FLAG to
+remove all limits and sequence restrictions."
   (interactive "P")
   (let ((msg (mh-get-msg-num nil)))
     (when mh-folder-view-stack
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index e008c93916e..0bfadfbe238 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -1,7 +1,7 @@
 ;;; mh-utils.el --- MH-E code needed for both sending and reading
 
 ;; Copyright (C) 1993, 1995, 1997,
-;;  2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -1647,6 +1647,14 @@ scrolls to the beginning of the message. MH-E normally hides a lot of
 the superfluous header fields that mailers add to a message, but if
 you wish to see all of them, use the command \\[mh-header-display].
 
+Two hooks can be used to control how messages are displayed. The
+first hook, `mh-show-mode-hook', is called early on in the
+process of the message display. It is usually used to perform
+some action on the message's content. The second hook,
+`mh-show-hook', is the last thing called after messages are
+displayed. It's used to affect the behavior of MH-E in general or
+when `mh-show-mode-hook' is too early.
+
 From a program, optional argument MESSAGE can be used to display an
 alternative message. The optional argument REDISPLAY-FLAG forces the
 redisplay of the message even if the show buffer was already
@@ -1728,7 +1736,7 @@ this with this command. It displays the raw message in an
 editable buffer. When you are done editing, save and kill the
 buffer as you would any other.
 
-From a program, edit MESSAGE instead if it is non-nil."
+From a program, edit MESSAGE; nil means edit current message."
   (interactive)
   (let* ((message (or message (mh-get-msg-num t)))
          (msg-filename (mh-msg-filename message))