2 files changed, 13 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0054a7d08ca..d76b474164e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-18  Juanma Barranquero  <lekktu@gmail.com>
+
+        * textmodes/fill.el (fill-individual-paragraphs): Doc fix.
+        (adaptive-fill-function): Doc fix.  Remove * from docstring.
+
 2007-10-18  Glenn Morris  <rgm@gnu.org>
 
         * ibuf-ext.el (ibuffer-saved-filter-groups): Doc fix.
@@ -11,8 +16,8 @@
 
         * longlines.el (longlines-wrap-follows-window-size): Integer value
         specifies wrapping margin.
-        (longlines-mode, longlines-window-change-function): Set
-        window-specific wrapping margin based on the above.
+        (longlines-mode, longlines-window-change-function):
+        Set window-specific wrapping margin based on the above.
 
 2007-10-17  John Wiegley  <johnw@newartisans.com>
 
@@ -20,8 +25,8 @@
 
 2007-10-17  Glenn Morris  <rgm@gnu.org>
 
-        * progmodes/cc-menus.el (cc-imenu-c++-generic-expression): Tweak
-        regexp to avoid stack overflow.
+        * progmodes/cc-menus.el (cc-imenu-c++-generic-expression):
+        Tweak regexp to avoid stack overflow.
 
 2007-10-16  Juanma Barranquero  <lekktu@gmail.com>
 
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 88a4286aad2..36167f599f4 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -117,8 +117,8 @@ if it would act as a paragraph-starter on the second line."
   :group 'fill)
 
 (defcustom adaptive-fill-function nil
-  "*Function to call to choose a fill prefix for a paragraph, or nil.
-nil means the function has not determined the fill prefix."
+  "Function to call to choose a fill prefix for a paragraph, or nil.
+A nil value means the function has not determined the fill prefix."
   :type '(choice (const nil) function)
   :group 'fill)
 
@@ -1350,8 +1350,8 @@ These lines are filled together.
 When calling from a program, pass the range to fill
 as the first two arguments.
 
-Optional third and fourth arguments JUSTIFY and MAIL-FLAG:
-JUSTIFY to justify paragraphs (prefix arg),
+Optional third and fourth arguments JUSTIFY and CITATION-REGEXP:
+JUSTIFY to justify paragraphs (prefix arg).
 When filling a mail message, pass a regexp for CITATION-REGEXP
 which will match the prefix of a line which is a citation marker
 plus whitespace, but no other kind of prefix.