Mercurial > octave-nkf

changeset 11547:e1851653d59c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Eliminate @deffn macros. For consistency and easier maintenance, only use @deftypefn macro.
author Rik <octave@nomad.inbox5.com>
date Sat, 15 Jan 2011 10:04:30 -0800
parents 1b7bb90e670a
children 50a7935f2512
files doc/ChangeLog doc/interpreter/func.txi doc/interpreter/intro.txi scripts/ChangeLog scripts/help/doc.m scripts/help/which.m scripts/miscellaneous/comma.m scripts/miscellaneous/ls.m scripts/miscellaneous/paren.m scripts/miscellaneous/semicolon.m scripts/pkg/pkg.m src/ChangeLog src/dirfns.cc src/help.cc src/input.cc src/load-save.cc src/oct-hist.cc src/pager.cc src/pr-output.cc src/variables.cc
diffstat 20 files changed, 140 insertions(+), 122 deletions(-) [+]
line wrap: on
line diff
--- a/doc/ChangeLog	Sat Jan 15 12:02:41 2011 -0500
+++ b/doc/ChangeLog	Sat Jan 15 10:04:30 2011 -0800
@@ -1,3 +1,8 @@
+2011-01-15  Rik  <octave@nomad.inbox5.com>
+
+	* doc/interpreter/func.txi, doc/interpreter/intro.txi: Eliminate
+	@deffn macros.
+
 2011-01-15  Rik  <octave@nomad.inbox5.com>
 
 	* interpreter/doccheck/mk_undocumented_list: Update list of exceptions
--- a/doc/interpreter/func.txi	Sat Jan 15 12:02:41 2011 -0500
+++ b/doc/interpreter/func.txi	Sat Jan 15 10:04:30 2011 -0800
@@ -540,12 +540,12 @@
 without adding extra logic to avoid printing the message if the vector
 does contain a nonzero element.
 
-@deffn {Keyword} return
+@deftypefn {Keyword} {} return
 When Octave encounters the keyword @code{return} inside a function or
 script, it returns control to the caller immediately.  At the top level,
 the return statement is ignored.  A @code{return} statement is assumed
 at the end of every function definition.
-@end deffn
+@end deftypefn
 
 @node Default Arguments
 @section Default Arguments
--- a/doc/interpreter/intro.txi	Sat Jan 15 12:02:41 2011 -0500
+++ b/doc/interpreter/intro.txi	Sat Jan 15 10:04:30 2011 -0800
@@ -633,13 +633,13 @@
 parentheses.  For example, here is the description for Octave's
 @code{cd} command:
 
-@deffn {Command} cd dir
-@deffnx {Command} chdir dir
+@deftypefn {Command} {} cd dir
+@deftypefnx {Command} {} chdir dir
 Change the current working directory to @var{dir}.  For example,
 @kbd{cd ~/octave} changes the current working directory to
 @file{~/octave}.  If the directory does not exist, an error message is
 printed and the working directory is not changed.
-@end deffn
+@end deftypefn
 
 @node A Sample Variable Description
 @subsubsection A Sample Variable Description
--- a/scripts/ChangeLog	Sat Jan 15 12:02:41 2011 -0500
+++ b/scripts/ChangeLog	Sat Jan 15 10:04:30 2011 -0800
@@ -1,3 +1,10 @@
+2011-01-15  Rik  <octave@nomad.inbox5.com>
+
+	* scripts/help/doc.m, scripts/help/which.m, 
+	scripts/miscellaneous/comma.m, scripts/miscellaneous/ls.m,
+	scripts/miscellaneous/paren.m, scripts/miscellaneous/semicolon.m,
+	scripts/pkg/pkg.m: Eliminate @deffn macros.
+
 2011-01-15  John W. Eaton  <jwe@octave.org>
 
 	* deprecated/krylovb: Move here from linear-algebra.
--- a/scripts/help/doc.m	Sat Jan 15 12:02:41 2011 -0500
+++ b/scripts/help/doc.m	Sat Jan 15 10:04:30 2011 -0800
@@ -17,7 +17,7 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deffn {Command} doc @var{function_name}
+## @deftypefn {Command} {} doc @var{function_name}
 ## Display documentation for the function @var{function_name}
 ## directly from an on-line version of
 ## the printed manual, using the GNU Info browser.  If invoked without
