X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=man%2Flispref%2Fhelp.texi;h=ec22d862e60879ae72d538dabdaa252e57bbc097;hb=24d4afa4bb7493067db72152499a4fd54b8169b7;hp=9ab82945cc6975aa527a51564f8b2db157451a00;hpb=98a6e4055a1fa624c592ac06f79287d55196ca37;p=chise%2Fxemacs-chise.git-

diff --git a/man/lispref/help.texi b/man/lispref/help.texi
index 9ab8294..ec22d86 100644
--- a/man/lispref/help.texi
+++ b/man/lispref/help.texi
@@ -94,7 +94,7 @@ information to read the documentation from the appropriate file; this is
 transparent to the user.
 
   For information on the uses of documentation strings, see @ref{Help, ,
-Help, emacs, The XEmacs Reference Manual}.
+Help, xemacs, The XEmacs Reference Manual}.
 
 @c Wordy to prevent overfull hbox.  --rjc 15mar92
   The @file{emacs/lib-src} directory contains two utilities that you can
@@ -417,8 +417,8 @@ appears as the name of the symbol in the @sc{car} of the list.
      @result{} "C-x SPC M-y SPC LFD SPC TAB SPC RET SPC C-l 1 2 3"
 @end group
 @group
-(single-key-description 'kp_next)
-     @result{} "kp_next"
+(single-key-description 'kp-next)
+     @result{} "kp-next"
 @end group
 @group
 (single-key-description '(shift button1))
@@ -456,7 +456,7 @@ XEmacs buffers are usually displayed).
   XEmacs provides a variety of on-line help functions, all accessible to
 the user as subcommands of the prefix @kbd{C-h}, or on some keyboards,
 @kbd{help}.  For more information about them, see @ref{Help, , Help,
-emacs, The XEmacs Reference Manual}.  Here we describe some
+emacs, The XEmacs Lisp Reference Manual}.  Here we describe some
 program-level interfaces to the same information.
 
 @deffn Command apropos regexp &optional do-all predicate
@@ -676,7 +676,7 @@ users of that function should be told to use the newer one instead.
 XEmacs Lisp lets you mark a function or variable as @dfn{obsolete},
 and indicate what should be used instead.
 
-@deffn Command make-obsolete function new
+@deffn Command make-obsolete function new &optional when
 This function indicates that @var{function} is an obsolete function,
 and the function @var{new} should be used instead.  The byte compiler
 will issue a warning to this effect when it encounters a usage of the
@@ -684,7 +684,9 @@ older function, and the help system will also note this in the function's
 documentation.  @var{new} can also be a string (if there is not a single
 function with the same functionality any more), and should be a descriptive
 statement, such as "use @var{foo} or @var{bar} instead" or "this function is
-unnecessary".
+unnecessary".  If provided, @var{when} should be a string indicating when
+the function was first made obsolete, for example a date or a release
+number.
 @end deffn
 
 @deffn Command make-obsolete-variable variable new