message.texi (Header Commands): Replace `iff'.

gnus-registry.el (gnus-registry-install-p): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 652b0c5..73e1411 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-04  Glenn Morris  <rgm@gnu.org>
+
+       * gnus-registry.el (gnus-registry-install-p): Doc fix.
+
 2014-05-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-mime-inline-part): Redisplay a button so as to show

diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index 5989b88..f3b81f7 100644 (file)
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -1125,9 +1125,9 @@ only the last one's marks are returned."
 (add-hook 'gnus-registry-unload-hook 'gnus-registry-unload-hook)
 
 (defun gnus-registry-install-p ()
-  "If the registry is not already enabled, and `gnus-registry-install' is t,
-the registry is enabled.  If `gnus-registry-install' is `ask',
-the user is asked first.  Returns non-nil iff the registry is enabled."
+  "Return non-nil if the registry is enabled (and maybe enable it first).
+If the registry is not already enabled, then if `gnus-registry-install'
+is `ask', ask the user; or if `gnus-registry-install' is non-nil, enable it."
   (interactive)
   (unless gnus-registry-enabled
     (when (if (eq gnus-registry-install 'ask)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 7a7b6cc..3748f72 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-04  Glenn Morris  <rgm@gnu.org>
+
+       * message.texi (Header Commands): Replace `iff'.
+
 2014-03-14  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus.texi (Ma Gnus): Mention header attachment buttons.

diff --git a/texi/message.texi b/texi/message.texi
index 6f34fb4..e49d137 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -748,9 +748,8 @@ by the @code{message-cross-post-note-function} variable.
 @item C-c C-f t
 @kindex C-c C-f t
 @findex message-reduce-to-to-cc
-Replace contents of @samp{To} header with contents of @samp{Cc} or
-@samp{Bcc} header.  (Iff @samp{Cc} header is not present, @samp{Bcc}
-header will be used instead.)
+Replace contents of @samp{To} header with contents of @samp{Cc}
+header (or the @samp{Bcc} header, if there is no @samp{Cc} header).
 
 @item C-c C-f w
 @kindex C-c C-f w