@@ -29,7 +29,7 @@
 ## Once the GNU Info browser is running, help for using it is available
 ## using the command @kbd{C-h}.
 ## @seealso{help}
-## @end deffn
+## @end deftypefn
 
 ## Author: Soren Hauberg <soren@hauberg.org>
 ## Adapted-by: jwe
--- a/scripts/help/which.m	Sat Jan 15 12:02:41 2011 -0500
+++ b/scripts/help/which.m	Sat Jan 15 10:04:30 2011 -0800
@@ -17,11 +17,11 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deffn {Command} which name @dots{}
+## @deftypefn {Command} {} which name @dots{}
 ## Display the type of each @var{name}.  If @var{name} is defined from a
 ## function file, the full name of the file is also displayed.
 ## @seealso{help, lookfor}
-## @end deffn
+## @end deftypefn
 
 function varargout = which (varargin)
 
--- a/scripts/miscellaneous/comma.m	Sat Jan 15 12:02:41 2011 -0500
+++ b/scripts/miscellaneous/comma.m	Sat Jan 15 10:04:30 2011 -0800
@@ -17,7 +17,7 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deffn {Operator} ,
+## @deftypefn {Operator} {} ,
 ## Array index, function argument, or command separator.
 ## @seealso{semicolon}
-## @end deffn
+## @end deftypefn
--- a/scripts/miscellaneous/ls.m	Sat Jan 15 12:02:41 2011 -0500
+++ b/scripts/miscellaneous/ls.m	Sat Jan 15 10:04:30 2011 -0800
@@ -17,7 +17,7 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deffn {Command} ls options
+## @deftypefn {Command} {} ls options
 ## List directory contents.  For example:
 ## 
 ## @example
@@ -33,7 +33,7 @@
 ## system's directory listing command, so the available options may vary
 ## from system to system.
 ## @seealso{dir, stat, readdir, glob, filesep, ls_command}
-## @end deffn
+## @end deftypefn
 
 ## Author: jwe
 
