# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1128036528 0
# Node ID 83ce839858fb73e18ee161cd3b1bca13d9d3f64a
# Parent  a3d17fae5bf3ece271b0fc8400960bf55bab9938
(Fmessage, Fmessage_box, Fmessage_or_box):
Rename argument name `string' to `format-string'.
(Fformat): Doc fix.

diff -r a3d17fae5bf3 -r 83ce839858fb src/editfns.c
--- a/src/editfns.c	Thu Sep 29 23:14:57 2005 +0000
+++ b/src/editfns.c	Thu Sep 29 23:28:48 2005 +0000
@@ -3124,7 +3124,7 @@
 any existing message; this lets the minibuffer contents show.  See
 also `current-message'.
 
-usage: (message STRING &rest ARGS)  */)
+usage: (message FORMAT-STRING &rest ARGS)  */)
      (nargs, args)
      int nargs;
      Lisp_Object *args;
@@ -3154,7 +3154,7 @@
 If the first argument is nil or the empty string, clear any existing
 message; let the minibuffer contents show.
 
-usage: (message-box STRING &rest ARGS)  */)
+usage: (message-box FORMAT-STRING &rest ARGS)  */)
      (nargs, args)
      int nargs;
      Lisp_Object *args;
@@ -3216,7 +3216,7 @@
 If the first argument is nil or the empty string, clear any existing
 message; let the minibuffer contents show.
 
-usage: (message-or-box STRING &rest ARGS)  */)
+usage: (message-or-box FORMAT-STRING &rest ARGS)  */)
      (nargs, args)
      int nargs;
      Lisp_Object *args;
@@ -3281,8 +3281,8 @@
    : SBYTES (STRING))
 
 DEFUN ("format", Fformat, Sformat, 1, MANY, 0,
-       doc: /* Format a string out of a control-string and arguments.
-The first argument is a control string.
+       doc: /* Format a string out of a format-string and arguments.
+The first argument is a format control string.
 The other arguments are substituted into it to make the result, a string.
 It may contain %-sequences meaning to substitute the next argument.
 %s means print a string argument.  Actually, prints any object, with `princ'.