2 files changed, 9 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5eb5545a6da..89bf21ebb89 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-18  Juanma Barranquero  <lektu@terra.es>
+
+        * emacs-lisp/byte-run.el (make-obsolete-variable): Fix docstring.
+
 2004-03-17  Nick Roberts  <nick@nick.uklinux.net>
 
         * gdb-ui.el (gdb-var-list-children-handler): Handle C++ classes
@@ -5,8 +9,8 @@
 
 2004-03-17  Masatake YAMATO  <jet@gyve.org>
 
-        * smerge-mode.el (smerge-popup-context-menu): Put 
-        `unwind-protect' arround `overlay-put' and `popup-menu'. 
+        * smerge-mode.el (smerge-popup-context-menu): Put
+        `unwind-protect' around `overlay-put' and `popup-menu'.
 
 2004-03-16  Masatake YAMATO  <jet@gyve.org>
 
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 15377c033d9..a7385fe5fd0 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -91,9 +91,9 @@ was first made obsolete, for example a date or a release number."
   fn)
 
 (defun make-obsolete-variable (var new &optional when)
-  "Make the byte-compiler warn that VARIABLE is obsolete,
-and NEW should be used instead.  If NEW is a string, then that is the
-`use instead' message.
+  "Make the byte-compiler warn that VARIABLE is obsolete.
+The warning will say that NEW should be used instead.
+If NEW is a string, that is the `use instead' message.
 If provided, WHEN should be a string indicating when the variable
 was first made obsolete, for example a date or a release number."
   (interactive