--- a/scripts/miscellaneous/paren.m	Sat Jan 15 12:02:41 2011 -0500
+++ b/scripts/miscellaneous/paren.m	Sat Jan 15 10:04:30 2011 -0800
@@ -17,7 +17,7 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deffn  {Operator} (
-## @deffnx {Operator} )
+## @deftypefn  {Operator} {} (
+## @deftypefnx {Operator} {} )
 ## Array index or function argument delimeter.
-## @end deffn
+## @end deftypefn
--- a/scripts/miscellaneous/semicolon.m	Sat Jan 15 12:02:41 2011 -0500
+++ b/scripts/miscellaneous/semicolon.m	Sat Jan 15 10:04:30 2011 -0800
@@ -17,7 +17,7 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deffn {Operator} ;
+## @deftypefn {Operator} {} ;
 ## Array row or command separator.
 ## @seealso{comma}
-## @end deffn
+## @end deftypefn
--- a/scripts/pkg/pkg.m	Sat Jan 15 12:02:41 2011 -0500
+++ b/scripts/pkg/pkg.m	Sat Jan 15 10:04:30 2011 -0800
@@ -18,8 +18,8 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deffn  {Command} pkg @var{command} @var{pkg_name}
-## @deffnx {Command} pkg @var{command} @var{option} @var{pkg_name}
+## @deftypefn  {Command} {} pkg @var{command} @var{pkg_name}
+## @deftypefnx {Command} {} pkg @var{command} @var{option} @var{pkg_name}
 ## This command interacts with the package manager.  Different actions will
 ## be taken depending on the value of @var{command}.
 ##
@@ -231,7 +231,7 @@
 ## The options @option{-verbose} and @option{-nodeps} are respected, while 
 ## the other options are ignored.
 ## @end table
-## @end deffn
+## @end deftypefn
 
 function [local_packages, global_packages] = pkg (varargin)
   ## Installation prefix (FIXME: what should these be on windows?)
--- a/src/ChangeLog	Sat Jan 15 12:02:41 2011 -0500
+++ b/src/ChangeLog	Sat Jan 15 10:04:30 2011 -0800
@@ -1,3 +1,9 @@
+2011-01-15  Rik  <octave@nomad.inbox5.com>
+
+	* src/dirfns.cc, src/help.cc, src/input.cc, src/load-save.cc,
+	src/oct-hist.cc, src/pager.cc, src/pr-output.cc, src/variables.cc:
+	Eliminate @deffn macros.
+
 2011-01-15  John W. Eaton  <jwe@octave.org>
 
 	* syscalls.cc (FWEXITSTATUS, FWIFEXITED): Missing semicolon.
--- a/src/dirfns.cc	Sat Jan 15 12:02:41 2011 -0500
+++ b/src/dirfns.cc	Sat Jan 15 10:04:30 2011 -0800
@@ -89,8 +89,8 @@
 
 DEFUN (cd, args, ,
   "-*- texinfo -*-\n\
-@deffn {Command} cd dir\n\
-@deffnx {Command} chdir dir\n\
+@deftypefn {Command} {} cd dir\n\
+@deftypefnx {Command} {} chdir dir\n\
 Change the current working directory to @var{dir}.  If @var{dir} is\n\
 omitted, the current directory is changed to the user's home\n\
 directory.  For example,\n\
@@ -104,7 +104,7 @@
 directory does not exist, an error message is printed and the working\n\
 directory is not changed.\n\
 @seealso{mkdir, rmdir, dir}\n\
-@end deffn")
+@end deftypefn")
 {
   octave_value_list retval;
 
--- a/src/help.cc	Sat Jan 15 12:02:41 2011 -0500
+++ b/src/help.cc	Sat Jan 15 10:04:30 2011 -0800
@@ -232,116 +232,116 @@
 {
   pair_type ("break",
     "-*- texinfo -*-\n\
-@deffn Keyword break\n\
+@deftypefn {Keyword} {} break\n\
 Exit the innermost enclosing do, while or for loop.\n\
 @seealso{do, while, for, continue}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("case",
     "-*- texinfo -*-\n\
-@deffn Keyword case @{@var{value}@}\n\
+@deftypefn {Keyword} {} case @{@var{value}@}\n\
 A case statement in an switch.  Octave cases are exclusive and do not\n\
 fall-through as do C-language cases.  A switch statement must have at least\n\
 one case.  See @code{switch} for an example.\n\
 @seealso{switch}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("catch",
     "-*- texinfo -*-\n\
-@deffn Keyword catch\n\
+@deftypefn {Keyword} {} catch\n\
 Begin the cleanup part of a try-catch block.\n\
 @seealso{try}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("continue",
     "-*- texinfo -*-\n\
-@deffn Keyword continue\n\
+@deftypefn {Keyword} {} continue\n\
 Jump to the end of the innermost enclosing do, while or for loop.\n\
 @seealso{do, while, for, break}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("do",
     "-*- texinfo -*-\n\
-@deffn Keyword do\n\
+@deftypefn {Keyword} {} do\n\
 Begin a do-until loop.  This differs from a do-while loop in that the\n\
 body of the loop is executed at least once.\n\
 @seealso{while}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("else",
     "-*- texinfo -*-\n\
-@deffn Keyword else\n\
+@deftypefn {Keyword} {} else\n\
 Alternate action for an if block.  See @code{if} for an example.\n\
 @seealso{if}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("elseif",
     "-*- texinfo -*-\n\
-@deffn Keyword elseif (@var{condition})\n\
+@deftypefn {Keyword} {} elseif (@var{condition})\n\
 Alternate conditional test for an if block.  See @code{if} for an example.\n\
 @seealso{if}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("end",
     "-*- texinfo -*-\n\
-@deffn Keyword end\n\
+@deftypefn {Keyword} {} end\n\
 Mark the end of any @code{for}, @code{if}, @code{do}, @code{while}, or\n\
 @code{function} block.\n\
 @seealso{for, if, do, while, function}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("end_try_catch",
     "-*- texinfo -*-\n\
-@deffn Keyword end_try_catch\n\
+@deftypefn {Keyword} {} end_try_catch\n\
 Mark the end of an @code{try-catch} block.\n\
 @seealso{try, catch}\n\
-@end deffn"), 
+@end deftypefn"), 
 
   pair_type ("end_unwind_protect",
     "-*- texinfo -*-\n\
-@deffn Keyword end_unwind_protect\n\
+@deftypefn {Keyword} {} end_unwind_protect\n\
 Mark the end of an unwind_protect block.\n\
 @seealso{unwind_protect}\n\
-@end deffn"), 
+@end deftypefn"), 
 
   pair_type ("endfor",
     "-*- texinfo -*-\n\
-@deffn Keyword endfor\n\
+@deftypefn {Keyword} {} endfor\n\
 Mark the end of a for loop.  See @code{for} for an example.\n\
 @seealso{for}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("endfunction",
     "-*- texinfo -*-\n\
-@deffn Keyword endfunction\n\
+@deftypefn {Keyword} {} endfunction\n\
 Mark the end of a function.\n\
 @seealso{function}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("endif",
     "-*- texinfo -*-\n\
-@deffn Keyword endif\n\
+@deftypefn {Keyword} {} endif\n\
 Mark the end of an if block.  See @code{if} for an example.\n\
 @seealso{if}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("endswitch",
     "-*- texinfo -*-\n\
-@deffn Keyword endswitch\n\
+@deftypefn {Keyword} {} endswitch\n\
 Mark the end of a switch block.  See @code{switch} for an example.\n\
 @seealso{switch}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("endwhile",
     "-*- texinfo -*-\n\
-@deffn Keyword endwhile\n\
+@deftypefn {Keyword} {} endwhile\n\
 Mark the end of a while loop.  See @code{while} for an example.\n\
 @seealso{do, while}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("for",
     "-*- texinfo -*-\n\
-@deffn Keyword for @var{i} = @var{range}\n\
+@deftypefn {Keyword} {} for @var{i} = @var{range}\n\
 Begin a for loop.\n\
 \n\
 @example\n\
@@ -352,21 +352,21 @@
 @end group\n\
 @end example\n\
 @seealso{do, while}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("function",
     "-*- texinfo -*-\n\
-@deffn Keyword function @var{outputs} = function (@var{input}, @dots{})\n\
-@deffnx Keyword function {} function (@var{input}, @dots{})\n\
-@deffnx Keyword function @var{outputs} = function\n\
+@deftypefn {Keyword} {} function @var{outputs} = function (@var{input}, @dots{})\n\
+@deftypefnx {Keyword} {} function {} function (@var{input}, @dots{})\n\
+@deftypefnx {Keyword} {} function @var{outputs} = function\n\
 Begin a function body with @var{outputs} as results and @var{inputs} as\n\
 parameters.\n\
 @seealso{return}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("global",
     "-*- texinfo -*-\n\
-@deffn Keyword global\n\
+@deftypefn {Keyword} {} global\n\
 Declare variables to have global scope.\n\
 \n\
 @example\n\
@@ -378,14 +378,14 @@
 @end group\n\
 @end example\n\
 @seealso{persistent}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("if",
     "-*- texinfo -*-\n\
-@deffn Keyword if (@var{cond}) @dots{} endif\n\
-@deffnx Keyword if (@var{cond}) @dots{} else @dots{} endif\n\
-@deffnx Keyword if (@var{cond}) @dots{} elseif (@var{cond}) @dots{} endif\n\
-@deffnx Keyword if (@var{cond}) @dots{} elseif (@var{cond}) @dots{} else @dots{} endif\n\
+@deftypefn {Keyword} {} if (@var{cond}) @dots{} endif\n\
+@deftypefnx {Keyword} {} if (@var{cond}) @dots{} else @dots{} endif\n\
+@deftypefnx {Keyword} {} if (@var{cond}) @dots{} elseif (@var{cond}) @dots{} endif\n\
+@deftypefnx {Keyword} {} if (@var{cond}) @dots{} elseif (@var{cond}) @dots{} else @dots{} endif\n\
 Begin an if block.\n\
 \n\
 @example\n\
@@ -401,50 +401,50 @@
 @end group\n\
 @end example\n\
 @seealso{switch}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("otherwise",
     "-*- texinfo -*-\n\
-@deffn Keyword otherwise\n\
+@deftypefn {Keyword} {} otherwise\n\
 The default statement in a switch block (similar to else in an if block).\n\
 @seealso{switch}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("persistent",
     "-*- texinfo -*-\n\
-@deffn Keyword persistent @var{var}\n\
+@deftypefn {Keyword} {} persistent @var{var}\n\
 Declare variables as persistent.  A variable that has been declared\n\
 persistent within a function will retain its contents in memory between\n\
 subsequent calls to the same function.  The difference between persistent\n\
 variables and global variables is that persistent variables are local in \n\
 scope to a particular function and are not visible elsewhere.\n\
 @seealso{global}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("replot",
     "-*- texinfo -*-\n\
-@deffn Keyword replot\n\
+@deftypefn {Keyword} {} replot\n\
 Replot a graphic.\n\
 @seealso{plot}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("return",
     "-*- texinfo -*-\n\
-@deffn Keyword return\n\
+@deftypefn {Keyword} {} return\n\
 Return from a function.\n\
 @seealso{function}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("static",
     "-*- texinfo -*-\n\
-@deffn Keyword static\n\
+@deftypefn {Keyword} {} static\n\
 This function has been deprecated in favor of persistent.\n\
 @seealso{persistent}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("switch",
     "-*- texinfo -*-\n\
-@deffn Keyword switch @var{statement}\n\
+@deftypefn {Keyword} {} switch @var{statement}\n\
 Begin a switch block.\n\
 \n\
 @example\n\
@@ -462,11 +462,11 @@
 @end group\n\
 @end example\n\
 @seealso{if, case, otherwise}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("try",
     "-*- texinfo -*-\n\
-@deffn Keyword try\n\
+@deftypefn {Keyword} {} try\n\
 Begin a try-catch block.\n\
 \n\
 If an error occurs within a try block, then the catch code will be run and\n\
@@ -474,18 +474,18 @@
 recommended to use the lasterr function to re-throw the error after cleanup\n\
 is completed).\n\
 @seealso{catch,unwind_protect}\n\
-@end deffn"), 
+@end deftypefn"), 
 
   pair_type ("until",
     "-*- texinfo -*-\n\
-@deffn Keyword until\n\
+@deftypefn {Keyword} {} until\n\
 End a do-until loop.\n\
 @seealso{do}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("unwind_protect",
     "-*- texinfo -*-\n\
-@deffn Keyword unwind_protect\n\
+@deftypefn {Keyword} {} unwind_protect\n\
 Begin an unwind_protect block.\n\
 \n\
 If an error occurs within the first part of an unwind_protect block\n\
@@ -495,35 +495,35 @@
 unwind_protect_cleanup will be run with or without an error in the\n\
 unwind_protect block).\n\
 @seealso{unwind_protect_cleanup,try}\n\
-@end deffn"), 
+@end deftypefn"), 
 
   pair_type ("unwind_protect_cleanup",
     "-*- texinfo -*-\n\
-@deffn Keyword unwind_protect_cleanup\n\
+@deftypefn {Keyword} {} unwind_protect_cleanup\n\
 Begin the cleanup section of an unwind_protect block.\n\
 @seealso{unwind_protect}\n\
-@end deffn"), 
+@end deftypefn"), 
 
   pair_type ("varargin",
     "-*- texinfo -*-\n\
-@deffn Keyword varargin\n\
+@deftypefn {Keyword} {} varargin\n\
 Pass an arbitrary number of arguments into a function.\n\
 @seealso{varargout, nargin, nargout}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("varargout",
     "-*- texinfo -*-\n\
-@deffn Keyword varargout\n\
+@deftypefn {Keyword} {} varargout\n\
 Pass an arbitrary number of arguments out of a function.\n\
 @seealso{varargin, nargin, nargout}\n\
-@end deffn"),
+@end deftypefn"),
 
   pair_type ("while",
     "-*- texinfo -*-\n\
-@deffn Keyword while\n\
+@deftypefn {Keyword} {} while\n\
 Begin a while loop.\n\
 @seealso{do}\n\
-@end deffn"),
+@end deftypefn"),
 };
 
 // Return a copy of the operator or keyword names.
--- a/src/input.cc	Sat Jan 15 12:02:41 2011 -0500
+++ b/src/input.cc	Sat Jan 15 10:04:30 2011 -0800
@@ -1033,7 +1033,7 @@
 
 DEFUN (echo, args, ,
   "-*- texinfo -*-\n\
-@deffn {Command} echo options\n\
+@deftypefn {Command} {} echo options\n\
 Control whether commands are displayed as they are executed.  Valid\n\
 options are:\n\
 \n\
@@ -1055,7 +1055,7 @@
 \n\
 @noindent\n\
 With no arguments, @code{echo} toggles the current echo state.\n\
-@end deffn")
+@end deftypefn")
 {
   octave_value_list retval;
 
--- a/src/load-save.cc	Sat Jan 15 12:02:41 2011 -0500
+++ b/src/load-save.cc	Sat Jan 15 10:04:30 2011 -0800
@@ -554,10 +554,10 @@
 
 DEFUN (load, args, nargout,
   "-*- texinfo -*-\n\
-@deffn  {Command} load file\n\
-@deffnx {Command} load options file\n\
-@deffnx {Command} load options file v1 v2 @dots{}\n\
-@deffnx {Command} S = load(\"options\", \"file\", \"v1\", \"v2\", @dots{})\n\
+@deftypefn {Command} {} load file\n\
+@deftypefnx {Command} {} load options file\n\
+@deftypefnx {Command} {} load options file v1 v2 @dots{}\n\
+@deftypefnx {Command} {} S = load(\"options\", \"file\", \"v1\", \"v2\", @dots{})\n\
 Load the named variables @var{v1}, @var{v2}, @dots{}, from the file\n\
 @var{file}.  If no variables are specified then all variables found in the\n\
 file will be loaded.  As with @code{save}, the list of variables to extract\n\
@@ -646,7 +646,7 @@
 Force Octave to assume the file is in Octave's text format.\n\
 @end table\n\
 @seealso{save, dlmwrite, csvwrite, fwrite}\n\
-@end deffn")
+@end deftypefn")
 {
   octave_value_list retval;
 
@@ -1450,10 +1450,10 @@
 
 DEFUN (save, args, ,
   "-*- texinfo -*-\n\
-@deffn  {Command} save file\n\
-@deffnx {Command} save options file\n\
-@deffnx {Command} save options file @var{v1} @var{v2} @dots{}\n\
-@deffnx {Command} save options file -struct @var{STRUCT} @var{f1} @var{f2} @dots{}\n\
+@deftypefn {Command} {} save file\n\
+@deftypefnx {Command} {} save options file\n\
+@deftypefnx {Command} {} save options file @var{v1} @var{v2} @dots{}\n\
+@deftypefnx {Command} {} save options file -struct @var{STRUCT} @var{f1} @var{f2} @dots{}\n\
 Save the named variables @var{v1}, @var{v2}, @dots{}, in the file\n\
 @var{file}.  The special filename @samp{-} may be used to write\n\
 output to the terminal.  If no variable names are listed, Octave saves\n\
@@ -1572,7 +1572,7 @@
 saves the variable @samp{a} and all variables beginning with @samp{b} to\n\
 the file @file{data} in Octave's binary format.\n\
 @seealso{load, default_save_options, dlmread, csvread, fread}\n\
-@end deffn")
+@end deftypefn")
 {
   octave_value_list retval;
 
--- a/src/oct-hist.cc	Sat Jan 15 12:02:41 2011 -0500
+++ b/src/oct-hist.cc	Sat Jan 15 10:04:30 2011 -0800
@@ -554,7 +554,7 @@
 
 DEFUN (edit_history, args, ,
   "-*- texinfo -*-\n\
-@deffn {Command} edit_history [@var{first}] [@var{last}]\n\
+@deftypefn {Command} {} edit_history [@var{first}] [@var{last}]\n\
 If invoked with no arguments, @code{edit_history} allows you to edit the\n\
 history list using the editor named by the variable @w{@env{EDITOR}}.  The\n\
 commands to be edited are first copied to a temporary file.  When you\n\
@@ -587,7 +587,7 @@
 before placing them in the buffer to be edited.  If both arguments are\n\
 omitted, the previous command in the history list is used.\n\
 @seealso{run_history}\n\
-@end deffn")
+@end deftypefn")
 {
   octave_value_list retval;
 
@@ -605,7 +605,7 @@
 
 DEFUN (history, args, ,
   "-*- texinfo -*-\n\
-@deffn {Command} history options\n\
+@deftypefn {Command} {} history options\n\
 If invoked with no arguments, @code{history} displays a list of commands\n\
 that you have executed.  Valid options are:\n\
 \n\
@@ -630,7 +630,7 @@
 For example, to display the five most recent commands that you have\n\
 typed without displaying line numbers, use the command\n\
 @kbd{history -q 5}.\n\
-@end deffn")
+@end deftypefn")
 {
   octave_value_list retval;
 
@@ -648,11 +648,11 @@
 
 DEFUN (run_history, args, ,
   "-*- texinfo -*-\n\
-@deffn {Command} run_history [@var{first}] [@var{last}]\n\
+@deftypefn {Command} {} run_history [@var{first}] [@var{last}]\n\
 Similar to @code{edit_history}, except that the editor is not invoked,\n\
 and the commands are simply executed as they appear in the history list.\n\
 @seealso{edit_history}\n\
-@end deffn")
+@end deftypefn")
 {
   octave_value_list retval;
 
--- a/src/pager.cc	Sat Jan 15 12:02:41 2011 -0500
+++ b/src/pager.cc	Sat Jan 15 10:04:30 2011 -0800
@@ -418,7 +418,7 @@
 
 DEFUN (diary, args, ,
   "-*- texinfo -*-\n\
-@deffn {Command} diary options\n\
+@deftypefn {Command} {} diary options\n\
 Record a list of all commands @emph{and} the output they produce, mixed\n\
 together just as you see them on your terminal.  Valid options are:\n\
 \n\
@@ -435,7 +435,7 @@
 @end table\n\
 \n\
 With no arguments, @code{diary} toggles the current diary state.\n\
-@end deffn")
+@end deftypefn")
 {
   octave_value_list retval;
 
@@ -489,13 +489,13 @@
 
 DEFUN (more, args, ,
   "-*- texinfo -*-\n\
-@deffn {Command} more\n\
-@deffnx {Command} more on\n\
-@deffnx {Command} more off\n\
+@deftypefn {Command} {} more\n\
+@deftypefnx {Command} {} more on\n\
+@deftypefnx {Command} {} more off\n\
 Turn output pagination on or off.  Without an argument, @code{more}\n\
 toggles the current state.\n\
 The current state can be determined via @code{page_screen_output}.\n\
-@end deffn")
+@end deftypefn")
 {
   octave_value_list retval;
 
--- a/src/pr-output.cc	Sat Jan 15 12:02:41 2011 -0500
+++ b/src/pr-output.cc	Sat Jan 15 10:04:30 2011 -0800
@@ -3732,8 +3732,8 @@
 
 DEFUN (format, args, ,
   "-*- texinfo -*-\n\
-@deffn  {Command} format\n\
-@deffnx {Command} format options\n\
+@deftypefn {Command} {} format\n\
+@deftypefnx {Command} {} format options\n\
 Reset or specify the format of the output produced by @code{disp} and\n\
 Octave's normal echoing mechanism.  This command only affects the display\n\
 of numbers but not how they are stored or computed.  To change the internal\n\
@@ -3897,7 +3897,7 @@
 Insert blank lines above and below column number labels to produce a more\n\
 readable output with less data per page.  (default).\n\
 @end table\n\
-@end deffn")
+@end deftypefn")
 {
   octave_value_list retval;
 
--- a/src/variables.cc	Sat Jan 15 12:02:41 2011 -0500
+++ b/src/variables.cc	Sat Jan 15 10:04:30 2011 -0800
@@ -2240,7 +2240,7 @@
 
 DEFUN (clear, args, ,
   "-*- texinfo -*-\n\
-@deffn {Command} clear [options] pattern @dots{}\n\
+@deftypefn {Command} {} clear [options] pattern @dots{}\n\
 Delete the names matching the given patterns from the symbol table.  The\n\
 pattern may contain the following special characters:\n\
 \n\
@@ -2305,7 +2305,7 @@
 @end table\n\
 With the exception of @code{exclusive}, all long options can be used \n\
 without the dash as well.\n\
-@end deffn")
+@end deftypefn")
 {
   octave_value_list retval;