Merged from miles@gnu.org--gnu-2005 (patch 169-173, 671-676)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-671
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-672
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-673
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-674
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-675
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-676
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-169
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-170
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-171
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-172
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-173
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-454

1 files changed, 1 insertions, 1 deletions

diff --git a/src/floatfns.c b/src/floatfns.c
index 79574e0a69b..71f53542283 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -508,7 +508,7 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0,
 
 DEFUN ("log", Flog, Slog, 1, 2, 0,
        doc: /* Return the natural logarithm of ARG.
-If second optional argument BASE is given, return log ARG using that base.  */)
+If the optional argument BASE is given, return log ARG using that base.  */)
      (arg, base)
      register Lisp_Object arg, base;
 {