--- a/src/DLD-FUNCTIONS/kron.cc	Thu May 31 19:41:11 2007 +0000
+++ b/src/DLD-FUNCTIONS/kron.cc	Thu May 31 19:44:45 2007 +0000
@@ -71,7 +71,7 @@
 kron (const Array2<Complex>&, const Array2<Complex>&, Array2<Complex>&);
 
 DEFUN_DLD (kron, args,  nargout, "-*- texinfo -*-\n\
-@deftypefn {Function File} {} kron (@var{a}, @var{b})\n\
+@deftypefn {Loadable Function} {} kron (@var{a}, @var{b})\n\
 Form the kronecker product of two matrices, defined block by block as\n\
 \n\
 @example\n\

--- a/src/DLD-FUNCTIONS/regexp.cc	Thu May 31 19:41:11 2007 +0000
+++ b/src/DLD-FUNCTIONS/regexp.cc	Thu May 31 19:44:45 2007 +0000
@@ -1390,7 +1390,7 @@
 
 DEFUN_DLD (regexprep, args, ,
   "-*- texinfo -*-\n\
-@deftypefn {Function File}  {@var{string} =} regexprep (@var{string}, @var{pat}, @var{repstr}, @var{options})\n\
+@deftypefn {Loadable Function}  {@var{string} =} regexprep (@var{string}, @var{pat}, @var{repstr}, @var{options})\n\
 Replace matches of @var{pat} in  @var{string} with @var{repstr}.\n\
 \n\
 \n\

--- a/src/DLD-FUNCTIONS/spkron.cc	Thu May 31 19:41:11 2007 +0000
+++ b/src/DLD-FUNCTIONS/spkron.cc	Thu May 31 19:44:45 2007 +0000
@@ -83,7 +83,7 @@
 // PKG_ADD: dispatch ("kron", "spkron", "sparse complex matrix");
 // PKG_ADD: dispatch ("kron", "spkron", "sparse bool matrix");
 DEFUN_DLD (spkron, args,  nargout, "-*- texinfo -*-\n\
-@deftypefn {Function File} {} spkron (@var{a}, @var{b})\n\
+@deftypefn {Loadable Function} {} spkron (@var{a}, @var{b})\n\
 Form the kronecker product of two sparse matrices. This is defined\n\
 block by block as\n\
 \n\

--- a/src/bitfcns.cc	Thu May 31 19:41:11 2007 +0000
+++ b/src/bitfcns.cc	Thu May 31 19:44:45 2007 +0000
@@ -385,8 +385,8 @@
 
 DEFUN (bitshift, args, ,
   "-*- texinfo -*-\n\
-@deftypefn {Function File} {} bitshift (@var{a}, @var{k})\n\
-@deftypefnx {Function File} {} bitshift (@var{a}, @var{k}, @var{n})\n\
+@deftypefn {Built-in Function} {} bitshift (@var{a}, @var{k})\n\
+@deftypefnx {Built-in Function} {} bitshift (@var{a}, @var{k}, @var{n})\n\
 Return a @var{k} bit shift of @var{n}- digit unsigned\n\
 integers in @var{a}.  A positive @var{k} leads to a left shift.\n\
 A negative value to a right shift.  If @var{n} is omitted it defaults\n\

--- a/src/graphics.cc	Thu May 31 19:41:11 2007 +0000
+++ b/src/graphics.cc	Thu May 31 19:44:45 2007 +0000
@@ -3313,7 +3313,7 @@
 
 DEFUN (ishandle, args, ,
   "-*- texinfo -*-\n\
-@deftypefn {Function File} {} ishandle (@var{h})\n\
+@deftypefn {Built-in Function} {} ishandle (@var{h})\n\
 Return true if @var{h} is a graphics handle and false otherwise.\n\
 @end deftypefn")
 {
@@ -3329,7 +3329,7 @@
 
 DEFUN (set, args, ,
   "-*- texinfo -*-\n\
-@deftypefn {Function File} {} set (@var{h}, @var{p}, @var{v}, @dots{})\n\
+@deftypefn {Built-in Function} {} set (@var{h}, @var{p}, @var{v}, @dots{})\n\
 Set the named property @var{p} to the value @var{v} in the graphics\n\
 handle @var{h}.\n\
 @end deftypefn")
@@ -3366,7 +3366,7 @@
 
 DEFUN (get, args, ,
   "-*- texinfo -*-\n\
-@deftypefn {Function File} {} get (@var{h}, @var{p})\n\
+@deftypefn {Built-in Function} {} get (@var{h}, @var{p})\n\
 Return the named property @var{p} from the graphics handle @var{h}.\n\
 If @var{p} is omitted, return the complete property list for @var{h}.\n\
 @end deftypefn")

--- a/src/load-path.cc	Thu May 31 19:41:11 2007 +0000
+++ b/src/load-path.cc	Thu May 31 19:44:45 2007 +0000
@@ -1293,7 +1293,7 @@
 
 DEFUN (path, args, nargout,
     "-*- texinfo -*-\n\
-@deftypefn {Function File} {} path (@dots{})\n\
+@deftypefn {Built-in Function} {} path (@dots{})\n\
 Modify or display Octave's load path.\n\
 \n\
 If @var{nargin} and @var{nargout} are zero, display the elements of\n\
@@ -1347,8 +1347,8 @@
 
 DEFCMD (addpath, args, nargout,
   "-*- texinfo -*-\n\
-@deftypefn {Function File} {} addpath (@var{dir1}, @dots{})\n\
-@deftypefnx {Function File} {} addpath (@var{dir1}, @dots{}, @var{option})\n\
+@deftypefn {Built-in Function} {} addpath (@var{dir1}, @dots{})\n\
+@deftypefnx {Built-in Function} {} addpath (@var{dir1}, @dots{}, @var{option})\n\
 Add @var{dir1}, @dots{} to the current function search path.  If\n\
 @var{option} is @samp{\"-begin\"} or 0 (the default), prepend the\n\
 directory name to the current path.  If @var{option} is @samp{\"-end\"}\n\
@@ -1443,7 +1443,7 @@
 
 DEFCMD (rmpath, args, nargout,
   "-*- texinfo -*-\n\
-@deftypefn {Function File} {} rmpath (@var{dir1}, @dots{})\n\
+@deftypefn {Built-in Function} {} rmpath (@var{dir1}, @dots{})\n\
 Remove @var{dir1}, @dots{} from the current function search path.\n\
 \n\
 @seealso{path, addpath, genpath, pathdef, savepath, pathsep}\n\

--- a/src/octave.cc	Thu May 31 19:41:11 2007 +0000
+++ b/src/octave.cc	Thu May 31 19:44:45 2007 +0000
@@ -224,7 +224,7 @@
 
 DEFUN (__version_info__, args, ,
   "-*- texinfo -*-\n\
-@deftypefn {Function File} {retval =} __version_info__ (@var{name}, @var{version}, @var{release}, @var{date})\n\
+@deftypefn {Built-in Function} {retval =} __version_info__ (@var{name}, @var{version}, @var{release}, @var{date})\n\
 @end deftypefn")
 {
   octave_value retval;

--- a/src/strfns.cc	Thu May 31 19:41:11 2007 +0000
+++ b/src/strfns.cc	Thu May 31 19:44:45 2007 +0000
@@ -147,7 +147,7 @@
 
 DEFUN (strcmp, args, ,
   "-*- texinfo -*-\n\
-@deftypefn {Function File} {} strcmp (@var{s1}, @var{s2})\n\
+@deftypefn {Built-in Function} {} strcmp (@var{s1}, @var{s2})\n\
 Return 1 if the character strings @var{s1} and @var{s2} are the same,\n\
 and 0 otherwise.\n\
 \n\
@@ -425,7 +425,7 @@
 
 DEFUN (strncmp, args, ,
   "-*- texinfo -*-\n\
-@deftypefn {Function File} {} strncmp (@var{s1}, @var{s2}, @var{n})\n\
+@deftypefn {Built-in Function} {} strncmp (@var{s1}, @var{s2}, @var{n})\n\
 Return 1 if the first @var{n} characters of strings @var{s1} and @var{s2} are the same,\n\
 and 0 otherwise.\n\
 \n\

--- a/src/syscalls.cc	Thu May 31 19:41:11 2007 +0000
+++ b/src/syscalls.cc	Thu May 31 19:44:45 2007 +0000
@@ -223,7 +223,7 @@
 
 DEFUN (popen2, args, ,
  "-*- texinfo -*-\n\
-@deftypefn {Function File} {[@var{in}, @var{out}, @var{pid}] =} popen2 (@var{command}, @var{args})\n\
+@deftypefn {Built-in Function} {[@var{in}, @var{out}, @var{pid}] =} popen2 (@var{command}, @var{args})\n\
 Start a subprocess with two-way communication.  The name of the process\n\
 is given by @var{command}, and @var{args} is an array of strings\n\
 containing options for the command.  The file identifiers for the input\n\