changeset 20853:1142cf6abc0d

2015 Code Sprint: remove class of function from docstring for all C++ files.
author Rik <rik@octave.org>
date Sat, 12 Dec 2015 07:40:03 -0800
parents 516bb87ea72e
children cdf08aacfd86
files libinterp/corefcn/__contourc__.cc libinterp/corefcn/__dsearchn__.cc libinterp/corefcn/__ichol__.cc libinterp/corefcn/__ilu__.cc libinterp/corefcn/__lin_interpn__.cc libinterp/corefcn/__pchip_deriv__.cc libinterp/corefcn/__qp__.cc libinterp/corefcn/balance.cc libinterp/corefcn/besselj.cc libinterp/corefcn/betainc.cc libinterp/corefcn/bitfcns.cc libinterp/corefcn/bsxfun.cc libinterp/corefcn/cellfun.cc libinterp/corefcn/colloc.cc libinterp/corefcn/conv2.cc libinterp/corefcn/daspk.cc libinterp/corefcn/dasrt.cc libinterp/corefcn/dassl.cc libinterp/corefcn/data.cc libinterp/corefcn/debug.cc libinterp/corefcn/defaults.cc libinterp/corefcn/det.cc libinterp/corefcn/dirfns.cc libinterp/corefcn/dlmread.cc libinterp/corefcn/dot.cc libinterp/corefcn/eig.cc libinterp/corefcn/ellipj.cc libinterp/corefcn/error.cc libinterp/corefcn/fft.cc libinterp/corefcn/fft2.cc libinterp/corefcn/fftn.cc libinterp/corefcn/file-io.cc libinterp/corefcn/filter.cc libinterp/corefcn/find.cc libinterp/corefcn/gammainc.cc libinterp/corefcn/gcd.cc libinterp/corefcn/getgrent.cc libinterp/corefcn/getpwent.cc libinterp/corefcn/getrusage.cc libinterp/corefcn/givens.cc libinterp/corefcn/graphics.cc libinterp/corefcn/help.cc libinterp/corefcn/hess.cc libinterp/corefcn/hex2num.cc libinterp/corefcn/input.cc libinterp/corefcn/inv.cc libinterp/corefcn/kron.cc libinterp/corefcn/load-path.cc libinterp/corefcn/load-save.cc libinterp/corefcn/lookup.cc libinterp/corefcn/ls-oct-text.cc libinterp/corefcn/lsode.cc libinterp/corefcn/lu.cc libinterp/corefcn/luinc.cc libinterp/corefcn/mappers.cc libinterp/corefcn/matrix_type.cc libinterp/corefcn/max.cc libinterp/corefcn/md5sum.cc libinterp/corefcn/mgorth.cc libinterp/corefcn/nproc.cc libinterp/corefcn/oct-hist.cc libinterp/corefcn/octave-link.cc libinterp/corefcn/ordschur.cc libinterp/corefcn/pager.cc libinterp/corefcn/pinv.cc libinterp/corefcn/pr-output.cc libinterp/corefcn/profiler.cc libinterp/corefcn/psi.cc libinterp/corefcn/pt-jit.cc libinterp/corefcn/quad.cc libinterp/corefcn/quadcc.cc libinterp/corefcn/qz.cc libinterp/corefcn/rand.cc libinterp/corefcn/rcond.cc libinterp/corefcn/regexp.cc libinterp/corefcn/schur.cc libinterp/corefcn/sighandlers.cc libinterp/corefcn/sparse.cc libinterp/corefcn/spparms.cc libinterp/corefcn/sqrtm.cc libinterp/corefcn/str2double.cc libinterp/corefcn/strfind.cc libinterp/corefcn/strfns.cc libinterp/corefcn/sub2ind.cc libinterp/corefcn/svd.cc libinterp/corefcn/sylvester.cc libinterp/corefcn/symtab.cc libinterp/corefcn/syscalls.cc libinterp/corefcn/sysdep.cc libinterp/corefcn/time.cc libinterp/corefcn/toplev.cc libinterp/corefcn/tril.cc libinterp/corefcn/tsearch.cc libinterp/corefcn/typecast.cc libinterp/corefcn/urlwrite.cc libinterp/corefcn/utils.cc libinterp/corefcn/variables.cc libinterp/dldfcn/__delaunayn__.cc libinterp/dldfcn/__eigs__.cc libinterp/dldfcn/__glpk__.cc libinterp/dldfcn/__init_gnuplot__.cc libinterp/dldfcn/__magick_read__.cc libinterp/dldfcn/__osmesa_print__.cc libinterp/dldfcn/__voronoi__.cc libinterp/dldfcn/amd.cc libinterp/dldfcn/audiodevinfo.cc libinterp/dldfcn/audioread.cc libinterp/dldfcn/ccolamd.cc libinterp/dldfcn/chol.cc libinterp/dldfcn/colamd.cc libinterp/dldfcn/convhulln.cc libinterp/dldfcn/dmperm.cc libinterp/dldfcn/fftw.cc libinterp/dldfcn/qr.cc libinterp/dldfcn/symbfact.cc libinterp/dldfcn/symrcm.cc libinterp/octave-value/ov-base.cc libinterp/octave-value/ov-bool-mat.cc libinterp/octave-value/ov-cell.cc libinterp/octave-value/ov-class.cc libinterp/octave-value/ov-classdef.cc libinterp/octave-value/ov-fcn-handle.cc libinterp/octave-value/ov-fcn-inline.cc libinterp/octave-value/ov-flt-re-mat.cc libinterp/octave-value/ov-int16.cc libinterp/octave-value/ov-int32.cc libinterp/octave-value/ov-int64.cc libinterp/octave-value/ov-int8.cc libinterp/octave-value/ov-java.cc libinterp/octave-value/ov-null-mat.cc libinterp/octave-value/ov-oncleanup.cc libinterp/octave-value/ov-range.cc libinterp/octave-value/ov-re-mat.cc libinterp/octave-value/ov-struct.cc libinterp/octave-value/ov-typeinfo.cc libinterp/octave-value/ov-uint16.cc libinterp/octave-value/ov-uint32.cc libinterp/octave-value/ov-uint64.cc libinterp/octave-value/ov-uint8.cc libinterp/octave-value/ov-usr-fcn.cc libinterp/octave-value/ov.cc libinterp/octave.cc libinterp/parse-tree/pt-arg-list.cc libinterp/parse-tree/pt-binop.cc libinterp/parse-tree/pt-eval.cc libinterp/parse-tree/pt-mat.cc
diffstat 146 files changed, 1623 insertions(+), 1623 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/__contourc__.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/__contourc__.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -300,7 +300,7 @@
 
 DEFUN (__contourc__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __contourc__ (@var{x}, @var{y}, @var{z}, @var{levels})\n\
+@deftypefn {} {} __contourc__ (@var{x}, @var{y}, @var{z}, @var{levels})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
--- a/libinterp/corefcn/__dsearchn__.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/__dsearchn__.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -36,7 +36,7 @@
 
 DEFUN (__dsearchn__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{idx}, @var{d}] =} dsearch (@var{x}, @var{xi})\n\
+@deftypefn {} {[@var{idx}, @var{d}] =} dsearch (@var{x}, @var{xi})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
--- a/libinterp/corefcn/__ichol__.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/__ichol__.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -180,8 +180,8 @@
 
 DEFUN (__ichol0__, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{L} =} __ichol0__ (@var{A})\n\
-@deftypefnx {Built-in Function} {@var{L} =} __ichol0__ (@var{A}, @var{michol})\n\
+@deftypefn  {} {@var{L} =} __ichol0__ (@var{A})\n\
+@deftypefnx {} {@var{L} =} __ichol0__ (@var{A}, @var{michol})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 
@@ -426,9 +426,9 @@
 
 DEFUN (__icholt__, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{L} =} __icholt__ (@var{A})\n\
-@deftypefnx {Built-in Function} {@var{L} =} __icholt__ (@var{A}, @var{droptol})\n\
-@deftypefnx {Built-in Function} {@var{L} =} __icholt__ (@var{A}, @var{droptol}, @var{michol})\n\
+@deftypefn  {} {@var{L} =} __icholt__ (@var{A})\n\
+@deftypefnx {} {@var{L} =} __icholt__ (@var{A}, @var{droptol})\n\
+@deftypefnx {} {@var{L} =} __icholt__ (@var{A}, @var{droptol}, @var{michol})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
--- a/libinterp/corefcn/__ilu__.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/__ilu__.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -128,9 +128,9 @@
 
 DEFUN (__ilu0__, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{L}, @var{U}] =} __ilu0__ (@var{A})\n\
-@deftypefnx {Built-in Function} {[@var{L}, @var{U}] =} __ilu0__ (@var{A}, @var{milu})\n\
-@deftypefnx {Built-in Function} {[@var{L}, @var{U}, @var{P}] =} __ilu0__ (@var{A}, @dots{})\n\
+@deftypefn  {} {[@var{L}, @var{U}] =} __ilu0__ (@var{A})\n\
+@deftypefnx {} {[@var{L}, @var{U}] =} __ilu0__ (@var{A}, @var{milu})\n\
+@deftypefnx {} {[@var{L}, @var{U}, @var{P}] =} __ilu0__ (@var{A}, @dots{})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -464,10 +464,10 @@
 
 DEFUN (__iluc__, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{L}, @var{U}] =} __iluc__ (@var{A})\n\
-@deftypefnx {Built-in Function} {[@var{L}, @var{U}] =} __iluc__ (@var{A}, @var{droptol})\n\
-@deftypefnx {Built-in Function} {[@var{L}, @var{U}] =} __iluc__ (@var{A}, @var{droptol}, @var{milu})\n\
-@deftypefnx {Built-in Function} {[@var{L}, @var{U}, @var{P}] =} __iluc__ (@var{A}, @dots{})\n\
+@deftypefn  {} {[@var{L}, @var{U}] =} __iluc__ (@var{A})\n\
+@deftypefnx {} {[@var{L}, @var{U}] =} __iluc__ (@var{A}, @var{droptol})\n\
+@deftypefnx {} {[@var{L}, @var{U}] =} __iluc__ (@var{A}, @var{droptol}, @var{milu})\n\
+@deftypefnx {} {[@var{L}, @var{U}, @var{P}] =} __iluc__ (@var{A}, @dots{})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -935,12 +935,12 @@
 
 DEFUN (__ilutp__, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{L}, @var{U}] =} __ilutp__ (@var{A})\n\
-@deftypefnx {Built-in Function} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol})\n\
-@deftypefnx {Built-in Function} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol}, @var{thresh})\n\
-@deftypefnx {Built-in Function} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol}, @var{thresh}, @var{milu})\n\
-@deftypefnx {Built-in Function} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol}, @var{thresh}, @var{milu}, @var{udiag})\n\
-@deftypefnx {Built-in Function} {[@var{L}, @var{U}, @var{P}] =} __ilutp__ (@var{A}, @dots{})\n\
+@deftypefn  {} {[@var{L}, @var{U}] =} __ilutp__ (@var{A})\n\
+@deftypefnx {} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol})\n\
+@deftypefnx {} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol}, @var{thresh})\n\
+@deftypefnx {} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol}, @var{thresh}, @var{milu})\n\
+@deftypefnx {} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol}, @var{thresh}, @var{milu}, @var{udiag})\n\
+@deftypefnx {} {[@var{L}, @var{U}, @var{P}] =} __ilutp__ (@var{A}, @dots{})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
--- a/libinterp/corefcn/__lin_interpn__.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/__lin_interpn__.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -261,7 +261,7 @@
 
 DEFUN (__lin_interpn__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{vi} =} __lin_interpn__ (@var{x1}, @var{x2}, @dots{}, @var{xn}, @var{v}, @var{y1}, @var{y2}, @dots{}, @var{yn})\n\
+@deftypefn {} {@var{vi} =} __lin_interpn__ (@var{x1}, @var{x2}, @dots{}, @var{xn}, @var{v}, @var{y1}, @var{y2}, @dots{}, @var{yn})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
--- a/libinterp/corefcn/__pchip_deriv__.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/__pchip_deriv__.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -52,7 +52,7 @@
 
 DEFUN (__pchip_deriv__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __pchip_deriv__ (@var{x}, @var{y}, @var{dim})\n\
+@deftypefn {} {} __pchip_deriv__ (@var{x}, @var{y}, @var{dim})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
--- a/libinterp/corefcn/__qp__.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/__qp__.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -487,7 +487,7 @@
 
 DEFUN (__qp__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{x}, @var{lambda}, @var{info}, @var{iter}] =} __qp__ (@var{x0}, @var{H}, @var{q}, @var{Aeq}, @var{beq}, @var{Ain}, @var{bin}, @var{maxit})\n\
+@deftypefn {} {[@var{x}, @var{lambda}, @var{info}, @var{iter}] =} __qp__ (@var{x0}, @var{H}, @var{q}, @var{Aeq}, @var{beq}, @var{Ain}, @var{bin}, @var{maxit})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
--- a/libinterp/corefcn/balance.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/balance.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -48,11 +48,11 @@
 
 DEFUN (balance, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{AA} =} balance (@var{A})\n\
-@deftypefnx {Built-in Function} {@var{AA} =} balance (@var{A}, @var{opt})\n\
-@deftypefnx {Built-in Function} {[@var{DD}, @var{AA}] =} balance (@var{A}, @var{opt})\n\
-@deftypefnx {Built-in Function} {[@var{D}, @var{P}, @var{AA}] =} balance (@var{A}, @var{opt})\n\
-@deftypefnx {Built-in Function} {[@var{CC}, @var{DD}, @var{AA}, @var{BB}] =} balance (@var{A}, @var{B}, @var{opt})\n\
+@deftypefn  {} {@var{AA} =} balance (@var{A})\n\
+@deftypefnx {} {@var{AA} =} balance (@var{A}, @var{opt})\n\
+@deftypefnx {} {[@var{DD}, @var{AA}] =} balance (@var{A}, @var{opt})\n\
+@deftypefnx {} {[@var{D}, @var{P}, @var{AA}] =} balance (@var{A}, @var{opt})\n\
+@deftypefnx {} {[@var{CC}, @var{DD}, @var{AA}, @var{BB}] =} balance (@var{A}, @var{B}, @var{opt})\n\
 \n\
 Balance the matrix @var{A} to reduce numerical errors in future\n\
 calculations.\n\
--- a/libinterp/corefcn/besselj.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/besselj.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -311,11 +311,11 @@
 
 DEFUN (besselj, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{j}, @var{ierr}] =} besselj (@var{alpha}, @var{x}, @var{opt})\n\
-@deftypefnx {Built-in Function} {[@var{y}, @var{ierr}] =} bessely (@var{alpha}, @var{x}, @var{opt})\n\
-@deftypefnx {Built-in Function} {[@var{i}, @var{ierr}] =} besseli (@var{alpha}, @var{x}, @var{opt})\n\
-@deftypefnx {Built-in Function} {[@var{k}, @var{ierr}] =} besselk (@var{alpha}, @var{x}, @var{opt})\n\
-@deftypefnx {Built-in Function} {[@var{h}, @var{ierr}] =} besselh (@var{alpha}, @var{k}, @var{x}, @var{opt})\n\
+@deftypefn  {} {[@var{j}, @var{ierr}] =} besselj (@var{alpha}, @var{x}, @var{opt})\n\
+@deftypefnx {} {[@var{y}, @var{ierr}] =} bessely (@var{alpha}, @var{x}, @var{opt})\n\
+@deftypefnx {} {[@var{i}, @var{ierr}] =} besseli (@var{alpha}, @var{x}, @var{opt})\n\
+@deftypefnx {} {[@var{k}, @var{ierr}] =} besselk (@var{alpha}, @var{x}, @var{opt})\n\
+@deftypefnx {} {[@var{h}, @var{ierr}] =} besselh (@var{alpha}, @var{k}, @var{x}, @var{opt})\n\
 Compute Bessel or Hankel functions of various kinds:\n\
 \n\
 @table @code\n\
@@ -385,7 +385,7 @@
 
 DEFUN (bessely, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{y}, @var{ierr}] =} bessely (@var{alpha}, @var{x}, @var{opt})\n\
+@deftypefn {} {[@var{y}, @var{ierr}] =} bessely (@var{alpha}, @var{x}, @var{opt})\n\
 See besselj.\n\
 @end deftypefn")
 {
@@ -394,7 +394,7 @@
 
 DEFUN (besseli, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{i}, @var{ierr}] =} besseli (@var{alpha}, @var{x}, @var{opt})\n\
+@deftypefn {} {[@var{i}, @var{ierr}] =} besseli (@var{alpha}, @var{x}, @var{opt})\n\
 See besselj.\n\
 @end deftypefn")
 {
@@ -403,7 +403,7 @@
 
 DEFUN (besselk, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{k}, @var{ierr}] =} besselk (@var{alpha}, @var{x}, @var{opt})\n\
+@deftypefn {} {[@var{k}, @var{ierr}] =} besselk (@var{alpha}, @var{x}, @var{opt})\n\
 See besselj.\n\
 @end deftypefn")
 {
@@ -412,7 +412,7 @@
 
 DEFUN (besselh, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{h}, @var{ierr}] =} besselh (@var{alpha}, @var{k}, @var{x}, @var{opt})\n\
+@deftypefn {} {[@var{h}, @var{ierr}] =} besselh (@var{alpha}, @var{k}, @var{x}, @var{opt})\n\
 See besselj.\n\
 @end deftypefn")
 {
@@ -452,7 +452,7 @@
 
 DEFUN (airy, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{a}, @var{ierr}] =} airy (@var{k}, @var{z}, @var{opt})\n\
+@deftypefn {} {[@var{a}, @var{ierr}] =} airy (@var{k}, @var{z}, @var{opt})\n\
 Compute Airy functions of the first and second kind, and their derivatives.\n\
 \n\
 @example\n\
--- a/libinterp/corefcn/betainc.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/betainc.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -35,7 +35,7 @@
 
 DEFUN (betainc, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} betainc (@var{x}, @var{a}, @var{b})\n\
+@deftypefn {} {} betainc (@var{x}, @var{a}, @var{b})\n\
 Compute the regularized incomplete Beta function.\n\
 \n\
 The regularized incomplete Beta function is defined by\n\
@@ -287,7 +287,7 @@
 
 DEFUN (betaincinv, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} betaincinv (@var{y}, @var{a}, @var{b})\n\
+@deftypefn {} {} betaincinv (@var{y}, @var{a}, @var{b})\n\
 Compute the inverse of the incomplete Beta function.\n\
 \n\
 The inverse is the value @var{x} such that\n\
--- a/libinterp/corefcn/bitfcns.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/bitfcns.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -361,7 +361,7 @@
 
 DEFUN (bitand, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} bitand (@var{x}, @var{y})\n\
+@deftypefn {} {} bitand (@var{x}, @var{y})\n\
 Return the bitwise AND of non-negative integers.\n\
 \n\
 @var{x}, @var{y} must be in the range [0,intmax]\n\
@@ -373,7 +373,7 @@
 
 DEFUN (bitor, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} bitor (@var{x}, @var{y})\n\
+@deftypefn {} {} bitor (@var{x}, @var{y})\n\
 Return the bitwise OR of non-negative integers @var{x} and @var{y}.\n\
 \n\
 @seealso{bitor, bitxor, bitset, bitget, bitcmp, bitshift, intmax, flintmax}\n\
@@ -384,7 +384,7 @@
 
 DEFUN (bitxor, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} bitxor (@var{x}, @var{y})\n\
+@deftypefn {} {} bitxor (@var{x}, @var{y})\n\
 Return the bitwise XOR of non-negative integers @var{x} and @var{y}.\n\
 \n\
 @seealso{bitand, bitor, bitset, bitget, bitcmp, bitshift, intmax, flintmax}\n\
@@ -531,8 +531,8 @@
 
 DEFUN (bitshift, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} bitshift (@var{a}, @var{k})\n\
-@deftypefnx {Built-in Function} {} bitshift (@var{a}, @var{k}, @var{n})\n\
+@deftypefn  {} {} bitshift (@var{a}, @var{k})\n\
+@deftypefnx {} {} bitshift (@var{a}, @var{k}, @var{n})\n\
 Return a @var{k} bit shift of @var{n}-digit unsigned integers in @var{a}.\n\
 \n\
 A positive @var{k} leads to a left shift; A negative value to a right shift.\n\
@@ -659,9 +659,9 @@
 
 DEFUN (flintmax, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} flintmax ()\n\
-@deftypefnx {Built-in Function} {} flintmax (\"double\")\n\
-@deftypefnx {Built-in Function} {} flintmax (\"single\")\n\
+@deftypefn  {} {} flintmax ()\n\
+@deftypefnx {} {} flintmax (\"double\")\n\
+@deftypefnx {} {} flintmax (\"single\")\n\
 Return the largest integer that can be represented consecutively in a\n\
 floating point value.\n\
 \n\
@@ -695,7 +695,7 @@
 
 DEFUN (intmax, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} intmax (@var{type})\n\
+@deftypefn {} {} intmax (@var{type})\n\
 Return the largest integer that can be represented in an integer type.\n\
 \n\
 The variable @var{type} can be\n\
@@ -766,7 +766,7 @@
 
 DEFUN (intmin, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} intmin (@var{type})\n\
+@deftypefn {} {} intmin (@var{type})\n\
 Return the smallest integer that can be represented in an integer type.\n\
 \n\
 The variable @var{type} can be\n\
@@ -837,7 +837,7 @@
 
 DEFUN (sizemax, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} sizemax ()\n\
+@deftypefn {} {} sizemax ()\n\
 Return the largest value allowed for the size of an array.\n\
 \n\
 If Octave is compiled with 64-bit indexing, the result is of class int64,\n\
--- a/libinterp/corefcn/bsxfun.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/bsxfun.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -318,7 +318,7 @@
 
 DEFUN (bsxfun, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} bsxfun (@var{f}, @var{A}, @var{B})\n\
+@deftypefn {} {} bsxfun (@var{f}, @var{A}, @var{B})\n\
 The binary singleton expansion function performs broadcasting,\n\
 that is, it applies a binary function @var{f} element-by-element to two\n\
 array arguments @var{A} and @var{B}, and expands as necessary\n\
--- a/libinterp/corefcn/cellfun.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/cellfun.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -265,14 +265,14 @@
 
 DEFUN (cellfun, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} cellfun (@var{name}, @var{C})\n\
-@deftypefnx {Built-in Function} {} cellfun (\"size\", @var{C}, @var{k})\n\
-@deftypefnx {Built-in Function} {} cellfun (\"isclass\", @var{C}, @var{class})\n\
-@deftypefnx {Built-in Function} {} cellfun (@var{func}, @var{C})\n\
-@deftypefnx {Built-in Function} {} cellfun (@var{func}, @var{C}, @var{D})\n\
-@deftypefnx {Built-in Function} {[@var{a}, @dots{}] =} cellfun (@dots{})\n\
-@deftypefnx {Built-in Function} {} cellfun (@dots{}, \"ErrorHandler\", @var{errfunc})\n\
-@deftypefnx {Built-in Function} {} cellfun (@dots{}, \"UniformOutput\", @var{val})\n\
+@deftypefn  {} {} cellfun (@var{name}, @var{C})\n\
+@deftypefnx {} {} cellfun (\"size\", @var{C}, @var{k})\n\
+@deftypefnx {} {} cellfun (\"isclass\", @var{C}, @var{class})\n\
+@deftypefnx {} {} cellfun (@var{func}, @var{C})\n\
+@deftypefnx {} {} cellfun (@var{func}, @var{C}, @var{D})\n\
+@deftypefnx {} {[@var{a}, @dots{}] =} cellfun (@dots{})\n\
+@deftypefnx {} {} cellfun (@dots{}, \"ErrorHandler\", @var{errfunc})\n\
+@deftypefnx {} {} cellfun (@dots{}, \"UniformOutput\", @var{val})\n\
 \n\
 Evaluate the function named @var{name} on the elements of the cell array\n\
 @var{C}.\n\
@@ -1013,12 +1013,12 @@
 
 DEFUN (arrayfun, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Function File} {} arrayfun (@var{func}, @var{A})\n\
-@deftypefnx {Function File} {@var{x} =} arrayfun (@var{func}, @var{A})\n\
-@deftypefnx {Function File} {@var{x} =} arrayfun (@var{func}, @var{A}, @var{b}, @dots{})\n\
-@deftypefnx {Function File} {[@var{x}, @var{y}, @dots{}] =} arrayfun (@var{func}, @var{A}, @dots{})\n\
-@deftypefnx {Function File} {} arrayfun (@dots{}, \"UniformOutput\", @var{val})\n\
-@deftypefnx {Function File} {} arrayfun (@dots{}, \"ErrorHandler\", @var{errfunc})\n\
+@deftypefn  {} {} arrayfun (@var{func}, @var{A})\n\
+@deftypefnx {} {@var{x} =} arrayfun (@var{func}, @var{A})\n\
+@deftypefnx {} {@var{x} =} arrayfun (@var{func}, @var{A}, @var{b}, @dots{})\n\
+@deftypefnx {} {[@var{x}, @var{y}, @dots{}] =} arrayfun (@var{func}, @var{A}, @dots{})\n\
+@deftypefnx {} {} arrayfun (@dots{}, \"UniformOutput\", @var{val})\n\
+@deftypefnx {} {} arrayfun (@dots{}, \"ErrorHandler\", @var{errfunc})\n\
 \n\
 Execute a function on each element of an array.\n\
 \n\
@@ -1773,8 +1773,8 @@
 
 DEFUN (num2cell, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{C} =} num2cell (@var{A})\n\
-@deftypefnx {Built-in Function} {@var{C} =} num2cell (@var{A}, @var{dim})\n\
+@deftypefn  {} {@var{C} =} num2cell (@var{A})\n\
+@deftypefnx {} {@var{C} =} num2cell (@var{A}, @var{dim})\n\
 Convert the numeric matrix @var{A} to a cell array.\n\
 \n\
 If @var{dim} is defined, the value @var{C} is of dimension 1 in this\n\
@@ -2095,9 +2095,9 @@
 
 DEFUN (mat2cell, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{C} =} mat2cell (@var{A}, @var{m}, @var{n})\n\
-@deftypefnx {Built-in Function} {@var{C} =} mat2cell (@var{A}, @var{d1}, @var{d2}, @dots{})\n\
-@deftypefnx {Built-in Function} {@var{C} =} mat2cell (@var{A}, @var{r})\n\
+@deftypefn  {} {@var{C} =} mat2cell (@var{A}, @var{m}, @var{n})\n\
+@deftypefnx {} {@var{C} =} mat2cell (@var{A}, @var{d1}, @var{d2}, @dots{})\n\
+@deftypefnx {} {@var{C} =} mat2cell (@var{A}, @var{r})\n\
 Convert the matrix @var{A} to a cell array.\n\
 \n\
 If @var{A} is 2-D, then it is required that\n\
@@ -2265,7 +2265,7 @@
 
 DEFUN (cellslices, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{sl} =} cellslices (@var{x}, @var{lb}, @var{ub}, @var{dim})\n\
+@deftypefn {} {@var{sl} =} cellslices (@var{x}, @var{lb}, @var{ub}, @var{dim})\n\
 Given an array @var{x}, this function produces a cell array of slices from\n\
 the array determined by the index vectors @var{lb}, @var{ub}, for lower and\n\
 upper bounds, respectively.\n\
@@ -2392,7 +2392,7 @@
 
 DEFUN (cellindexmat, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{y} =} cellindexmat (@var{x}, @var{varargin})\n\
+@deftypefn {} {@var{y} =} cellindexmat (@var{x}, @var{varargin})\n\
 Perform indexing of matrices in a cell array.\n\
 \n\
 Given a cell array of matrices @var{x}, this function computes\n\
--- a/libinterp/corefcn/colloc.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/colloc.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -36,7 +36,7 @@
 
 DEFUN (colloc, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{r}, @var{amat}, @var{bmat}, @var{q}] =} colloc (@var{n}, \"left\", \"right\")\n\
+@deftypefn {} {[@var{r}, @var{amat}, @var{bmat}, @var{q}] =} colloc (@var{n}, \"left\", \"right\")\n\
 Compute derivative and integral weight matrices for orthogonal collocation.\n\
 \n\
 Reference: @nospell{J. Villadsen}, @nospell{M. L. Michelsen},\n\
--- a/libinterp/corefcn/conv2.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/conv2.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -36,9 +36,9 @@
 
 DEFUN (conv2, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} conv2 (@var{A}, @var{B})\n\
-@deftypefnx {Built-in Function} {} conv2 (@var{v1}, @var{v2}, @var{m})\n\
-@deftypefnx {Built-in Function} {} conv2 (@dots{}, @var{shape})\n\
+@deftypefn  {} {} conv2 (@var{A}, @var{B})\n\
+@deftypefnx {} {} conv2 (@var{v1}, @var{v2}, @var{m})\n\
+@deftypefnx {} {} conv2 (@dots{}, @var{shape})\n\
 Return the 2-D convolution of @var{A} and @var{B}.\n\
 \n\
 The size of the result is determined by the optional @var{shape} argument\n\
@@ -281,8 +281,8 @@
 
 DEFUN (convn, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{C} =} convn (@var{A}, @var{B})\n\
-@deftypefnx {Built-in Function} {@var{C} =} convn (@var{A}, @var{B}, @var{shape})\n\
+@deftypefn  {} {@var{C} =} convn (@var{A}, @var{B})\n\
+@deftypefnx {} {@var{C} =} convn (@var{A}, @var{B}, @var{shape})\n\
 Return the n-D convolution of @var{A} and @var{B}.\n\
 \n\
 The size of the result is determined by the optional @var{shape} argument\n\
--- a/libinterp/corefcn/daspk.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/daspk.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -178,7 +178,7 @@
 
 DEFUN (daspk, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{x}, @var{xdot}, @var{istate}, @var{msg}] =} daspk (@var{fcn}, @var{x_0}, @var{xdot_0}, @var{t}, @var{t_crit})\n\
+@deftypefn {} {[@var{x}, @var{xdot}, @var{istate}, @var{msg}] =} daspk (@var{fcn}, @var{x_0}, @var{xdot_0}, @var{t}, @var{t_crit})\n\
 Solve the set of differential-algebraic equations\n\
 @tex\n\
 $$ 0 = f (x, \\dot{x}, t) $$\n\
--- a/libinterp/corefcn/dasrt.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/dasrt.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -217,10 +217,10 @@
 
 DEFUN (dasrt, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{x}, @var{xdot}, @var{t_out}, @var{istat}, @var{msg}] =} dasrt (@var{fcn}, [], @var{x_0}, @var{xdot_0}, @var{t})\n\
-@deftypefnx {Built-in Function} {@dots{} =} dasrt (@var{fcn}, @var{g}, @var{x_0}, @var{xdot_0}, @var{t})\n\
-@deftypefnx {Built-in Function} {@dots{} =} dasrt (@var{fcn}, [], @var{x_0}, @var{xdot_0}, @var{t}, @var{t_crit})\n\
-@deftypefnx {Built-in Function} {@dots{} =} dasrt (@var{fcn}, @var{g}, @var{x_0}, @var{xdot_0}, @var{t}, @var{t_crit})\n\
+@deftypefn  {} {[@var{x}, @var{xdot}, @var{t_out}, @var{istat}, @var{msg}] =} dasrt (@var{fcn}, [], @var{x_0}, @var{xdot_0}, @var{t})\n\
+@deftypefnx {} {@dots{} =} dasrt (@var{fcn}, @var{g}, @var{x_0}, @var{xdot_0}, @var{t})\n\
+@deftypefnx {} {@dots{} =} dasrt (@var{fcn}, [], @var{x_0}, @var{xdot_0}, @var{t}, @var{t_crit})\n\
+@deftypefnx {} {@dots{} =} dasrt (@var{fcn}, @var{g}, @var{x_0}, @var{xdot_0}, @var{t}, @var{t_crit})\n\
 Solve the set of differential-algebraic equations\n\
 @tex\n\
 $$ 0 = f (x, \\dot{x}, t) $$\n\
--- a/libinterp/corefcn/dassl.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/dassl.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -178,7 +178,7 @@
 
 DEFUN (dassl, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{x}, @var{xdot}, @var{istate}, @var{msg}] =} dassl (@var{fcn}, @var{x_0}, @var{xdot_0}, @var{t}, @var{t_crit})\n\
+@deftypefn {} {[@var{x}, @var{xdot}, @var{istate}, @var{msg}] =} dassl (@var{fcn}, @var{x_0}, @var{xdot_0}, @var{t}, @var{t_crit})\n\
 Solve the set of differential-algebraic equations\n\
 @tex\n\
 $$ 0 = f (x, \\dot{x}, t) $$\n\
--- a/libinterp/corefcn/data.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/data.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -108,8 +108,8 @@
 
 DEFUN (all, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} all (@var{x})\n\
-@deftypefnx {Built-in Function} {} all (@var{x}, @var{dim})\n\
+@deftypefn  {} {} all (@var{x})\n\
+@deftypefnx {} {} all (@var{x}, @var{dim})\n\
 For a vector argument, return true (logical 1) if all elements of the vector\n\
 are nonzero.\n\
 \n\
@@ -155,8 +155,8 @@
 
 DEFUN (any, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} any (@var{x})\n\
-@deftypefnx {Built-in Function} {} any (@var{x}, @var{dim})\n\
+@deftypefn  {} {} any (@var{x})\n\
+@deftypefnx {} {} any (@var{x}, @var{dim})\n\
 For a vector argument, return true (logical 1) if any element of the vector\n\
 is nonzero.\n\
 \n\
@@ -211,7 +211,7 @@
 
 DEFUN (atan2, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} atan2 (@var{y}, @var{x})\n\
+@deftypefn {} {} atan2 (@var{y}, @var{x})\n\
 Compute atan (@var{y} / @var{x}) for corresponding elements of @var{y}\n\
 and @var{x}.\n\
 \n\
@@ -377,8 +377,8 @@
 
 DEFUN (hypot, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} hypot (@var{x}, @var{y})\n\
-@deftypefnx {Built-in Function} {} hypot (@var{x}, @var{y}, @var{z}, @dots{})\n\
+@deftypefn  {} {} hypot (@var{x}, @var{y})\n\
+@deftypefnx {} {} hypot (@var{x}, @var{y}, @var{z}, @dots{})\n\
 Compute the element-by-element square root of the sum of the squares of\n\
 @var{x} and @var{y}.\n\
 \n\
@@ -472,8 +472,8 @@
 
 DEFUN (log2, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Mapping Function} {} log2 (@var{x})\n\
-@deftypefnx {Mapping Function} {[@var{f}, @var{e}] =} log2 (@var{x})\n\
+@deftypefn  {} {} log2 (@var{x})\n\
+@deftypefnx {} {[@var{f}, @var{e}] =} log2 (@var{x})\n\
 Compute the base-2 logarithm of each element of @var{x}.\n\
 \n\
 If called with two output arguments, split @var{x} into\n\
@@ -573,7 +573,7 @@
 
 DEFUN (rem, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} rem (@var{x}, @var{y})\n\
+@deftypefn {} {} rem (@var{x}, @var{y})\n\
 Return the remainder of the division @code{@var{x} / @var{y}}.\n\
 \n\
 The remainder is computed using the expression\n\
@@ -750,7 +750,7 @@
 
 DEFUN (mod, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} mod (@var{x}, @var{y})\n\
+@deftypefn {} {} mod (@var{x}, @var{y})\n\
 Compute the modulo of @var{x} and @var{y}.\n\
 \n\
 Conceptually this is given by\n\
@@ -1151,8 +1151,8 @@
 
 DEFUN (cumprod, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} cumprod (@var{x})\n\
-@deftypefnx {Built-in Function} {} cumprod (@var{x}, @var{dim})\n\
+@deftypefn  {} {} cumprod (@var{x})\n\
+@deftypefnx {} {} cumprod (@var{x}, @var{dim})\n\
 Cumulative product of elements along dimension @var{dim}.\n\
 \n\
 If @var{dim} is omitted, it defaults to the first non-singleton dimension.\n\
@@ -1184,11 +1184,11 @@
 
 DEFUN (cumsum, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} cumsum (@var{x})\n\
-@deftypefnx {Built-in Function} {} cumsum (@var{x}, @var{dim})\n\
-@deftypefnx {Built-in Function} {} cumsum (@dots{}, \"native\")\n\
-@deftypefnx {Built-in Function} {} cumsum (@dots{}, \"double\")\n\
-@deftypefnx {Built-in Function} {} cumsum (@dots{}, \"extra\")\n\
+@deftypefn  {} {} cumsum (@var{x})\n\
+@deftypefnx {} {} cumsum (@var{x}, @var{dim})\n\
+@deftypefnx {} {} cumsum (@dots{}, \"native\")\n\
+@deftypefnx {} {} cumsum (@dots{}, \"double\")\n\
+@deftypefnx {} {} cumsum (@dots{}, \"extra\")\n\
 Cumulative sum of elements along dimension @var{dim}.\n\
 \n\
 If @var{dim} is omitted, it defaults to the first non-singleton dimension.\n\
@@ -1325,11 +1325,11 @@
 
 DEFUN (diag, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{M} =} diag (@var{v})\n\
-@deftypefnx {Built-in Function} {@var{M} =} diag (@var{v}, @var{k})\n\
-@deftypefnx {Built-in Function} {@var{M} =} diag (@var{v}, @var{m}, @var{n})\n\
-@deftypefnx {Built-in Function} {@var{v} =} diag (@var{M})\n\
-@deftypefnx {Built-in Function} {@var{v} =} diag (@var{M}, @var{k})\n\
+@deftypefn  {} {@var{M} =} diag (@var{v})\n\
+@deftypefnx {} {@var{M} =} diag (@var{v}, @var{k})\n\
+@deftypefnx {} {@var{M} =} diag (@var{v}, @var{m}, @var{n})\n\
+@deftypefnx {} {@var{v} =} diag (@var{M})\n\
+@deftypefnx {} {@var{v} =} diag (@var{M}, @var{k})\n\
 Return a diagonal matrix with vector @var{v} on diagonal @var{k}.\n\
 \n\
 The second argument is optional.  If it is positive, the vector is placed on\n\
@@ -1457,10 +1457,10 @@
 
 DEFUN (prod, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} prod (@var{x})\n\
-@deftypefnx {Built-in Function} {} prod (@var{x}, @var{dim})\n\
-@deftypefnx {Built-in Function} {} prod (@dots{}, \"native\")\n\
-@deftypefnx {Built-in Function} {} prod (@dots{}, \"double\")\n\
+@deftypefn  {} {} prod (@var{x})\n\
+@deftypefnx {} {} prod (@var{x}, @var{dim})\n\
+@deftypefnx {} {} prod (@dots{}, \"native\")\n\
+@deftypefnx {} {} prod (@dots{}, \"double\")\n\
 Product of elements along dimension @var{dim}.\n\
 \n\
 If @var{dim} is omitted, it defaults to the first non-singleton dimension.\n\
@@ -2121,7 +2121,7 @@
 
 DEFUN (horzcat, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} horzcat (@var{array1}, @var{array2}, @dots{}, @var{arrayN})\n\
+@deftypefn {} {} horzcat (@var{array1}, @var{array2}, @dots{}, @var{arrayN})\n\
 Return the horizontal concatenation of N-D array objects, @var{array1},\n\
 @var{array2}, @dots{}, @var{arrayN} along dimension 2.\n\
 \n\
@@ -2331,7 +2331,7 @@
 
 DEFUN (vertcat, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} vertcat (@var{array1}, @var{array2}, @dots{}, @var{arrayN})\n\
+@deftypefn {} {} vertcat (@var{array1}, @var{array2}, @dots{}, @var{arrayN})\n\
 Return the vertical concatenation of N-D array objects, @var{array1},\n\
 @var{array2}, @dots{}, @var{arrayN} along dimension 1.\n\
 \n\
@@ -2355,7 +2355,7 @@
 
 DEFUN (cat, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} cat (@var{dim}, @var{array1}, @var{array2}, @dots{}, @var{arrayN})\n\
+@deftypefn {} {} cat (@var{dim}, @var{array1}, @var{array2}, @dots{}, @var{arrayN})\n\
 Return the concatenation of N-D array objects, @var{array1},\n\
 @var{array2}, @dots{}, @var{arrayN} along dimension @var{dim}.\n\
 \n\
@@ -2574,7 +2574,7 @@
 
 DEFUN (permute, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} permute (@var{A}, @var{perm})\n\
+@deftypefn {} {} permute (@var{A}, @var{perm})\n\
 Return the generalized transpose for an N-D array object @var{A}.\n\
 \n\
 The permutation vector @var{perm} must contain the elements\n\
@@ -2607,7 +2607,7 @@
 
 DEFUN (ipermute, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} ipermute (@var{A}, @var{iperm})\n\
+@deftypefn {} {} ipermute (@var{A}, @var{iperm})\n\
 The inverse of the @code{permute} function.\n\
 \n\
 The expression\n\
@@ -2626,7 +2626,7 @@
 
 DEFUN (length, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} length (@var{a})\n\
+@deftypefn {} {} length (@var{a})\n\
 Return the length of the object @var{a}.\n\
 \n\
 The length is 0 for empty objects, 1 for scalars, and the number of elements\n\
@@ -2644,7 +2644,7 @@
 
 DEFUN (ndims, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} ndims (@var{a})\n\
+@deftypefn {} {} ndims (@var{a})\n\
 Return the number of dimensions of @var{a}.\n\
 \n\
 For any array, the result will always be greater than or equal to 2.\n\
@@ -2667,8 +2667,8 @@
 
 DEFUN (numel, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} numel (@var{a})\n\
-@deftypefnx {Built-in Function} {} numel (@var{a}, @var{idx1}, @var{idx2}, @dots{})\n\
+@deftypefn  {} {} numel (@var{a})\n\
+@deftypefnx {} {} numel (@var{a}, @var{idx1}, @var{idx2}, @dots{})\n\
 Return the number of elements in the object @var{a}.\n\
 \n\
 Optionally, if indices @var{idx1}, @var{idx2}, @dots{} are supplied,\n\
@@ -2729,8 +2729,8 @@
 
 DEFUN (size, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} size (@var{a})\n\
-@deftypefnx {Built-in Function} {} size (@var{a}, @var{dim})\n\
+@deftypefn  {} {} size (@var{a})\n\
+@deftypefnx {} {} size (@var{a}, @var{dim})\n\
 Return the number of rows and columns of @var{a}.\n\
 \n\
 With one input argument and one output argument, the result is returned\n\
@@ -2815,7 +2815,7 @@
 
 DEFUN (size_equal, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} size_equal (@var{a}, @var{b}, @dots{})\n\
+@deftypefn {} {} size_equal (@var{a}, @var{b}, @dots{})\n\
 Return true if the dimensions of all arguments agree.\n\
 \n\
 Trailing singleton dimensions are ignored.\n\
@@ -2850,7 +2850,7 @@
 
 DEFUN (nnz, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{n} =} nnz (@var{a})\n\
+@deftypefn {} {@var{n} =} nnz (@var{a})\n\
 Return the number of nonzero elements in @var{a}.\n\
 @seealso{nzmax, nonzeros, find}\n\
 @end deftypefn")
@@ -2863,7 +2863,7 @@
 
 DEFUN (nzmax, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{n} =} nzmax (@var{SM})\n\
+@deftypefn {} {@var{n} =} nzmax (@var{SM})\n\
 Return the amount of storage allocated to the sparse matrix @var{SM}.\n\
 \n\
 Note that Octave tends to crop unused memory at the first opportunity\n\
@@ -2880,7 +2880,7 @@
 
 DEFUN (rows, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} rows (@var{a})\n\
+@deftypefn {} {} rows (@var{a})\n\
 Return the number of rows of @var{a}.\n\
 @seealso{columns, size, length, numel, isscalar, isvector, ismatrix}\n\
 @end deftypefn")
@@ -2920,7 +2920,7 @@
 
 DEFUN (columns, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} columns (@var{a})\n\
+@deftypefn {} {} columns (@var{a})\n\
 Return the number of columns of @var{a}.\n\
 @seealso{rows, size, length, numel, isscalar, isvector, ismatrix}\n\
 @end deftypefn")
@@ -2933,11 +2933,11 @@
 
 DEFUN (sum, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} sum (@var{x})\n\
-@deftypefnx {Built-in Function} {} sum (@var{x}, @var{dim})\n\
-@deftypefnx {Built-in Function} {} sum (@dots{}, \"native\")\n\
-@deftypefnx {Built-in Function} {} sum (@dots{}, \"double\")\n\
-@deftypefnx {Built-in Function} {} sum (@dots{}, \"extra\")\n\
+@deftypefn  {} {} sum (@var{x})\n\
+@deftypefnx {} {} sum (@var{x}, @var{dim})\n\
+@deftypefnx {} {} sum (@dots{}, \"native\")\n\
+@deftypefnx {} {} sum (@dots{}, \"double\")\n\
+@deftypefnx {} {} sum (@dots{}, \"extra\")\n\
 Sum of elements along dimension @var{dim}.\n\
 \n\
 If @var{dim} is omitted, it defaults to the first non-singleton dimension.\n\
@@ -3161,8 +3161,8 @@
 
 DEFUN (sumsq, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} sumsq (@var{x})\n\
-@deftypefnx {Built-in Function} {} sumsq (@var{x}, @var{dim})\n\
+@deftypefn  {} {} sumsq (@var{x})\n\
+@deftypefnx {} {} sumsq (@var{x}, @var{dim})\n\
 Sum of squares of elements along dimension @var{dim}.\n\
 \n\
 If @var{dim} is omitted, it defaults to the first non-singleton dimension.\n\
@@ -3201,8 +3201,8 @@
 
 DEFUN (islogical, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} islogical (@var{x})\n\
-@deftypefnx {Built-in Function} {} isbool (@var{x})\n\
+@deftypefn  {} {} islogical (@var{x})\n\
+@deftypefnx {} {} isbool (@var{x})\n\
 Return true if @var{x} is a logical object.\n\
 @seealso{isfloat, isinteger, ischar, isnumeric, isa}\n\
 @end deftypefn")
@@ -3231,7 +3231,7 @@
 
 DEFUN (isinteger, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isinteger (@var{x})\n\
+@deftypefn {} {} isinteger (@var{x})\n\
 Return true if @var{x} is an integer object (int8, uint8, int16, etc.).\n\
 \n\
 Note that @w{@code{isinteger (14)}} is false because numeric constants in\n\
@@ -3247,7 +3247,7 @@
 
 DEFUN (iscomplex, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} iscomplex (@var{x})\n\
+@deftypefn {} {} iscomplex (@var{x})\n\
 Return true if @var{x} is a complex-valued numeric object.\n\
 @seealso{isreal, isnumeric, islogical, ischar, isfloat, isa}\n\
 @end deftypefn")
@@ -3260,7 +3260,7 @@
 
 DEFUN (isfloat, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isfloat (@var{x})\n\
+@deftypefn {} {} isfloat (@var{x})\n\
 Return true if @var{x} is a floating-point numeric object.\n\
 \n\
 Objects of class double or single are floating-point objects.\n\
@@ -3278,8 +3278,8 @@
 
 DEFUN (complex, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} complex (@var{x})\n\
-@deftypefnx {Built-in Function} {} complex (@var{re}, @var{im})\n\
+@deftypefn  {} {} complex (@var{x})\n\
+@deftypefnx {} {} complex (@var{re}, @var{im})\n\
 Return a complex value from real arguments.\n\
 \n\
 With 1 real argument @var{x}, return the complex result\n\
@@ -3550,7 +3550,7 @@
 
 DEFUN (isreal, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isreal (@var{x})\n\
+@deftypefn {} {} isreal (@var{x})\n\
 Return true if @var{x} is a non-complex matrix or scalar.\n\
 \n\
 For compatibility with @sc{matlab}, this includes logical and character\n\
@@ -3566,7 +3566,7 @@
 
 DEFUN (isempty, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isempty (@var{a})\n\
+@deftypefn {} {} isempty (@var{a})\n\
 Return true if @var{a} is an empty matrix (any one of its dimensions is\n\
 zero).\n\
 @seealso{isnull, isa}\n\
@@ -3585,7 +3585,7 @@
 
 DEFUN (isnumeric, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isnumeric (@var{x})\n\
+@deftypefn {} {} isnumeric (@var{x})\n\
 Return true if @var{x} is a numeric object, i.e., an integer, real, or\n\
 complex array.\n\
 \n\
@@ -3617,7 +3617,7 @@
 
 DEFUN (isscalar, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isscalar (@var{x})\n\
+@deftypefn {} {} isscalar (@var{x})\n\
 Return true if @var{x} is a scalar.\n\
 @seealso{isvector, ismatrix}\n\
 @end deftypefn")
@@ -3649,7 +3649,7 @@
 
 DEFUN (isvector, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Function File} {} isvector (@var{x})\n\
+@deftypefn {} {} isvector (@var{x})\n\
 Return true if @var{x} is a vector.\n\
 \n\
 A vector is a 2-D array where one of the dimensions is equal to 1.  As a\n\
@@ -3687,7 +3687,7 @@
 
 DEFUN (isrow, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Function File} {} isrow (@var{x})\n\
+@deftypefn {} {} isrow (@var{x})\n\
 Return true if @var{x} is a row vector 1xN with non-negative N.\n\
 @seealso{iscolumn, isscalar, isvector, ismatrix}\n\
 @end deftypefn")
@@ -3732,7 +3732,7 @@
 
 DEFUN (iscolumn, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Function File} {} iscolumn (@var{x})\n\
+@deftypefn {} {} iscolumn (@var{x})\n\
 Return true if @var{x} is a column vector Nx1 with non-negative N.\n\
 @seealso{isrow, isscalar, isvector, ismatrix}\n\
 @end deftypefn")
@@ -3776,7 +3776,7 @@
 
 DEFUN (ismatrix, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} ismatrix (@var{a})\n\
+@deftypefn {} {} ismatrix (@var{a})\n\
 Return true if @var{a} is a 2-D array.\n\
 @seealso{isscalar, isvector, iscell, isstruct, issparse, isa}\n\
 @end deftypefn")
@@ -3819,7 +3819,7 @@
 
 DEFUN (issquare, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Function File} {} issquare (@var{x})\n\
+@deftypefn {} {} issquare (@var{x})\n\
 Return true if @var{x} is a square matrix.\n\
 @seealso{isscalar, isvector, ismatrix, size}\n\
 @end deftypefn")
@@ -4200,11 +4200,11 @@
 
 DEFUN (ones, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} ones (@var{n})\n\
-@deftypefnx {Built-in Function} {} ones (@var{m}, @var{n})\n\
-@deftypefnx {Built-in Function} {} ones (@var{m}, @var{n}, @var{k}, @dots{})\n\
-@deftypefnx {Built-in Function} {} ones ([@var{m} @var{n} @dots{}])\n\
-@deftypefnx {Built-in Function} {} ones (@dots{}, @var{class})\n\
+@deftypefn  {} {} ones (@var{n})\n\
+@deftypefnx {} {} ones (@var{m}, @var{n})\n\
+@deftypefnx {} {} ones (@var{m}, @var{n}, @var{k}, @dots{})\n\
+@deftypefnx {} {} ones ([@var{m} @var{n} @dots{}])\n\
+@deftypefnx {} {} ones (@dots{}, @var{class})\n\
 Return a matrix or N-dimensional array whose elements are all 1.\n\
 \n\
 If invoked with a single scalar integer argument @var{n}, return a square\n\
@@ -4251,11 +4251,11 @@
 
 DEFUN (zeros, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} zeros (@var{n})\n\
-@deftypefnx {Built-in Function} {} zeros (@var{m}, @var{n})\n\
-@deftypefnx {Built-in Function} {} zeros (@var{m}, @var{n}, @var{k}, @dots{})\n\
-@deftypefnx {Built-in Function} {} zeros ([@var{m} @var{n} @dots{}])\n\
-@deftypefnx {Built-in Function} {} zeros (@dots{}, @var{class})\n\
+@deftypefn  {} {} zeros (@var{n})\n\
+@deftypefnx {} {} zeros (@var{m}, @var{n})\n\
+@deftypefnx {} {} zeros (@var{m}, @var{n}, @var{k}, @dots{})\n\
+@deftypefnx {} {} zeros ([@var{m} @var{n} @dots{}])\n\
+@deftypefnx {} {} zeros (@dots{}, @var{class})\n\
 Return a matrix or N-dimensional array whose elements are all 0.\n\
 \n\
 If invoked with a single scalar integer argument, return a square\n\
@@ -4298,11 +4298,11 @@
 @c List other form of function in documentation index\n\
 @findex inf\n\
 \n\
-@deftypefn  {Built-in Function} {} Inf\n\
-@deftypefnx {Built-in Function} {} Inf (@var{n})\n\
-@deftypefnx {Built-in Function} {} Inf (@var{n}, @var{m})\n\
-@deftypefnx {Built-in Function} {} Inf (@var{n}, @var{m}, @var{k}, @dots{})\n\
-@deftypefnx {Built-in Function} {} Inf (@dots{}, @var{class})\n\
+@deftypefn  {} {} Inf\n\
+@deftypefnx {} {} Inf (@var{n})\n\
+@deftypefnx {} {} Inf (@var{n}, @var{m})\n\
+@deftypefnx {} {} Inf (@var{n}, @var{m}, @var{k}, @dots{})\n\
+@deftypefnx {} {} Inf (@dots{}, @var{class})\n\
 Return a scalar, matrix or N-dimensional array whose elements are all equal\n\
 to the IEEE representation for positive infinity.\n\
 \n\
@@ -4359,11 +4359,11 @@
 @c List other form of function in documentation index\n\
 @findex nan\n\
 \n\
-@deftypefn  {Built-in Function} {} NaN\n\
-@deftypefnx {Built-in Function} {} NaN (@var{n})\n\
-@deftypefnx {Built-in Function} {} NaN (@var{n}, @var{m})\n\
-@deftypefnx {Built-in Function} {} NaN (@var{n}, @var{m}, @var{k}, @dots{})\n\
-@deftypefnx {Built-in Function} {} NaN (@dots{}, @var{class})\n\
+@deftypefn  {} {} NaN\n\
+@deftypefnx {} {} NaN (@var{n})\n\
+@deftypefnx {} {} NaN (@var{n}, @var{m})\n\
+@deftypefnx {} {} NaN (@var{n}, @var{m}, @var{k}, @dots{})\n\
+@deftypefnx {} {} NaN (@dots{}, @var{class})\n\
 Return a scalar, matrix, or N-dimensional array whose elements are all equal\n\
 to the IEEE symbol NaN (Not a Number).\n\
 \n\
@@ -4421,11 +4421,11 @@
 
 DEFUN (e, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} e\n\
-@deftypefnx {Built-in Function} {} e (@var{n})\n\
-@deftypefnx {Built-in Function} {} e (@var{n}, @var{m})\n\
-@deftypefnx {Built-in Function} {} e (@var{n}, @var{m}, @var{k}, @dots{})\n\
-@deftypefnx {Built-in Function} {} e (@dots{}, @var{class})\n\
+@deftypefn  {} {} e\n\
+@deftypefnx {} {} e (@var{n})\n\
+@deftypefnx {} {} e (@var{n}, @var{m})\n\
+@deftypefnx {} {} e (@var{n}, @var{m}, @var{k}, @dots{})\n\
+@deftypefnx {} {} e (@dots{}, @var{class})\n\
 Return a scalar, matrix, or N-dimensional array whose elements are all equal\n\
 to the base of natural logarithms.\n\
 \n\
@@ -4462,11 +4462,11 @@
 
 DEFUN (eps, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} eps\n\
-@deftypefnx {Built-in Function} {} eps (@var{x})\n\
-@deftypefnx {Built-in Function} {} eps (@var{n}, @var{m})\n\
-@deftypefnx {Built-in Function} {} eps (@var{n}, @var{m}, @var{k}, @dots{})\n\
-@deftypefnx {Built-in Function} {} eps (@dots{}, @var{class})\n\
+@deftypefn  {} {} eps\n\
+@deftypefnx {} {} eps (@var{x})\n\
+@deftypefnx {} {} eps (@var{n}, @var{m})\n\
+@deftypefnx {} {} eps (@var{n}, @var{m}, @var{k}, @dots{})\n\
+@deftypefnx {} {} eps (@dots{}, @var{class})\n\
 Return a scalar, matrix or N-dimensional array whose elements are all eps,\n\
 the machine precision.\n\
 \n\
@@ -4583,11 +4583,11 @@
 
 DEFUN (pi, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} pi\n\
-@deftypefnx {Built-in Function} {} pi (@var{n})\n\
-@deftypefnx {Built-in Function} {} pi (@var{n}, @var{m})\n\
-@deftypefnx {Built-in Function} {} pi (@var{n}, @var{m}, @var{k}, @dots{})\n\
-@deftypefnx {Built-in Function} {} pi (@dots{}, @var{class})\n\
+@deftypefn  {} {} pi\n\
+@deftypefnx {} {} pi (@var{n})\n\
+@deftypefnx {} {} pi (@var{n}, @var{m})\n\
+@deftypefnx {} {} pi (@var{n}, @var{m}, @var{k}, @dots{})\n\
+@deftypefnx {} {} pi (@dots{}, @var{class})\n\
 Return a scalar, matrix, or N-dimensional array whose elements are all equal\n\
 to the ratio of the circumference of a circle to its\n\
 @tex\n\
@@ -4630,11 +4630,11 @@
 
 DEFUN (realmax, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} realmax\n\
-@deftypefnx {Built-in Function} {} realmax (@var{n})\n\
-@deftypefnx {Built-in Function} {} realmax (@var{n}, @var{m})\n\
-@deftypefnx {Built-in Function} {} realmax (@var{n}, @var{m}, @var{k}, @dots{})\n\
-@deftypefnx {Built-in Function} {} realmax (@dots{}, @var{class})\n\
+@deftypefn  {} {} realmax\n\
+@deftypefnx {} {} realmax (@var{n})\n\
+@deftypefnx {} {} realmax (@var{n}, @var{m})\n\
+@deftypefnx {} {} realmax (@var{n}, @var{m}, @var{k}, @dots{})\n\
+@deftypefnx {} {} realmax (@dots{}, @var{class})\n\
 Return a scalar, matrix, or N-dimensional array whose elements are all equal\n\
 to the largest floating point number that is representable.\n\
 \n\
@@ -4669,11 +4669,11 @@
 
 DEFUN (realmin, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} realmin\n\
-@deftypefnx {Built-in Function} {} realmin (@var{n})\n\
-@deftypefnx {Built-in Function} {} realmin (@var{n}, @var{m})\n\
-@deftypefnx {Built-in Function} {} realmin (@var{n}, @var{m}, @var{k}, @dots{})\n\
-@deftypefnx {Built-in Function} {} realmin (@dots{}, @var{class})\n\
+@deftypefn  {} {} realmin\n\
+@deftypefnx {} {} realmin (@var{n})\n\
+@deftypefnx {} {} realmin (@var{n}, @var{m})\n\
+@deftypefnx {} {} realmin (@var{n}, @var{m}, @var{k}, @dots{})\n\
+@deftypefnx {} {} realmin (@dots{}, @var{class})\n\
 Return a scalar, matrix, or N-dimensional array whose elements are all equal\n\
 to the smallest normalized floating point number that is representable.\n\
 \n\
@@ -4713,11 +4713,11 @@
 @findex j\n\
 @findex J\n\
 \n\
-@deftypefn  {Built-in Function} {} I\n\
-@deftypefnx {Built-in Function} {} I (@var{n})\n\
-@deftypefnx {Built-in Function} {} I (@var{n}, @var{m})\n\
-@deftypefnx {Built-in Function} {} I (@var{n}, @var{m}, @var{k}, @dots{})\n\
-@deftypefnx {Built-in Function} {} I (@dots{}, @var{class})\n\
+@deftypefn  {} {} I\n\
+@deftypefnx {} {} I (@var{n})\n\
+@deftypefnx {} {} I (@var{n}, @var{m})\n\
+@deftypefnx {} {} I (@var{n}, @var{m}, @var{k}, @dots{})\n\
+@deftypefnx {} {} I (@dots{}, @var{class})\n\
 Return a scalar, matrix, or N-dimensional array whose elements are all equal\n\
 to the pure imaginary unit, defined as\n\
 @tex\n\
@@ -4753,11 +4753,11 @@
 
 DEFUN (NA, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} NA\n\
-@deftypefnx {Built-in Function} {} NA (@var{n})\n\
-@deftypefnx {Built-in Function} {} NA (@var{n}, @var{m})\n\
-@deftypefnx {Built-in Function} {} NA (@var{n}, @var{m}, @var{k}, @dots{})\n\
-@deftypefnx {Built-in Function} {} NA (@dots{}, @var{class})\n\
+@deftypefn  {} {} NA\n\
+@deftypefnx {} {} NA (@var{n})\n\
+@deftypefnx {} {} NA (@var{n}, @var{m})\n\
+@deftypefnx {} {} NA (@var{n}, @var{m}, @var{k}, @dots{})\n\
+@deftypefnx {} {} NA (@dots{}, @var{class})\n\
 Return a scalar, matrix, or N-dimensional array whose elements are all equal\n\
 to the special constant used to designate missing values.\n\
 \n\
@@ -4789,9 +4789,9 @@
 
 DEFUN (false, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} false (@var{x})\n\
-@deftypefnx {Built-in Function} {} false (@var{n}, @var{m})\n\
-@deftypefnx {Built-in Function} {} false (@var{n}, @var{m}, @var{k}, @dots{})\n\
+@deftypefn  {} {} false (@var{x})\n\
+@deftypefnx {} {} false (@var{n}, @var{m})\n\
+@deftypefnx {} {} false (@var{n}, @var{m}, @var{k}, @dots{})\n\
 Return a matrix or N-dimensional array whose elements are all logical 0.\n\
 \n\
 If invoked with a single scalar integer argument, return a square\n\
@@ -4807,9 +4807,9 @@
 
 DEFUN (true, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} true (@var{x})\n\
-@deftypefnx {Built-in Function} {} true (@var{n}, @var{m})\n\
-@deftypefnx {Built-in Function} {} true (@var{n}, @var{m}, @var{k}, @dots{})\n\
+@deftypefn  {} {} true (@var{x})\n\
+@deftypefnx {} {} true (@var{n}, @var{m})\n\
+@deftypefnx {} {} true (@var{n}, @var{m}, @var{k}, @dots{})\n\
 Return a matrix or N-dimensional array whose elements are all logical 1.\n\
 \n\
 If invoked with a single scalar integer argument, return a square\n\
@@ -4937,10 +4937,10 @@
 
 DEFUN (eye, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} eye (@var{n})\n\
-@deftypefnx {Built-in Function} {} eye (@var{m}, @var{n})\n\
-@deftypefnx {Built-in Function} {} eye ([@var{m} @var{n}])\n\
-@deftypefnx {Built-in Function} {} eye (@dots{}, @var{class})\n\
+@deftypefn  {} {} eye (@var{n})\n\
+@deftypefnx {} {} eye (@var{m}, @var{n})\n\
+@deftypefnx {} {} eye ([@var{m} @var{n}])\n\
+@deftypefnx {} {} eye (@dots{}, @var{class})\n\
 Return an identity matrix.\n\
 \n\
 If invoked with a single scalar argument @var{n}, return a square\n\
@@ -5083,8 +5083,8 @@
 
 DEFUN (linspace, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} linspace (@var{base}, @var{limit})\n\
-@deftypefnx {Built-in Function} {} linspace (@var{base}, @var{limit}, @var{n})\n\
+@deftypefn  {} {} linspace (@var{base}, @var{limit})\n\
+@deftypefnx {} {} linspace (@var{base}, @var{limit}, @var{n})\n\
 Return a row vector with @var{n} linearly spaced elements between\n\
 @var{base} and @var{limit}.\n\
 \n\
@@ -5217,9 +5217,9 @@
 
 DEFUN (resize, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} resize (@var{x}, @var{m})\n\
-@deftypefnx {Built-in Function} {} resize (@var{x}, @var{m}, @var{n}, @dots{})\n\
-@deftypefnx {Built-in Function} {} resize (@var{x}, [@var{m} @var{n} @dots{}])\n\
+@deftypefn  {} {} resize (@var{x}, @var{m})\n\
+@deftypefnx {} {} resize (@var{x}, @var{m}, @var{n}, @dots{})\n\
+@deftypefnx {} {} resize (@var{x}, [@var{m} @var{n} @dots{}])\n\
 Resize @var{x} cutting off elements as necessary.\n\
 \n\
 In the result, element with certain indices is equal to the corresponding\n\
@@ -5307,10 +5307,10 @@
 
 DEFUN (reshape, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} reshape (@var{A}, @var{m}, @var{n}, @dots{})\n\
-@deftypefnx {Built-in Function} {} reshape (@var{A}, [@var{m} @var{n} @dots{}])\n\
-@deftypefnx {Built-in Function} {} reshape (@var{A}, @dots{}, [], @dots{})\n\
-@deftypefnx {Built-in Function} {} reshape (@var{A}, @var{size})\n\
+@deftypefn  {} {} reshape (@var{A}, @var{m}, @var{n}, @dots{})\n\
+@deftypefnx {} {} reshape (@var{A}, [@var{m} @var{n} @dots{}])\n\
+@deftypefnx {} {} reshape (@var{A}, @dots{}, [], @dots{})\n\
+@deftypefnx {} {} reshape (@var{A}, @var{size})\n\
 Return a matrix with the specified dimensions (@var{m}, @var{n}, @dots{})\n\
 whose elements are taken from the matrix @var{A}.\n\
 \n\
@@ -5454,8 +5454,8 @@
 
 DEFUN (vec, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{v} =} vec (@var{x})\n\
-@deftypefnx {Built-in Function} {@var{v} =} vec (@var{x}, @var{dim})\n\
+@deftypefn  {} {@var{v} =} vec (@var{x})\n\
+@deftypefnx {} {@var{v} =} vec (@var{x}, @var{dim})\n\
 Return the vector obtained by stacking the columns of the matrix @var{x}\n\
 one above the other.\n\
 \n\
@@ -5520,7 +5520,7 @@
 
 DEFUN (squeeze, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} squeeze (@var{x})\n\
+@deftypefn {} {} squeeze (@var{x})\n\
 Remove singleton dimensions from @var{x} and return the result.\n\
 \n\
 Note that for compatibility with @sc{matlab}, all objects have\n\
@@ -5536,7 +5536,7 @@
 
 DEFUN (full, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{FM} =} full (@var{SM})\n\
+@deftypefn {} {@var{FM} =} full (@var{SM})\n\
 Return a full storage matrix from a sparse, diagonal, or permutation matrix,\n\
 or a range.\n\
 @seealso{sparse, issparse}\n\
@@ -5552,9 +5552,9 @@
 
 DEFUN (norm, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} norm (@var{A})\n\
-@deftypefnx {Built-in Function} {} norm (@var{A}, @var{p})\n\
-@deftypefnx {Built-in Function} {} norm (@var{A}, @var{p}, @var{opt})\n\
+@deftypefn  {} {} norm (@var{A})\n\
+@deftypefnx {} {} norm (@var{A}, @var{p})\n\
+@deftypefnx {} {} norm (@var{A}, @var{p}, @var{opt})\n\
 Compute the p-norm of the matrix @var{A}.\n\
 \n\
 If the second argument is missing, @w{@code{p = 2}} is assumed.\n\
@@ -5774,7 +5774,7 @@
 
 DEFUN (not, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{z} =} not (@var{x})\n\
+@deftypefn {} {@var{z} =} not (@var{x})\n\
 Return the logical NOT of @var{x}.\n\
 \n\
 This function is equivalent to the operator syntax @w{@code{! x}}.\n\
@@ -5786,7 +5786,7 @@
 
 DEFUN (uplus, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} uplus (@var{x})\n\
+@deftypefn {} {} uplus (@var{x})\n\
 This function and @w{@tcode{+ x}} are equivalent.\n\
 @seealso{uminus, plus, minus}\n\
 @end deftypefn")
@@ -5796,7 +5796,7 @@
 
 DEFUN (uminus, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} uminus (@var{x})\n\
+@deftypefn {} {} uminus (@var{x})\n\
 This function and @w{@tcode{- x}} are equivalent.\n\
 @seealso{uplus, minus}\n\
 @end deftypefn")
@@ -5806,7 +5806,7 @@
 
 DEFUN (transpose, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} transpose (@var{x})\n\
+@deftypefn {} {} transpose (@var{x})\n\
 Return the transpose of @var{x}.\n\
 \n\
 This function and @tcode{x.'} are equivalent.\n\
@@ -5838,7 +5838,7 @@
 
 DEFUN (ctranspose, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} ctranspose (@var{x})\n\
+@deftypefn {} {} ctranspose (@var{x})\n\
 Return the complex conjugate transpose of @var{x}.\n\
 \n\
 This function and @tcode{x'} are equivalent.\n\
@@ -5907,8 +5907,8 @@
 
 DEFUN (plus, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} plus (@var{x}, @var{y})\n\
-@deftypefnx {Built-in Function} {} plus (@var{x1}, @var{x2}, @dots{})\n\
+@deftypefn  {} {} plus (@var{x}, @var{y})\n\
+@deftypefnx {} {} plus (@var{x1}, @var{x2}, @dots{})\n\
 This function and @w{@tcode{x + y}} are equivalent.\n\
 \n\
 If more arguments are given, the summation is applied\n\
@@ -5928,7 +5928,7 @@
 
 DEFUN (minus, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} minus (@var{x}, @var{y})\n\
+@deftypefn {} {} minus (@var{x}, @var{y})\n\
 This function and @w{@tcode{x - y}} are equivalent.\n\
 @seealso{plus, uminus}\n\
 @end deftypefn")
@@ -5938,8 +5938,8 @@
 
 DEFUN (mtimes, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} mtimes (@var{x}, @var{y})\n\
-@deftypefnx {Built-in Function} {} mtimes (@var{x1}, @var{x2}, @dots{})\n\
+@deftypefn  {} {} mtimes (@var{x}, @var{y})\n\
+@deftypefnx {} {} mtimes (@var{x1}, @var{x2}, @dots{})\n\
 Return the matrix multiplication product of inputs.\n\
 \n\
 This function and @w{@tcode{x * y}} are equivalent.\n\
@@ -5960,7 +5960,7 @@
 
 DEFUN (mrdivide, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} mrdivide (@var{x}, @var{y})\n\
+@deftypefn {} {} mrdivide (@var{x}, @var{y})\n\
 Return the matrix right division of @var{x} and @var{y}.\n\
 \n\
 This function and @w{@tcode{x / y}} are equivalent.\n\
@@ -5972,7 +5972,7 @@
 
 DEFUN (mpower, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} mpower (@var{x}, @var{y})\n\
+@deftypefn {} {} mpower (@var{x}, @var{y})\n\
 Return the matrix power operation of @var{x} raised to the @var{y} power.\n\
 \n\
 This function and @w{@tcode{x ^ y}} are equivalent.\n\
@@ -5984,7 +5984,7 @@
 
 DEFUN (mldivide, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} mldivide (@var{x}, @var{y})\n\
+@deftypefn {} {} mldivide (@var{x}, @var{y})\n\
 Return the matrix left division of @var{x} and @var{y}.\n\
 \n\
 This function and @w{@tcode{x @xbackslashchar{} y}} are equivalent.\n\
@@ -5996,7 +5996,7 @@
 
 DEFUN (lt, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} lt (@var{x}, @var{y})\n\
+@deftypefn {} {} lt (@var{x}, @var{y})\n\
 This function is equivalent to @w{@code{x < y}}.\n\
 @seealso{le, eq, ge, gt, ne}\n\
 @end deftypefn")
@@ -6006,7 +6006,7 @@
 
 DEFUN (le, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} le (@var{x}, @var{y})\n\
+@deftypefn {} {} le (@var{x}, @var{y})\n\
 This function is equivalent to @w{@code{x <= y}}.\n\
 @seealso{eq, ge, gt, ne, lt}\n\
 @end deftypefn")
@@ -6016,7 +6016,7 @@
 
 DEFUN (eq, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} eq (@var{x}, @var{y})\n\
+@deftypefn {} {} eq (@var{x}, @var{y})\n\
 Return true if the two inputs are equal.\n\
 \n\
 This function is equivalent to @w{@code{x == y}}.\n\
@@ -6028,7 +6028,7 @@
 
 DEFUN (ge, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} ge (@var{x}, @var{y})\n\
+@deftypefn {} {} ge (@var{x}, @var{y})\n\
 This function is equivalent to @w{@code{x >= y}}.\n\
 @seealso{le, eq, gt, ne, lt}\n\
 @end deftypefn")
@@ -6038,7 +6038,7 @@
 
 DEFUN (gt, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} gt (@var{x}, @var{y})\n\
+@deftypefn {} {} gt (@var{x}, @var{y})\n\
 This function is equivalent to @w{@code{x > y}}.\n\
 @seealso{le, eq, ge, ne, lt}\n\
 @end deftypefn")
@@ -6048,7 +6048,7 @@
 
 DEFUN (ne, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} ne (@var{x}, @var{y})\n\
+@deftypefn {} {} ne (@var{x}, @var{y})\n\
 Return true if the two inputs are not equal.\n\
 \n\
 This function is equivalent to @w{@code{x != y}}.\n\
@@ -6060,8 +6060,8 @@
 
 DEFUN (times, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} times (@var{x}, @var{y})\n\
-@deftypefnx {Built-in Function} {} times (@var{x1}, @var{x2}, @dots{})\n\
+@deftypefn  {} {} times (@var{x}, @var{y})\n\
+@deftypefnx {} {} times (@var{x1}, @var{x2}, @dots{})\n\
 Return the element-by-element multiplication product of inputs.\n\
 \n\
 This function and @w{@tcode{x .* y}} are equivalent.\n\
@@ -6082,7 +6082,7 @@
 
 DEFUN (rdivide, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} rdivide (@var{x}, @var{y})\n\
+@deftypefn {} {} rdivide (@var{x}, @var{y})\n\
 Return the element-by-element right division of @var{x} and @var{y}.\n\
 \n\
 This function and @w{@tcode{x ./ y}} are equivalent.\n\
@@ -6094,7 +6094,7 @@
 
 DEFUN (power, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} power (@var{x}, @var{y})\n\
+@deftypefn {} {} power (@var{x}, @var{y})\n\
 Return the element-by-element operation of @var{x} raised to the\n\
 @var{y} power.\n\
 \n\
@@ -6112,7 +6112,7 @@
 
 DEFUN (ldivide, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} ldivide (@var{x}, @var{y})\n\
+@deftypefn {} {} ldivide (@var{x}, @var{y})\n\
 Return the element-by-element left division of @var{x} and @var{y}.\n\
 \n\
 This function and @w{@tcode{x .@xbackslashchar{} y}} are equivalent.\n\
@@ -6124,8 +6124,8 @@
 
 DEFUN (and, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{z} =} and (@var{x}, @var{y})\n\
-@deftypefnx {Built-in Function} {@var{z} =} and (@var{x1}, @var{x2}, @dots{})\n\
+@deftypefn  {} {@var{z} =} and (@var{x}, @var{y})\n\
+@deftypefnx {} {@var{z} =} and (@var{x1}, @var{x2}, @dots{})\n\
 Return the logical AND of @var{x} and @var{y}.\n\
 \n\
 This function is equivalent to the operator syntax @w{@code{x & y}}.  If\n\
@@ -6146,8 +6146,8 @@
 
 DEFUN (or, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{z} =} or (@var{x}, @var{y})\n\
-@deftypefnx {Built-in Function} {@var{z} =} or (@var{x1}, @var{x2}, @dots{})\n\
+@deftypefn  {} {@var{z} =} or (@var{x}, @var{y})\n\
+@deftypefnx {} {@var{z} =} or (@var{x1}, @var{x2}, @dots{})\n\
 Return the logical OR of @var{x} and @var{y}.\n\
 \n\
 This function is equivalent to the operator syntax @w{@code{x | y}}.  If\n\
@@ -6168,8 +6168,8 @@
 
 DEFUN (colon, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{r} =} colon (@var{base}, @var{limit})\n\
-@deftypefnx {Built-in Function} {@var{r} =} colon (@var{base}, @var{increment}, @var{limit})\n\
+@deftypefn  {} {@var{r} =} colon (@var{base}, @var{limit})\n\
+@deftypefnx {} {@var{r} =} colon (@var{base}, @var{increment}, @var{limit})\n\
 Return the result of the colon expression corresponding to @var{base},\n\
 @var{limit}, and optionally, @var{increment}.\n\
 \n\
@@ -6191,11 +6191,11 @@
 
 DEFUN (tic, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} tic ()\n\
-@deftypefnx {Built-in Function} {@var{id} =} tic ()\n\
-@deftypefnx {Built-in Function} {} toc ()\n\
-@deftypefnx {Built-in Function} {} toc (@var{id})\n\
-@deftypefnx {Built-in Function} {@var{val} =} toc (@dots{})\n\
+@deftypefn  {} {} tic ()\n\
+@deftypefnx {} {@var{id} =} tic ()\n\
+@deftypefnx {} {} toc ()\n\
+@deftypefnx {} {} toc (@var{id})\n\
+@deftypefnx {} {@var{val} =} toc (@dots{})\n\
 Set or check a wall-clock timer.\n\
 \n\
 Calling @code{tic} without an output argument sets the internal timer state.\n\
@@ -6260,9 +6260,9 @@
 
 DEFUN (toc, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} toc ()\n\
-@deftypefnx {Built-in Function} {} toc (@var{id})\n\
-@deftypefnx {Built-in Function} {@var{val} =} toc (@dots{})\n\
+@deftypefn  {} {} toc ()\n\
+@deftypefnx {} {} toc (@var{id})\n\
+@deftypefnx {} {@var{val} =} toc (@dots{})\n\
 @seealso{tic, cputime}\n\
 @end deftypefn")
 {
@@ -6316,7 +6316,7 @@
 
 DEFUN (cputime, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{total}, @var{user}, @var{system}] =} cputime ();\n\
+@deftypefn {} {[@var{total}, @var{user}, @var{system}] =} cputime ();\n\
 Return the CPU time used by your Octave session.\n\
 \n\
 The first output is the total time spent executing your process and is equal\n\
@@ -6387,10 +6387,10 @@
 
 DEFUN (sort, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{s}, @var{i}] =} sort (@var{x})\n\
-@deftypefnx {Built-in Function} {[@var{s}, @var{i}] =} sort (@var{x}, @var{dim})\n\
-@deftypefnx {Built-in Function} {[@var{s}, @var{i}] =} sort (@var{x}, @var{mode})\n\
-@deftypefnx {Built-in Function} {[@var{s}, @var{i}] =} sort (@var{x}, @var{dim}, @var{mode})\n\
+@deftypefn  {} {[@var{s}, @var{i}] =} sort (@var{x})\n\
+@deftypefnx {} {[@var{s}, @var{i}] =} sort (@var{x}, @var{dim})\n\
+@deftypefnx {} {[@var{s}, @var{i}] =} sort (@var{x}, @var{mode})\n\
+@deftypefnx {} {[@var{s}, @var{i}] =} sort (@var{x}, @var{dim}, @var{mode})\n\
 Return a copy of @var{x} with the elements arranged in increasing order.\n\
 \n\
 For matrices, @code{sort} orders the elements within columns\n\
@@ -6709,7 +6709,7 @@
 
 DEFUN (__sort_rows_idx__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __sort_rows_idx__ (@var{a}, @var{mode})\n\
+@deftypefn {} {} __sort_rows_idx__ (@var{a}, @var{mode})\n\
 Undocumented internal function.\n\
 @end deftypefn\n")
 {
@@ -6778,9 +6778,9 @@
 
 DEFUN (issorted, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} issorted (@var{a})\n\
-@deftypefnx {Built-in Function} {} issorted (@var{a}, @var{mode})\n\
-@deftypefnx {Built-in Function} {} issorted (@var{a}, \"rows\", @var{mode})\n\
+@deftypefn  {} {} issorted (@var{a})\n\
+@deftypefnx {} {} issorted (@var{a}, @var{mode})\n\
+@deftypefnx {} {} issorted (@var{a}, \"rows\", @var{mode})\n\
 Return true if the array is sorted according to @var{mode}, which\n\
 may be either @qcode{\"ascending\"}, @qcode{\"descending\"}, or\n\
 @qcode{\"either\"}.\n\
@@ -6891,8 +6891,8 @@
 
 DEFUN (nth_element, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} nth_element (@var{x}, @var{n})\n\
-@deftypefnx {Built-in Function} {} nth_element (@var{x}, @var{n}, @var{dim})\n\
+@deftypefn  {} {} nth_element (@var{x}, @var{n})\n\
+@deftypefnx {} {} nth_element (@var{x}, @var{n}, @var{dim})\n\
 Select the n-th smallest element of a vector, using the ordering defined by\n\
 @code{sort}.\n\
 \n\
@@ -7005,7 +7005,7 @@
 
 DEFUN (__accumarray_sum__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __accumarray_sum__ (@var{idx}, @var{vals}, @var{n})\n\
+@deftypefn {} {} __accumarray_sum__ (@var{idx}, @var{vals}, @var{n})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -7179,7 +7179,7 @@
 
 DEFUN (__accumarray_min__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __accumarray_min__ (@var{idx}, @var{vals}, @var{zero}, @var{n})\n\
+@deftypefn {} {} __accumarray_min__ (@var{idx}, @var{vals}, @var{zero}, @var{n})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -7188,7 +7188,7 @@
 
 DEFUN (__accumarray_max__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __accumarray_max__ (@var{idx}, @var{vals}, @var{zero}, @var{n})\n\
+@deftypefn {} {} __accumarray_max__ (@var{idx}, @var{vals}, @var{zero}, @var{n})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -7228,7 +7228,7 @@
 
 DEFUN (__accumdim_sum__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __accumdim_sum__ (@var{idx}, @var{vals}, @var{dim}, @var{n})\n\
+@deftypefn {} {} __accumdim_sum__ (@var{idx}, @var{vals}, @var{dim}, @var{n})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -7354,8 +7354,8 @@
 
 DEFUN (merge, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} merge (@var{mask}, @var{tval}, @var{fval})\n\
-@deftypefnx {Built-in Function} {} ifelse (@var{mask}, @var{tval}, @var{fval})\n\
+@deftypefn  {} {} merge (@var{mask}, @var{tval}, @var{fval})\n\
+@deftypefnx {} {} ifelse (@var{mask}, @var{tval}, @var{fval})\n\
 Merge elements of @var{true_val} and @var{false_val}, depending on the\n\
 value of @var{mask}.\n\
 \n\
@@ -7585,9 +7585,9 @@
 
 DEFUN (diff, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} diff (@var{x})\n\
-@deftypefnx {Built-in Function} {} diff (@var{x}, @var{k})\n\
-@deftypefnx {Built-in Function} {} diff (@var{x}, @var{k}, @var{dim})\n\
+@deftypefn  {} {} diff (@var{x})\n\
+@deftypefnx {} {} diff (@var{x}, @var{k})\n\
+@deftypefnx {} {} diff (@var{x}, @var{k}, @var{dim})\n\
 If @var{x} is a vector of length @math{n}, @w{@code{diff (@var{x})}} is the\n\
 vector of first differences\n\
 @tex\n\
@@ -7701,7 +7701,7 @@
 
 DEFUN (repelems, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} repelems (@var{x}, @var{r})\n\
+@deftypefn {} {} repelems (@var{x}, @var{r})\n\
 Construct a vector of repeated elements from @var{x}.\n\
 \n\
 @var{r} is a 2x@var{N} integer matrix specifying which elements to repeat and\n\
@@ -7788,7 +7788,7 @@
 
 DEFUN (base64_encode, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{s} =} base64_encode (@var{x})\n\
+@deftypefn {} {@var{s} =} base64_encode (@var{x})\n\
 Encode a double matrix or array @var{x} into the base64 format string\n\
 @var{s}.\n\
 \n\
@@ -7886,8 +7886,8 @@
 
 DEFUN (base64_decode, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{x} =} base64_decode (@var{s})\n\
-@deftypefnx {Built-in Function} {@var{x} =} base64_decode (@var{s}, @var{dims})\n\
+@deftypefn  {} {@var{x} =} base64_decode (@var{s})\n\
+@deftypefnx {} {@var{x} =} base64_decode (@var{s}, @var{dims})\n\
 Decode the double matrix or array @var{x} from the base64 encoded string\n\
 @var{s}.\n\
 \n\
--- a/libinterp/corefcn/debug.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/debug.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -588,15 +588,15 @@
 
 DEFUN (dbstop, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} dbstop @var{func}\n\
-@deftypefnx {Command} {} dbstop @var{func} @var{line}\n\
-@deftypefnx {Command} {} dbstop @var{func} @var{line1} @var{line2} @dots{}\n\
-@deftypefnx {Command} {} dbstop @var{line} @dots{}\n\
-@deftypefnx {Built-in Function} {@var{rline} =} dbstop (\"@var{func}\")\n\
-@deftypefnx {Built-in Function} {@var{rline} =} dbstop (\"@var{func}\", @var{line})\n\
-@deftypefnx {Built-in Function} {@var{rline} =} dbstop (\"@var{func}\", @var{line1}, @var{line2}, @dots{})\n\
-@deftypefnx {Built-in Function} {} dbstop (\"@var{func}\", [@var{line1}, @dots{}])\n\
-@deftypefnx {Built-in Function} {} dbstop (@var{line}, @dots{})\n\
+@deftypefn  {} {} dbstop @var{func}\n\
+@deftypefnx {} {} dbstop @var{func} @var{line}\n\
+@deftypefnx {} {} dbstop @var{func} @var{line1} @var{line2} @dots{}\n\
+@deftypefnx {} {} dbstop @var{line} @dots{}\n\
+@deftypefnx {} {@var{rline} =} dbstop (\"@var{func}\")\n\
+@deftypefnx {} {@var{rline} =} dbstop (\"@var{func}\", @var{line})\n\
+@deftypefnx {} {@var{rline} =} dbstop (\"@var{func}\", @var{line1}, @var{line2}, @dots{})\n\
+@deftypefnx {} {} dbstop (\"@var{func}\", [@var{line1}, @dots{}])\n\
+@deftypefnx {} {} dbstop (@var{line}, @dots{})\n\
 Set a breakpoint at line number @var{line} in function @var{func}.\n\
 \n\
 Arguments are\n\
@@ -637,17 +637,17 @@
 
 DEFUN (dbclear, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} dbclear @var{func}\n\
-@deftypefnx {Command} {} dbclear @var{func} @var{line}\n\
-@deftypefnx {Command} {} dbclear @var{func} @var{line1} @var{line2} @dots{}\n\
-@deftypefnx {Command} {} dbclear @var{line} @dots{}\n\
-@deftypefnx {Command} {} dbclear all\n\
-@deftypefnx {Built-in Function} {} dbclear (\"@var{func}\")\n\
-@deftypefnx {Built-in Function} {} dbclear (\"@var{func}\", @var{line})\n\
-@deftypefnx {Built-in Function} {} dbclear (\"@var{func}\", @var{line1}, @var{line2}, @dots{})\n\
-@deftypefnx {Built-in Function} {} dbclear (\"@var{func}\", [@var{line1}, @dots{}])\n\
-@deftypefnx {Built-in Function} {} dbclear (@var{line}, @dots{})\n\
-@deftypefnx {Built-in Function} {} dbclear (\"all\")\n\
+@deftypefn  {} {} dbclear @var{func}\n\
+@deftypefnx {} {} dbclear @var{func} @var{line}\n\
+@deftypefnx {} {} dbclear @var{func} @var{line1} @var{line2} @dots{}\n\
+@deftypefnx {} {} dbclear @var{line} @dots{}\n\
+@deftypefnx {} {} dbclear all\n\
+@deftypefnx {} {} dbclear (\"@var{func}\")\n\
+@deftypefnx {} {} dbclear (\"@var{func}\", @var{line})\n\
+@deftypefnx {} {} dbclear (\"@var{func}\", @var{line1}, @var{line2}, @dots{})\n\
+@deftypefnx {} {} dbclear (\"@var{func}\", [@var{line1}, @dots{}])\n\
+@deftypefnx {} {} dbclear (@var{line}, @dots{})\n\
+@deftypefnx {} {} dbclear (\"all\")\n\
 Delete a breakpoint at line number @var{line} in the function @var{func}.\n\
 \n\
 Arguments are\n\
@@ -688,9 +688,9 @@
 
 DEFUN (dbstatus, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} dbstatus ()\n\
-@deftypefnx {Built-in Function} {@var{brk_list} =} dbstatus ()\n\
-@deftypefnx {Built-in Function} {@var{brk_list} =} dbstatus (\"@var{func}\")\n\
+@deftypefn  {} {} dbstatus ()\n\
+@deftypefnx {} {@var{brk_list} =} dbstatus ()\n\
+@deftypefnx {} {@var{brk_list} =} dbstatus (\"@var{func}\")\n\
 Report the location of active breakpoints.\n\
 \n\
 When called with no input or output arguments, print the list of all\n\
@@ -808,7 +808,7 @@
 
 DEFUN (dbwhere, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Command} {} dbwhere\n\
+@deftypefn {} {} dbwhere\n\
 In debugging mode, report the current file and line number where execution\n\
 is stopped.\n\
 @seealso{dbstatus, dbcont, dbstep, dbup}\n\
@@ -889,14 +889,14 @@
 
 DEFUN (dbtype, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} dbtype\n\
-@deftypefnx {Command} {} dbtype @var{lineno}\n\
-@deftypefnx {Command} {} dbtype @var{startl:endl}\n\
-@deftypefnx {Command} {} dbtype @var{startl:end}\n\
-@deftypefnx {Command} {} dbtype @var{func}\n\
-@deftypefnx {Command} {} dbtype @var{func} @var{lineno}\n\
-@deftypefnx {Command} {} dbtype @var{func} @var{startl:endl}\n\
-@deftypefnx {Command} {} dbtype @var{func} @var{startl:end}\n\
+@deftypefn  {} {} dbtype\n\
+@deftypefnx {} {} dbtype @var{lineno}\n\
+@deftypefnx {} {} dbtype @var{startl:endl}\n\
+@deftypefnx {} {} dbtype @var{startl:end}\n\
+@deftypefnx {} {} dbtype @var{func}\n\
+@deftypefnx {} {} dbtype @var{func} @var{lineno}\n\
+@deftypefnx {} {} dbtype @var{func} @var{startl:endl}\n\
+@deftypefnx {} {} dbtype @var{func} @var{startl:end}\n\
 Display a script file with line numbers.\n\
 \n\
 When called with no arguments in debugging mode, display the script file\n\
@@ -1039,8 +1039,8 @@
 
 DEFUN (dblist, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} dblist\n\
-@deftypefnx {Command} {} dblist @var{n}\n\
+@deftypefn  {} {} dblist\n\
+@deftypefnx {} {} dblist @var{n}\n\
 In debugging mode, list @var{n} lines of the function being debugged\n\
 centered around the current line to be executed.\n\
 \n\
@@ -1232,10 +1232,10 @@
 
 DEFUN (dbstack, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} dbstack\n\
-@deftypefnx {Command} {} dbstack @var{n}\n\
-@deftypefnx {Command} {} dbstack @var{-completenames}\n\
-@deftypefnx {Built-in Function} {[@var{stack}, @var{idx}] =} dbstack (@dots{})\n\
+@deftypefn  {} {} dbstack\n\
+@deftypefnx {} {} dbstack @var{n}\n\
+@deftypefnx {} {} dbstack @var{-completenames}\n\
+@deftypefnx {} {[@var{stack}, @var{idx}] =} dbstack (@dots{})\n\
 Display or return current debugging function stack information.\n\
 \n\
 With optional argument @var{n}, omit the @var{n} innermost stack frames.\n\
@@ -1305,8 +1305,8 @@
 
 DEFUN (dbup, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} dbup\n\
-@deftypefnx {Command} {} dbup @var{n}\n\
+@deftypefn  {} {} dbup\n\
+@deftypefnx {} {} dbup @var{n}\n\
 In debugging mode, move up the execution stack @var{n} frames.\n\
 \n\
 If @var{n} is omitted, move up one frame.\n\
@@ -1322,8 +1322,8 @@
 
 DEFUN (dbdown, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} dbdown\n\
-@deftypefnx {Command} {} dbdown @var{n}\n\
+@deftypefn  {} {} dbdown\n\
+@deftypefnx {} {} dbdown @var{n}\n\
 In debugging mode, move down the execution stack @var{n} frames.\n\
 \n\
 If @var{n} is omitted, move down one frame.\n\
@@ -1339,11 +1339,11 @@
 
 DEFUN (dbstep, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} dbstep\n\
-@deftypefnx {Command} {} dbstep @var{n}\n\
-@deftypefnx {Command} {} dbstep in\n\
-@deftypefnx {Command} {} dbstep out\n\
-@deftypefnx {Command} {} dbnext @dots{}\n\
+@deftypefn  {} {} dbstep\n\
+@deftypefnx {} {} dbstep @var{n}\n\
+@deftypefnx {} {} dbstep in\n\
+@deftypefnx {} {} dbstep out\n\
+@deftypefnx {} {} dbnext @dots{}\n\
 In debugging mode, execute the next @var{n} lines of code.\n\
 \n\
 If @var{n} is omitted, execute the next single line of code.  If the next\n\
@@ -1414,7 +1414,7 @@
 
 DEFUN (dbcont, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Command} {} dbcont\n\
+@deftypefn {} {} dbcont\n\
 Leave command-line debugging mode and continue code execution normally.\n\
 @seealso{dbstep, dbquit}\n\
 @end deftypefn")
@@ -1436,7 +1436,7 @@
 
 DEFUN (dbquit, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Command} {} dbquit\n\
+@deftypefn {} {} dbquit\n\
 Quit debugging mode immediately without further code execution and return to\n\
 the Octave prompt.\n\
 @seealso{dbcont, dbstep}\n\
@@ -1461,7 +1461,7 @@
 
 DEFUN (isdebugmode, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isdebugmode ()\n\
+@deftypefn {} {} isdebugmode ()\n\
 Return true if in debugging mode, otherwise false.\n\
 @seealso{dbwhere, dbstack, dbstatus}\n\
 @end deftypefn")
@@ -1474,8 +1474,8 @@
 
 DEFUN (__db_next_breakpoint_quiet__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} __db_next_breakpoint_quiet__ ()\n\
-@deftypefnx {Built-in Function} {} __db_next_breakpoint_quiet__ (@var{flag})\n\
+@deftypefn  {} {} __db_next_breakpoint_quiet__ ()\n\
+@deftypefnx {} {} __db_next_breakpoint_quiet__ (@var{flag})\n\
 Disable line info printing at the next breakpoint.\n\
 \n\
 With a logical argument @var{flag}, set the state on or off.\n\
--- a/libinterp/corefcn/defaults.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/defaults.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -476,9 +476,9 @@
 
 DEFUN (EDITOR, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} EDITOR ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} EDITOR (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} EDITOR (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} EDITOR ()\n\
+@deftypefnx {} {@var{old_val} =} EDITOR (@var{new_val})\n\
+@deftypefnx {} {} EDITOR (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the default text editor.\n\
 \n\
 The default value is taken from the environment variable @w{@env{EDITOR}}\n\
@@ -509,9 +509,9 @@
 
 DEFUN (EXEC_PATH, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} EXEC_PATH ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} EXEC_PATH (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} EXEC_PATH (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} EXEC_PATH ()\n\
+@deftypefnx {} {@var{old_val} =} EXEC_PATH (@var{new_val})\n\
+@deftypefnx {} {} EXEC_PATH (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies a colon separated\n\
 list of directories to append to the shell PATH when executing external\n\
 programs.\n\
@@ -549,9 +549,9 @@
 
 DEFUN (IMAGE_PATH, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} IMAGE_PATH ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} IMAGE_PATH (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} IMAGE_PATH (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} IMAGE_PATH ()\n\
+@deftypefnx {} {@var{old_val} =} IMAGE_PATH (@var{new_val})\n\
+@deftypefnx {} {} IMAGE_PATH (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies a colon separated\n\
 list of directories in which to search for image files.\n\
 \n\
@@ -579,7 +579,7 @@
 
 DEFUN (OCTAVE_HOME, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} OCTAVE_HOME ()\n\
+@deftypefn {} {} OCTAVE_HOME ()\n\
 Return the name of the top-level Octave installation directory.\n\
 @seealso{EXEC_PATH, IMAGE_PATH}\n\
 @end deftypefn")
@@ -597,7 +597,7 @@
 
 DEFUNX ("OCTAVE_VERSION", FOCTAVE_VERSION, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} OCTAVE_VERSION ()\n\
+@deftypefn {} {} OCTAVE_VERSION ()\n\
 Return the version number of Octave as a string.\n\
 @seealso{ver, version}\n\
 @end deftypefn")
--- a/libinterp/corefcn/det.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/det.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -49,8 +49,8 @@
 
 DEFUN (det, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} det (@var{A})\n\
-@deftypefnx {Built-in Function} {[@var{d}, @var{rcond}] =} det (@var{A})\n\
+@deftypefn  {} {} det (@var{A})\n\
+@deftypefnx {} {[@var{d}, @var{rcond}] =} det (@var{A})\n\
 Compute the determinant of @var{A}.\n\
 \n\
 Return an estimate of the reciprocal condition number if requested.\n\
--- a/libinterp/corefcn/dirfns.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/dirfns.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -94,10 +94,10 @@
 
 DEFUN (cd, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} cd @var{dir}\n\
-@deftypefnx {Command} {} cd\n\
-@deftypefnx {Built-in Function} {@var{old_dir} =} cd (@var{dir})\n\
-@deftypefnx {Command} {} chdir @dots{}\n\
+@deftypefn  {} {} cd @var{dir}\n\
+@deftypefnx {} {} cd\n\
+@deftypefnx {} {@var{old_dir} =} cd (@var{dir})\n\
+@deftypefnx {} {} chdir @dots{}\n\
 Change the current working directory to @var{dir}.\n\
 \n\
 If @var{dir} is omitted, the current directory is changed to the user's home\n\
@@ -154,8 +154,8 @@
 
 DEFUN (pwd, , ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} pwd ()\n\
-@deftypefnx {Built-in Function} {@var{dir} =} pwd ()\n\
+@deftypefn  {} {} pwd ()\n\
+@deftypefnx {} {@var{dir} =} pwd ()\n\
 Return the current working directory.\n\
 @seealso{cd, dir, ls, mkdir, rmdir}\n\
 @end deftypefn")
@@ -165,8 +165,8 @@
 
 DEFUN (readdir, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{files} =} readdir (@var{dir})\n\
-@deftypefnx {Built-in Function} {[@var{files}, @var{err}, @var{msg}] =} readdir (@var{dir})\n\
+@deftypefn  {} {@var{files} =} readdir (@var{dir})\n\
+@deftypefnx {} {[@var{files}, @var{err}, @var{msg}] =} readdir (@var{dir})\n\
 Return the names of files in the directory @var{dir} as a cell array of\n\
 strings.\n\
 \n\
@@ -207,9 +207,9 @@
 
 DEFUNX ("mkdir", Fmkdir, args, ,
         "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} mkdir @var{dir}\n\
-@deftypefnx {Built-in Function} {} mkdir (@var{parent}, @var{dir})\n\
-@deftypefnx {Built-in Function} {[@var{status}, @var{msg}, @var{msgid}] =} mkdir (@dots{})\n\
+@deftypefn  {} {} mkdir @var{dir}\n\
+@deftypefnx {} {} mkdir (@var{parent}, @var{dir})\n\
+@deftypefnx {} {[@var{status}, @var{msg}, @var{msgid}] =} mkdir (@dots{})\n\
 Create a directory named @var{dir} in the directory @var{parent}.\n\
 \n\
 If no @var{parent} directory is specified the present working directory is\n\
@@ -281,9 +281,9 @@
 
 DEFUNX ("rmdir", Frmdir, args, ,
         "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} rmdir @var{dir}\n\
-@deftypefnx {Built-in Function} {} rmdir (@var{dir}, \"s\")\n\
-@deftypefnx {Built-in Function} {[@var{status}, @var{msg}, @var{msgid}] =} rmdir (@dots{})\n\
+@deftypefn  {} {} rmdir @var{dir}\n\
+@deftypefnx {} {} rmdir (@var{dir}, \"s\")\n\
+@deftypefnx {} {[@var{status}, @var{msg}, @var{msgid}] =} rmdir (@dots{})\n\
 Remove the directory named @var{dir}.\n\
 \n\
 If the optional second parameter is supplied with value @qcode{\"s\"},\n\
@@ -351,8 +351,8 @@
 
 DEFUNX ("link", Flink, args, ,
         "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} link @var{old} @var{new}\n\
-@deftypefnx {Built-in Function} {[@var{err}, @var{msg}] =} link (@var{old}, @var{new})\n\
+@deftypefn  {} {} link @var{old} @var{new}\n\
+@deftypefnx {} {[@var{err}, @var{msg}] =} link (@var{old}, @var{new})\n\
 Create a new link (also known as a hard link) to an existing file.\n\
 \n\
 If successful, @var{err} is 0 and @var{msg} is an empty string.\n\
@@ -386,8 +386,8 @@
 
 DEFUNX ("symlink", Fsymlink, args, ,
         "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} symlink @var{old} @var{new}\n\
-@deftypefnx {Built-in Function} {[@var{err}, @var{msg}] =} symlink (@var{old}, @var{new})\n\
+@deftypefn  {} {} symlink @var{old} @var{new}\n\
+@deftypefnx {} {[@var{err}, @var{msg}] =} symlink (@var{old}, @var{new})\n\
 Create a symbolic link @var{new} which contains the string @var{old}.\n\
 \n\
 If successful, @var{err} is 0 and @var{msg} is an empty string.\n\
@@ -421,8 +421,8 @@
 
 DEFUNX ("readlink", Freadlink, args, ,
         "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} readlink @var{symlink}\n\
-@deftypefnx {Built-in Function} {[@var{result}, @var{err}, @var{msg}] =} readlink (@var{symlink})\n\
+@deftypefn  {} {} readlink @var{symlink}\n\
+@deftypefnx {} {[@var{result}, @var{err}, @var{msg}] =} readlink (@var{symlink})\n\
 Read the value of the symbolic link @var{symlink}.\n\
 \n\
 If successful, @var{result} contains the contents of the symbolic link\n\
@@ -459,8 +459,8 @@
 
 DEFUNX ("rename", Frename, args, ,
         "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} rename @var{old} @var{new}\n\
-@deftypefnx {Built-in Function} {[@var{err}, @var{msg}] =} rename (@var{old}, @var{new})\n\
+@deftypefn  {} {} rename @var{old} @var{new}\n\
+@deftypefnx {} {[@var{err}, @var{msg}] =} rename (@var{old}, @var{new})\n\
 Change the name of file @var{old} to @var{new}.\n\
 \n\
 If successful, @var{err} is 0 and @var{msg} is an empty string.\n\
@@ -494,7 +494,7 @@
 
 DEFUN (glob, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} glob (@var{pattern})\n\
+@deftypefn {} {} glob (@var{pattern})\n\
 Given an array of pattern strings (as a char array or a cell array) in\n\
 @var{pattern}, return a cell array of filenames that match any of\n\
 them, or an empty cell array if no patterns match.\n\
@@ -587,7 +587,7 @@
 
 DEFUN (__fnmatch__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} fnmatch (@var{pattern}, @var{string})\n\
+@deftypefn {} {} fnmatch (@var{pattern}, @var{string})\n\
 Return true or false for each element of @var{string} that matches any of\n\
 the elements of the string array @var{pattern}, using the rules of\n\
 \n\
@@ -617,8 +617,8 @@
 
 DEFUN (filesep, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} filesep ()\n\
-@deftypefnx {Built-in Function} {} filesep (\"all\")\n\
+@deftypefn  {} {} filesep ()\n\
+@deftypefnx {} {} filesep (\"all\")\n\
 Return the system-dependent character used to separate directory names.\n\
 \n\
 If @qcode{\"all\"} is given, the function returns all valid file separators\n\
@@ -650,8 +650,8 @@
 
 DEFUN (pathsep, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} pathsep ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} pathsep (@var{new_val})\n\
+@deftypefn  {} {@var{val} =} pathsep ()\n\
+@deftypefnx {} {@var{old_val} =} pathsep (@var{new_val})\n\
 Query or set the character used to separate directories in a path.\n\
 @seealso{filesep}\n\
 @end deftypefn")
@@ -691,9 +691,9 @@
 
 DEFUN (confirm_recursive_rmdir, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} confirm_recursive_rmdir ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} confirm_recursive_rmdir (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} confirm_recursive_rmdir (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} confirm_recursive_rmdir ()\n\
+@deftypefnx {} {@var{old_val} =} confirm_recursive_rmdir (@var{new_val})\n\
+@deftypefnx {} {} confirm_recursive_rmdir (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether Octave\n\
 will ask for confirmation before recursively removing a directory tree.\n\
 \n\
--- a/libinterp/corefcn/dlmread.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/dlmread.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -158,11 +158,11 @@
 
 DEFUN (dlmread, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{data} =} dlmread (@var{file})\n\
-@deftypefnx {Built-in Function} {@var{data} =} dlmread (@var{file}, @var{sep})\n\
-@deftypefnx {Built-in Function} {@var{data} =} dlmread (@var{file}, @var{sep}, @var{r0}, @var{c0})\n\
-@deftypefnx {Built-in Function} {@var{data} =} dlmread (@var{file}, @var{sep}, @var{range})\n\
-@deftypefnx {Built-in Function} {@var{data} =} dlmread (@dots{}, \"emptyvalue\", @var{EMPTYVAL})\n\
+@deftypefn  {} {@var{data} =} dlmread (@var{file})\n\
+@deftypefnx {} {@var{data} =} dlmread (@var{file}, @var{sep})\n\
+@deftypefnx {} {@var{data} =} dlmread (@var{file}, @var{sep}, @var{r0}, @var{c0})\n\
+@deftypefnx {} {@var{data} =} dlmread (@var{file}, @var{sep}, @var{range})\n\
+@deftypefnx {} {@var{data} =} dlmread (@dots{}, \"emptyvalue\", @var{EMPTYVAL})\n\
 Read the matrix @var{data} from a text file which uses the delimiter\n\
 @var{sep} between data values.\n\
 \n\
--- a/libinterp/corefcn/dot.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/dot.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -105,7 +105,7 @@
 
 DEFUN (dot, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} dot (@var{x}, @var{y}, @var{dim})\n\
+@deftypefn {} {} dot (@var{x}, @var{y}, @var{dim})\n\
 Compute the dot product of two vectors.\n\
 \n\
 If @var{x} and @var{y} are matrices, calculate the dot products along the\n\
@@ -276,7 +276,7 @@
 
 DEFUN (blkmm, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} blkmm (@var{A}, @var{B})\n\
+@deftypefn {} {} blkmm (@var{A}, @var{B})\n\
 Compute products of matrix blocks.\n\
 \n\
 The blocks are given as 2-dimensional subarrays of the arrays @var{A},\n\
--- a/libinterp/corefcn/eig.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/eig.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -35,10 +35,10 @@
 
 DEFUN (eig, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{lambda} =} eig (@var{A})\n\
-@deftypefnx {Built-in Function} {@var{lambda} =} eig (@var{A}, @var{B})\n\
-@deftypefnx {Built-in Function} {[@var{V}, @var{lambda}] =} eig (@var{A})\n\
-@deftypefnx {Built-in Function} {[@var{V}, @var{lambda}] =} eig (@var{A}, @var{B})\n\
+@deftypefn  {} {@var{lambda} =} eig (@var{A})\n\
+@deftypefnx {} {@var{lambda} =} eig (@var{A}, @var{B})\n\
+@deftypefnx {} {[@var{V}, @var{lambda}] =} eig (@var{A})\n\
+@deftypefnx {} {[@var{V}, @var{lambda}] =} eig (@var{A}, @var{B})\n\
 Compute the eigenvalues (and optionally the eigenvectors) of a matrix\n\
 or a pair of matrices\n\
 \n\
--- a/libinterp/corefcn/ellipj.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/ellipj.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -30,8 +30,8 @@
 
 DEFUN (ellipj, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{sn}, @var{cn}, @var{dn}, @var{err}] =} ellipj (@var{u}, @var{m})\n\
-@deftypefnx {Built-in Function} {[@var{sn}, @var{cn}, @var{dn}, @var{err}] =} ellipj (@var{u}, @var{m}, @var{tol})\n\
+@deftypefn  {} {[@var{sn}, @var{cn}, @var{dn}, @var{err}] =} ellipj (@var{u}, @var{m})\n\
+@deftypefnx {} {[@var{sn}, @var{cn}, @var{dn}, @var{err}] =} ellipj (@var{u}, @var{m}, @var{tol})\n\
 Compute the Jacobi elliptic functions @var{sn}, @var{cn}, and @var{dn}\n\
 of complex argument @var{u} and real parameter @var{m}.\n\
 \n\
--- a/libinterp/corefcn/error.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/error.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -894,7 +894,7 @@
 
 DEFUN (rethrow, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} rethrow (@var{err})\n\
+@deftypefn {} {} rethrow (@var{err})\n\
 Reissue a previous error as defined by @var{err}.\n\
 \n\
 @var{err} is a structure that must contain at least the @qcode{\"message\"}\n\
@@ -1082,8 +1082,8 @@
 
 DEFUN (error, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} error (@var{template}, @dots{})\n\
-@deftypefnx {Built-in Function} {} error (@var{id}, @var{template}, @dots{})\n\
+@deftypefn  {} {} error (@var{template}, @dots{})\n\
+@deftypefnx {} {} error (@var{id}, @var{template}, @dots{})\n\
 Display an error message and stop m-file execution.\n\
 \n\
 Format the optional arguments under the control of the template string\n\
@@ -1404,14 +1404,14 @@
 
 DEFUN (warning, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} warning (@var{template}, @dots{})\n\
-@deftypefnx {Built-in Function} {} warning (@var{id}, @var{template}, @dots{})\n\
-@deftypefnx {Built-in Function} {} warning (\"on\", @var{id})\n\
-@deftypefnx {Built-in Function} {} warning (\"off\", @var{id})\n\
-@deftypefnx {Built-in Function} {} warning (\"query\", @var{id})\n\
-@deftypefnx {Built-in Function} {} warning (\"error\", @var{id})\n\
-@deftypefnx {Built-in Function} {} warning (@var{state}, \"backtrace\")\n\
-@deftypefnx {Built-in Function} {} warning (@var{state}, @var{id}, \"local\")\n\
+@deftypefn  {} {} warning (@var{template}, @dots{})\n\
+@deftypefnx {} {} warning (@var{id}, @var{template}, @dots{})\n\
+@deftypefnx {} {} warning (\"on\", @var{id})\n\
+@deftypefnx {} {} warning (\"off\", @var{id})\n\
+@deftypefnx {} {} warning (\"query\", @var{id})\n\
+@deftypefnx {} {} warning (\"error\", @var{id})\n\
+@deftypefnx {} {} warning (@var{state}, \"backtrace\")\n\
+@deftypefnx {} {} warning (@var{state}, @var{id}, \"local\")\n\
 Display a warning message or control the behavior of Octave's warning system.\n\
 \n\
 Format the optional arguments under the control of the template string\n\
@@ -1797,9 +1797,9 @@
 
 DEFUN (lasterror, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{lasterr} =} lasterror ()\n\
-@deftypefnx {Built-in Function} {} lasterror (@var{err})\n\
-@deftypefnx {Built-in Function} {} lasterror (\"reset\")\n\
+@deftypefn  {} {@var{lasterr} =} lasterror ()\n\
+@deftypefnx {} {} lasterror (@var{err})\n\
+@deftypefnx {} {} lasterror (\"reset\")\n\
 Query or set the last error message structure.\n\
 \n\
 When called without arguments, return a structure containing the last error\n\
@@ -1956,9 +1956,9 @@
 
 DEFUN (lasterr, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{msg}, @var{msgid}] =} lasterr ()\n\
-@deftypefnx {Built-in Function} {} lasterr (@var{msg})\n\
-@deftypefnx {Built-in Function} {} lasterr (@var{msg}, @var{msgid})\n\
+@deftypefn  {} {[@var{msg}, @var{msgid}] =} lasterr ()\n\
+@deftypefnx {} {} lasterr (@var{msg})\n\
+@deftypefnx {} {} lasterr (@var{msg}, @var{msgid})\n\
 Query or set the last error message.\n\
 \n\
 When called without input arguments, return the last error message and\n\
@@ -1999,9 +1999,9 @@
 
 DEFUN (lastwarn, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{msg}, @var{msgid}] =} lastwarn ()\n\
-@deftypefnx {Built-in Function} {} lastwarn (@var{msg})\n\
-@deftypefnx {Built-in Function} {} lastwarn (@var{msg}, @var{msgid})\n\
+@deftypefn  {} {[@var{msg}, @var{msgid}] =} lastwarn ()\n\
+@deftypefnx {} {} lastwarn (@var{msg})\n\
+@deftypefnx {} {} lastwarn (@var{msg}, @var{msgid})\n\
 Query or set the last warning message.\n\
 \n\
 When called without input arguments, return the last warning message and\n\
@@ -2043,7 +2043,7 @@
 /* FIXME: Deprecated in 4.0 and scheduled for removal in 4.4 */
 DEFUN (__usage__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} usage (@var{msg})\n\
+@deftypefn {} {} usage (@var{msg})\n\
 Print the message @var{msg}, prefixed by the string @samp{usage: }, and\n\
 set Octave's internal error state such that control will return to the\n\
 top level without evaluating any more commands.  This is useful for\n\
@@ -2077,9 +2077,9 @@
 
 DEFUN (beep_on_error, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} beep_on_error ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} beep_on_error (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} beep_on_error (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} beep_on_error ()\n\
+@deftypefnx {} {@var{old_val} =} beep_on_error (@var{new_val})\n\
+@deftypefnx {} {} beep_on_error (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether Octave will try\n\
 to ring the terminal bell before printing an error message.\n\
 \n\
@@ -2093,9 +2093,9 @@
 
 DEFUN (debug_on_error, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} debug_on_error ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} debug_on_error (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} debug_on_error (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} debug_on_error ()\n\
+@deftypefnx {} {@var{old_val} =} debug_on_error (@var{new_val})\n\
+@deftypefnx {} {} debug_on_error (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether Octave will try\n\
 to enter the debugger when an error is encountered.\n\
 \n\
@@ -2113,9 +2113,9 @@
 
 DEFUN (debug_on_warning, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} debug_on_warning ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} debug_on_warning (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} debug_on_warning (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} debug_on_warning ()\n\
+@deftypefnx {} {@var{old_val} =} debug_on_warning (@var{new_val})\n\
+@deftypefnx {} {} debug_on_warning (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether Octave will try\n\
 to enter the debugger when a warning is encountered.\n\
 \n\
--- a/libinterp/corefcn/fft.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/fft.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -178,9 +178,9 @@
 
 DEFUN (fft, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} fft (@var{x})\n\
-@deftypefnx {Built-in Function} {} fft (@var{x}, @var{n})\n\
-@deftypefnx {Built-in Function} {} fft (@var{x}, @var{n}, @var{dim})\n\
+@deftypefn  {} {} fft (@var{x})\n\
+@deftypefnx {} {} fft (@var{x}, @var{n})\n\
+@deftypefnx {} {} fft (@var{x}, @var{n}, @var{dim})\n\
 Compute the discrete Fourier transform of @var{A} using\n\
 a Fast Fourier Transform (FFT) algorithm.\n\
 \n\
@@ -207,9 +207,9 @@
 
 DEFUN (ifft, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} ifft (@var{x})\n\
-@deftypefnx {Built-in Function} {} ifft (@var{x}, @var{n})\n\
-@deftypefnx {Built-in Function} {} ifft (@var{x}, @var{n}, @var{dim})\n\
+@deftypefn  {} {} ifft (@var{x})\n\
+@deftypefnx {} {} ifft (@var{x}, @var{n})\n\
+@deftypefnx {} {} ifft (@var{x}, @var{n}, @var{dim})\n\
 Compute the inverse discrete Fourier transform of @var{A}\n\
 using a Fast Fourier Transform (FFT) algorithm.\n\
 \n\
--- a/libinterp/corefcn/fft2.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/fft2.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -146,8 +146,8 @@
 
 DEFUN (fft2, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} fft2 (@var{A})\n\
-@deftypefnx {Built-in Function} {} fft2 (@var{A}, @var{m}, @var{n})\n\
+@deftypefn  {} {} fft2 (@var{A})\n\
+@deftypefnx {} {} fft2 (@var{A}, @var{m}, @var{n})\n\
 Compute the two-dimensional discrete Fourier transform of @var{A} using\n\
 a Fast Fourier Transform (FFT) algorithm.\n\
 \n\
@@ -166,8 +166,8 @@
 
 DEFUN (ifft2, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} ifft2 (@var{A})\n\
-@deftypefnx {Built-in Function} {} ifft2 (@var{A}, @var{m}, @var{n})\n\
+@deftypefn  {} {} ifft2 (@var{A})\n\
+@deftypefnx {} {} ifft2 (@var{A}, @var{m}, @var{n})\n\
 Compute the inverse two-dimensional discrete Fourier transform of @var{A}\n\
 using a Fast Fourier Transform (FFT) algorithm.\n\
 \n\
--- a/libinterp/corefcn/fftn.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/fftn.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -133,8 +133,8 @@
 
 DEFUN (fftn, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} fftn (@var{A})\n\
-@deftypefnx {Built-in Function} {} fftn (@var{A}, @var{size})\n\
+@deftypefn  {} {} fftn (@var{A})\n\
+@deftypefnx {} {} fftn (@var{A}, @var{size})\n\
 Compute the N-dimensional discrete Fourier transform of @var{A} using\n\
 a Fast Fourier Transform (FFT) algorithm.\n\
 \n\
@@ -152,8 +152,8 @@
 
 DEFUN (ifftn, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} ifftn (@var{A})\n\
-@deftypefnx {Built-in Function} {} ifftn (@var{A}, @var{size})\n\
+@deftypefn  {} {} ifftn (@var{A})\n\
+@deftypefnx {} {} ifftn (@var{A}, @var{size})\n\
 Compute the inverse N-dimensional discrete Fourier transform of @var{A}\n\
 using a Fast Fourier Transform (FFT) algorithm.\n\
 \n\
--- a/libinterp/corefcn/file-io.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/file-io.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -232,9 +232,9 @@
 
 DEFUN (fclose, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} fclose (@var{fid})\n\
-@deftypefnx {Built-in Function} {} fclose (\"all\")\n\
-@deftypefnx {Built-in Function} {@var{status} =} fclose (\"all\")\n\
+@deftypefn  {} {} fclose (@var{fid})\n\
+@deftypefnx {} {} fclose (\"all\")\n\
+@deftypefnx {} {@var{status} =} fclose (\"all\")\n\
 Close the file specified by the file descriptor @var{fid}.\n\
 \n\
 If successful, @code{fclose} returns 0, otherwise, it returns -1.  The\n\
@@ -252,7 +252,7 @@
 
 DEFUN (fclear, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} fclear (@var{fid})\n\
+@deftypefn {} {} fclear (@var{fid})\n\
 Clear the stream state for the file specified by the file descriptor\n\
 @var{fid}.\n\
 @seealso{ferror, fopen}\n\
@@ -274,7 +274,7 @@
 
 DEFUN (fflush, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} fflush (@var{fid})\n\
+@deftypefn {} {} fflush (@var{fid})\n\
 Flush output to file descriptor @var{fid}.\n\
 \n\
 @code{fflush} returns 0 on success and an OS dependent error value\n\
@@ -314,8 +314,8 @@
 
 DEFUN (fgetl, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{str} =} fgetl (@var{fid})\n\
-@deftypefnx {Built-in Function} {@var{str} =} fgetl (@var{fid}, @var{len})\n\
+@deftypefn  {} {@var{str} =} fgetl (@var{fid})\n\
+@deftypefnx {} {@var{str} =} fgetl (@var{fid}, @var{len})\n\
 Read characters from a file, stopping after a newline, or EOF,\n\
 or @var{len} characters have been read.\n\
 \n\
@@ -361,8 +361,8 @@
 
 DEFUN (fgets, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{str} =} fgets (@var{fid})\n\
-@deftypefnx {Built-in Function} {@var{str} =} fgets (@var{fid}, @var{len})\n\
+@deftypefn  {} {@var{str} =} fgets (@var{fid})\n\
+@deftypefnx {} {@var{str} =} fgets (@var{fid}, @var{len})\n\
 Read characters from a file, stopping after a newline, or EOF,\n\
 or @var{len} characters have been read.\n\
 \n\
@@ -408,9 +408,9 @@
 
 DEFUN (fskipl, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{nlines} =} fskipl (@var{fid})\n\
-@deftypefnx {Built-in Function} {@var{nlines} =} fskipl (@var{fid}, @var{count})\n\
-@deftypefnx {Built-in Function} {@var{nlines} =} fskipl (@var{fid}, Inf)\n\
+@deftypefn  {} {@var{nlines} =} fskipl (@var{fid})\n\
+@deftypefnx {} {@var{nlines} =} fskipl (@var{fid}, @var{count})\n\
+@deftypefnx {} {@var{nlines} =} fskipl (@var{fid}, Inf)\n\
 Read and skip @var{count} lines from the file specified by the file\n\
 descriptor @var{fid}.\n\
 \n\
@@ -526,12 +526,12 @@
 
 DEFUN (fopen, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{fid} =} fopen (@var{name})\n\
-@deftypefnx {Built-in Function} {@var{fid} =} fopen (@var{name}, @var{mode})\n\
-@deftypefnx {Built-in Function} {@var{fid} =} fopen (@var{name}, @var{mode}, @var{arch})\n\
-@deftypefnx {Built-in Function} {[@var{fid}, @var{msg}] =} fopen (@dots{})\n\
-@deftypefnx {Built-in Function} {@var{fid_list} =} fopen (\"all\")\n\
-@deftypefnx {Built-in Function} {[@var{file}, @var{mode}, @var{arch}] =} fopen (@var{fid})\n\
+@deftypefn  {} {@var{fid} =} fopen (@var{name})\n\
+@deftypefnx {} {@var{fid} =} fopen (@var{name}, @var{mode})\n\
+@deftypefnx {} {@var{fid} =} fopen (@var{name}, @var{mode}, @var{arch})\n\
+@deftypefnx {} {[@var{fid}, @var{msg}] =} fopen (@dots{})\n\
+@deftypefnx {} {@var{fid_list} =} fopen (\"all\")\n\
+@deftypefnx {} {[@var{file}, @var{mode}, @var{arch}] =} fopen (@var{fid})\n\
 Open a file for low-level I/O or query open files and file descriptors.\n\
 \n\
 The first form of the @code{fopen} function opens the named file with\n\
@@ -686,7 +686,7 @@
 
 DEFUN (freport, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} freport ()\n\
+@deftypefn {} {} freport ()\n\
 Print a list of which files have been opened, and whether they are open\n\
 for reading, writing, or both.\n\
 \n\
@@ -719,8 +719,8 @@
 
 DEFUN (frewind, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} frewind (@var{fid})\n\
-@deftypefnx {Built-in Function} {@var{status} =} frewind (@var{fid})\n\
+@deftypefn  {} {} frewind (@var{fid})\n\
+@deftypefnx {} {@var{status} =} frewind (@var{fid})\n\
 Move the file pointer to the beginning of the file specified by file\n\
 descriptor @var{fid}.\n\
 \n\
@@ -748,9 +748,9 @@
 
 DEFUN (fseek, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} fseek (@var{fid}, @var{offset})\n\
-@deftypefnx {Built-in Function} {} fseek (@var{fid}, @var{offset}, @var{origin})\n\
-@deftypefnx {Built-in Function} {@var{status} =} fseek (@dots{})\n\
+@deftypefn  {} {} fseek (@var{fid}, @var{offset})\n\
+@deftypefnx {} {} fseek (@var{fid}, @var{offset}, @var{origin})\n\
+@deftypefnx {} {@var{status} =} fseek (@dots{})\n\
 Set the file pointer to the location @var{offset} within the file @var{fid}.\n\
 \n\
 The pointer is positioned @var{offset} characters from the @var{origin},\n\
@@ -784,7 +784,7 @@
 
 DEFUN (ftell, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{pos} =} ftell (@var{fid})\n\
+@deftypefn {} {@var{pos} =} ftell (@var{fid})\n\
 Return the position of the file pointer as the number of characters from the\n\
 beginning of the file specified by file descriptor @var{fid}.\n\
 @seealso{fseek, frewind, feof, fopen}\n\
@@ -804,9 +804,9 @@
 
 DEFUN (fprintf, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} fprintf (@var{fid}, @var{template}, @dots{})\n\
-@deftypefnx {Built-in Function} {} fprintf (@var{template}, @dots{})\n\
-@deftypefnx {Built-in Function} {@var{numbytes} =} fprintf (@dots{})\n\
+@deftypefn  {} {} fprintf (@var{fid}, @var{template}, @dots{})\n\
+@deftypefnx {} {} fprintf (@var{template}, @dots{})\n\
+@deftypefnx {} {@var{numbytes} =} fprintf (@dots{})\n\
 This function is equivalent to @code{printf}, except that the output is\n\
 written to the file descriptor @var{fid} instead of @code{stdout}.\n\
 \n\
@@ -870,7 +870,7 @@
 
 DEFUN (printf, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} printf (@var{template}, @dots{})\n\
+@deftypefn {} {} printf (@var{template}, @dots{})\n\
 Print optional arguments under the control of the template string\n\
 @var{template} to the stream @code{stdout} and return the number of\n\
 characters printed.\n\
@@ -922,8 +922,8 @@
 
 DEFUN (fputs, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} fputs (@var{fid}, @var{string})\n\
-@deftypefnx {Built-in Function} {@var{status} =} fputs (@var{fid}, @var{string})\n\
+@deftypefn  {} {} fputs (@var{fid}, @var{string})\n\
+@deftypefnx {} {@var{status} =} fputs (@var{fid}, @var{string})\n\
 Write the string @var{string} to the file with file descriptor @var{fid}.\n\
 \n\
 The string is written to the file with no additional formatting.  Use\n\
@@ -946,8 +946,8 @@
 
 DEFUN (puts, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} puts (@var{string})\n\
-@deftypefnx {Built-in Function} {@var{status} =} puts (@var{string})\n\
+@deftypefn  {} {} puts (@var{string})\n\
+@deftypefnx {} {@var{status} =} puts (@var{string})\n\
 Write a string to the standard output with no formatting.\n\
 \n\
 The string is written verbatim to the standard output.  Use @code{disp} to\n\
@@ -967,7 +967,7 @@
 
 DEFUN (sprintf, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} sprintf (@var{template}, @dots{})\n\
+@deftypefn {} {} sprintf (@var{template}, @dots{})\n\
 This is like @code{printf}, except that the output is returned as a\n\
 string.\n\
 \n\
@@ -1035,8 +1035,8 @@
 
 DEFUN (fscanf, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{val}, @var{count}, @var{errmsg}] =} fscanf (@var{fid}, @var{template}, @var{size})\n\
-@deftypefnx {Built-in Function} {[@var{v1}, @var{v2}, @dots{}, @var{count}, @var{errmsg}] =} fscanf (@var{fid}, @var{template}, \"C\")\n\
+@deftypefn  {} {[@var{val}, @var{count}, @var{errmsg}] =} fscanf (@var{fid}, @var{template}, @var{size})\n\
+@deftypefnx {} {[@var{v1}, @var{v2}, @dots{}, @var{count}, @var{errmsg}] =} fscanf (@var{fid}, @var{template}, \"C\")\n\
 In the first form, read from @var{fid} according to @var{template},\n\
 returning the result in the matrix @var{val}.\n\
 \n\
@@ -1150,8 +1150,8 @@
 
 DEFUN (sscanf, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{val}, @var{count}, @var{errmsg}, @var{pos}] =} sscanf (@var{string}, @var{template}, @var{size})\n\
-@deftypefnx {Built-in Function} {[@var{v1}, @var{v2}, @dots{}, @var{count}, @var{errmsg}] =} sscanf (@var{string}, @var{template}, \"C\")\n\
+@deftypefn  {} {[@var{val}, @var{count}, @var{errmsg}, @var{pos}] =} sscanf (@var{string}, @var{template}, @var{size})\n\
+@deftypefnx {} {[@var{v1}, @var{v2}, @dots{}, @var{count}, @var{errmsg}] =} sscanf (@var{string}, @var{template}, \"C\")\n\
 This is like @code{fscanf}, except that the characters are taken from the\n\
 string @var{string} instead of from a stream.\n\
 \n\
@@ -1234,8 +1234,8 @@
 
 DEFUN (scanf, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{val}, @var{count}, @var{errmsg}] =} scanf (@var{template}, @var{size})\n\
-@deftypefnx {Built-in Function} {[@var{v1}, @var{v2}, @dots{}, @var{count}, @var{errmsg}]] =} scanf (@var{template}, \"C\")\n\
+@deftypefn  {} {[@var{val}, @var{count}, @var{errmsg}] =} scanf (@var{template}, @var{size})\n\
+@deftypefnx {} {[@var{v1}, @var{v2}, @dots{}, @var{count}, @var{errmsg}]] =} scanf (@var{template}, \"C\")\n\
 This is equivalent to calling @code{fscanf} with @var{fid} = @code{stdin}.\n\
 \n\
 It is currently not useful to call @code{scanf} in interactive programs.\n\
@@ -1300,12 +1300,12 @@
 
 DEFUN (fread, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} fread (@var{fid})\n\
-@deftypefnx {Built-in Function} {@var{val} =} fread (@var{fid}, @var{size})\n\
-@deftypefnx {Built-in Function} {@var{val} =} fread (@var{fid}, @var{size}, @var{precision})\n\
-@deftypefnx {Built-in Function} {@var{val} =} fread (@var{fid}, @var{size}, @var{precision}, @var{skip})\n\
-@deftypefnx {Built-in Function} {@var{val} =} fread (@var{fid}, @var{size}, @var{precision}, @var{skip}, @var{arch})\n\
-@deftypefnx {Built-in Function} {[@var{val}, @var{count}] =} fread (@dots{})\n\
+@deftypefn  {} {@var{val} =} fread (@var{fid})\n\
+@deftypefnx {} {@var{val} =} fread (@var{fid}, @var{size})\n\
+@deftypefnx {} {@var{val} =} fread (@var{fid}, @var{size}, @var{precision})\n\
+@deftypefnx {} {@var{val} =} fread (@var{fid}, @var{size}, @var{precision}, @var{skip})\n\
+@deftypefnx {} {@var{val} =} fread (@var{fid}, @var{size}, @var{precision}, @var{skip}, @var{arch})\n\
+@deftypefnx {} {[@var{val}, @var{count}] =} fread (@dots{})\n\
 Read binary data from the file specified by the file descriptor @var{fid}.\n\
 \n\
 The optional argument @var{size} specifies the amount of data to read\n\
@@ -1555,11 +1555,11 @@
 
 DEFUN (fwrite, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} fwrite (@var{fid}, @var{data})\n\
-@deftypefnx {Built-in Function} {} fwrite (@var{fid}, @var{data}, @var{precision})\n\
-@deftypefnx {Built-in Function} {} fwrite (@var{fid}, @var{data}, @var{precision}, @var{skip})\n\
-@deftypefnx {Built-in Function} {} fwrite (@var{fid}, @var{data}, @var{precision}, @var{skip}, @var{arch})\n\
-@deftypefnx {Built-in Function} {@var{count} =} fwrite (@dots{})\n\
+@deftypefn  {} {} fwrite (@var{fid}, @var{data})\n\
+@deftypefnx {} {} fwrite (@var{fid}, @var{data}, @var{precision})\n\
+@deftypefnx {} {} fwrite (@var{fid}, @var{data}, @var{precision}, @var{skip})\n\
+@deftypefnx {} {} fwrite (@var{fid}, @var{data}, @var{precision}, @var{skip}, @var{arch})\n\
+@deftypefnx {} {@var{count} =} fwrite (@dots{})\n\
 Write data in binary form to the file specified by the file descriptor\n\
 @var{fid}, returning the number of values @var{count} successfully written\n\
 to the file.\n\
@@ -1609,7 +1609,7 @@
 
 DEFUNX ("feof", Ffeof, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{status} =} feof (@var{fid})\n\
+@deftypefn {} {@var{status} =} feof (@var{fid})\n\
 Return 1 if an end-of-file condition has been encountered for the file\n\
 specified by file descriptor @var{fid} and 0 otherwise.\n\
 \n\
@@ -1629,9 +1629,9 @@
 
 DEFUNX ("ferror", Fferror, args, ,
         "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{msg} =} ferror (@var{fid})\n\
-@deftypefnx {Built-in Function} {[@var{msg}, @var{err}] =} ferror (@var{fid})\n\
-@deftypefnx {Built-in Function} {[@var{dots}] =} ferror (@var{fid}, \"clear\")\n\
+@deftypefn  {} {@var{msg} =} ferror (@var{fid})\n\
+@deftypefnx {} {[@var{msg}, @var{err}] =} ferror (@var{fid})\n\
+@deftypefnx {} {[@var{dots}] =} ferror (@var{fid}, \"clear\")\n\
 Query the error status of the stream specified by file descriptor @var{fid}\n\
 \n\
 If an error condition exists then return a string @var{msg} describing the\n\
@@ -1678,7 +1678,7 @@
 
 DEFUNX ("popen", Fpopen, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{fid} =} popen (@var{command}, @var{mode})\n\
+@deftypefn {} {@var{fid} =} popen (@var{command}, @var{mode})\n\
 Start a process and create a pipe.\n\
 \n\
 The name of the command to run is given by @var{command}.  The argument\n\
@@ -1742,7 +1742,7 @@
 
 DEFUNX ("pclose", Fpclose, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} pclose (@var{fid})\n\
+@deftypefn {} {} pclose (@var{fid})\n\
 Close a file identifier that was opened by @code{popen}.\n\
 \n\
 The function @code{fclose} may also be used for the same purpose.\n\
@@ -1757,9 +1757,9 @@
 
 DEFUN (tempname, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{fname} =} tempname ()\n\
-@deftypefnx {Built-in Function} {@var{fname} =} tempname (@var{dir})\n\
-@deftypefnx {Built-in Function} {@var{fname} =} tempname (@var{dir}, @var{prefix})\n\
+@deftypefn  {} {@var{fname} =} tempname ()\n\
+@deftypefnx {} {@var{fname} =} tempname (@var{dir})\n\
+@deftypefnx {} {@var{fname} =} tempname (@var{dir}, @var{prefix})\n\
 Return a unique temporary filename as a string.\n\
 \n\
 If @var{prefix} is omitted, a value of @qcode{\"oct-\"} is used.\n\
@@ -1845,7 +1845,7 @@
 
 DEFUN (tmpfile, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{fid}, @var{msg}] =} tmpfile ()\n\
+@deftypefn {} {[@var{fid}, @var{msg}] =} tmpfile ()\n\
 Return the file ID corresponding to a new temporary file with a unique\n\
 name.\n\
 \n\
@@ -1893,8 +1893,8 @@
 
 DEFUN (mkstemp, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{fid}, @var{name}, @var{msg}] =} mkstemp (\"@var{template}\")\n\
-@deftypefnx {Built-in Function} {[@var{fid}, @var{name}, @var{msg}] =} mkstemp (\"@var{template}\", @var{delete})\n\
+@deftypefn  {} {[@var{fid}, @var{name}, @var{msg}] =} mkstemp (\"@var{template}\")\n\
+@deftypefnx {} {[@var{fid}, @var{name}, @var{msg}] =} mkstemp (\"@var{template}\", @var{delete})\n\
 Return the file descriptor @var{fid} corresponding to a new temporary file\n\
 with a unique name created from @var{template}.\n\
 \n\
@@ -2005,7 +2005,7 @@
 
 DEFUNX ("umask", Fumask, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} umask (@var{mask})\n\
+@deftypefn {} {} umask (@var{mask})\n\
 Set the permission mask for file creation.\n\
 \n\
 The parameter @var{mask} is an integer, interpreted as an octal number.\n\
@@ -2059,7 +2059,7 @@
 
 DEFUNX ("P_tmpdir", FP_tmpdir, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} P_tmpdir ()\n\
+@deftypefn {} {} P_tmpdir ()\n\
 Return the name of the host system's @strong{default} directory for\n\
 temporary files.\n\
 \n\
@@ -2081,9 +2081,9 @@
 
 DEFUNX ("SEEK_SET", FSEEK_SET, args, ,
         "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} SEEK_SET ()\n\
-@deftypefnx {Built-in Function} {} SEEK_CUR ()\n\
-@deftypefnx {Built-in Function} {} SEEK_END ()\n\
+@deftypefn  {} {} SEEK_SET ()\n\
+@deftypefnx {} {} SEEK_CUR ()\n\
+@deftypefnx {} {} SEEK_END ()\n\
 Return the numerical value to pass to @code{fseek} to perform one of the\n\
 following actions:\n\
 \n\
@@ -2105,7 +2105,7 @@
 
 DEFUNX ("SEEK_CUR", FSEEK_CUR, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} SEEK_CUR ()\n\
+@deftypefn {} {} SEEK_CUR ()\n\
 Return the numerical value to pass to @code{fseek} to\n\
 position the file pointer relative to the current position.\n\
 @seealso{SEEK_SET, SEEK_END}\n\
@@ -2116,7 +2116,7 @@
 
 DEFUNX ("SEEK_END", FSEEK_END, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} SEEK_END ()\n\
+@deftypefn {} {} SEEK_END ()\n\
 Return the numerical value to pass to @code{fseek} to\n\
 position the file pointer relative to the end of the file.\n\
 @seealso{SEEK_SET, SEEK_CUR}\n\
@@ -2137,7 +2137,7 @@
 
 DEFUNX ("stdin", Fstdin, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} stdin ()\n\
+@deftypefn {} {} stdin ()\n\
 Return the numeric value corresponding to the standard input stream.\n\
 \n\
 When Octave is used interactively, stdin is filtered through the command\n\
@@ -2150,7 +2150,7 @@
 
 DEFUNX ("stdout", Fstdout, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} stdout ()\n\
+@deftypefn {} {} stdout ()\n\
 Return the numeric value corresponding to the standard output stream.\n\
 \n\
 Data written to the standard output is normally filtered through the pager.\n\
@@ -2162,7 +2162,7 @@
 
 DEFUNX ("stderr", Fstderr, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} stderr ()\n\
+@deftypefn {} {} stderr ()\n\
 Return the numeric value corresponding to the standard error stream.\n\
 \n\
 Even if paging is turned on, the standard error is not sent to the pager.\n\
--- a/libinterp/corefcn/filter.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/filter.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -270,10 +270,10 @@
 
 DEFUN (filter, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{y} =} filter (@var{b}, @var{a}, @var{x})\n\
-@deftypefnx {Built-in Function} {[@var{y}, @var{sf}] =} filter (@var{b}, @var{a}, @var{x}, @var{si})\n\
-@deftypefnx {Built-in Function} {[@var{y}, @var{sf}] =} filter (@var{b}, @var{a}, @var{x}, [], @var{dim})\n\
-@deftypefnx {Built-in Function} {[@var{y}, @var{sf}] =} filter (@var{b}, @var{a}, @var{x}, @var{si}, @var{dim})\n\
+@deftypefn  {} {@var{y} =} filter (@var{b}, @var{a}, @var{x})\n\
+@deftypefnx {} {[@var{y}, @var{sf}] =} filter (@var{b}, @var{a}, @var{x}, @var{si})\n\
+@deftypefnx {} {[@var{y}, @var{sf}] =} filter (@var{b}, @var{a}, @var{x}, [], @var{dim})\n\
+@deftypefnx {} {[@var{y}, @var{sf}] =} filter (@var{b}, @var{a}, @var{x}, @var{si}, @var{dim})\n\
 Apply a 1-D digital filter to the data @var{x}.\n\
 \n\
 @code{filter} returns the solution to the following linear, time-invariant\n\
--- a/libinterp/corefcn/find.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/find.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -319,11 +319,11 @@
 
 DEFUN (find, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{idx} =} find (@var{x})\n\
-@deftypefnx {Built-in Function} {@var{idx} =} find (@var{x}, @var{n})\n\
-@deftypefnx {Built-in Function} {@var{idx} =} find (@var{x}, @var{n}, @var{direction})\n\
-@deftypefnx {Built-in Function} {[i, j] =} find (@dots{})\n\
-@deftypefnx {Built-in Function} {[i, j, v] =} find (@dots{})\n\
+@deftypefn  {} {@var{idx} =} find (@var{x})\n\
+@deftypefnx {} {@var{idx} =} find (@var{x}, @var{n})\n\
+@deftypefnx {} {@var{idx} =} find (@var{x}, @var{n}, @var{direction})\n\
+@deftypefnx {} {[i, j] =} find (@dots{})\n\
+@deftypefnx {} {[i, j, v] =} find (@dots{})\n\
 Return a vector of indices of nonzero elements of a matrix, as a row if\n\
 @var{x} is a row vector or as a column otherwise.\n\
 \n\
--- a/libinterp/corefcn/gammainc.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/gammainc.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -34,9 +34,9 @@
 
 DEFUN (gammainc, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Mapping Function} {} gammainc (@var{x}, @var{a})\n\
-@deftypefnx {Mapping Function} {} gammainc (@var{x}, @var{a}, \"lower\")\n\
-@deftypefnx {Mapping Function} {} gammainc (@var{x}, @var{a}, \"upper\")\n\
+@deftypefn  {} {} gammainc (@var{x}, @var{a})\n\
+@deftypefnx {} {} gammainc (@var{x}, @var{a}, \"lower\")\n\
+@deftypefnx {} {} gammainc (@var{x}, @var{a}, \"upper\")\n\
 Compute the normalized incomplete gamma function.\n\
 \n\
 This is defined as\n\
--- a/libinterp/corefcn/gcd.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/gcd.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -435,8 +435,8 @@
 
 DEFUN (gcd, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{g} =} gcd (@var{a1}, @var{a2}, @dots{})\n\
-@deftypefnx {Built-in Function} {[@var{g}, @var{v1}, @dots{}] =} gcd (@var{a1}, @var{a2}, @dots{})\n\
+@deftypefn  {} {@var{g} =} gcd (@var{a1}, @var{a2}, @dots{})\n\
+@deftypefnx {} {[@var{g}, @var{v1}, @dots{}] =} gcd (@var{a1}, @var{a2}, @dots{})\n\
 Compute the greatest common divisor of @var{a1}, @var{a2}, @dots{}.\n\
 \n\
 If more than one argument is given then all arguments must be the same size\n\
--- a/libinterp/corefcn/getgrent.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/getgrent.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -64,7 +64,7 @@
 
 DEFUN (getgrent, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{grp_struct} =} getgrent ()\n\
+@deftypefn {} {@var{grp_struct} =} getgrent ()\n\
 Return an entry from the group database, opening it if necessary.\n\
 \n\
 Once the end of data has been reached, @code{getgrent} returns 0.\n\
@@ -89,7 +89,7 @@
 
 DEFUN (getgrgid, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{grp_struct} =} getgrgid (@var{gid}).\n\
+@deftypefn {} {@var{grp_struct} =} getgrgid (@var{gid}).\n\
 Return the first entry from the group database with the group ID\n\
 @var{gid}.\n\
 \n\
@@ -125,7 +125,7 @@
 
 DEFUN (getgrnam, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{grp_struct} =} getgrnam (@var{name})\n\
+@deftypefn {} {@var{grp_struct} =} getgrnam (@var{name})\n\
 Return the first entry from the group database with the group name\n\
 @var{name}.\n\
 \n\
@@ -153,7 +153,7 @@
 
 DEFUN (setgrent, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} setgrent ()\n\
+@deftypefn {} {} setgrent ()\n\
 Return the internal pointer to the beginning of the group database.\n\
 @seealso{getgrent, endgrent}\n\
 @end deftypefn")
@@ -176,7 +176,7 @@
 
 DEFUN (endgrent, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} endgrent ()\n\
+@deftypefn {} {} endgrent ()\n\
 Close the group database.\n\
 @seealso{getgrent, setgrent}\n\
 @end deftypefn")
--- a/libinterp/corefcn/getpwent.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/getpwent.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -67,7 +67,7 @@
 
 DEFUN (getpwent, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{pw_struct} =} getpwent ()\n\
+@deftypefn {} {@var{pw_struct} =} getpwent ()\n\
 Return a structure containing an entry from the password database,\n\
 opening it if necessary.\n\
 \n\
@@ -93,7 +93,7 @@
 
 DEFUN (getpwuid, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{pw_struct} =} getpwuid (@var{uid}).\n\
+@deftypefn {} {@var{pw_struct} =} getpwuid (@var{uid}).\n\
 Return a structure containing the first entry from the password database\n\
 with the user ID @var{uid}.\n\
 \n\
@@ -128,7 +128,7 @@
 
 DEFUN (getpwnam, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{pw_struct} =} getpwnam (@var{name})\n\
+@deftypefn {} {@var{pw_struct} =} getpwnam (@var{name})\n\
 Return a structure containing the first entry from the password database\n\
 with the user name @var{name}.\n\
 \n\
@@ -156,7 +156,7 @@
 
 DEFUN (setpwent, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} setpwent ()\n\
+@deftypefn {} {} setpwent ()\n\
 Return the internal pointer to the beginning of the password database.\n\
 @seealso{getpwent, endpwent}\n\
 @end deftypefn")
@@ -179,7 +179,7 @@
 
 DEFUN (endpwent, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} endpwent ()\n\
+@deftypefn {} {} endpwent ()\n\
 Close the password database.\n\
 @seealso{getpwent, setpwent}\n\
 @end deftypefn")
--- a/libinterp/corefcn/getrusage.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/getrusage.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -61,7 +61,7 @@
 
 DEFUN (getrusage, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} getrusage ()\n\
+@deftypefn {} {} getrusage ()\n\
 Return a structure containing a number of statistics about the current\n\
 Octave process.\n\
 \n\
--- a/libinterp/corefcn/givens.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/givens.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -32,8 +32,8 @@
 
 DEFUN (givens, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{G} =} givens (@var{x}, @var{y})\n\
-@deftypefnx {Built-in Function} {[@var{c}, @var{s}] =} givens (@var{x}, @var{y})\n\
+@deftypefn  {} {@var{G} =} givens (@var{x}, @var{y})\n\
+@deftypefnx {} {[@var{c}, @var{s}] =} givens (@var{x}, @var{y})\n\
 Compute the Givens rotation matrix @var{G}.\n\
 \n\
 @tex\n\
--- a/libinterp/corefcn/graphics.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/graphics.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -9577,7 +9577,7 @@
 
 DEFUN (ishandle, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} ishandle (@var{h})\n\
+@deftypefn {} {} ishandle (@var{h})\n\
 Return true if @var{h} is a graphics handle and false otherwise.\n\
 \n\
 @var{h} may also be a matrix of handles in which case a logical array is\n\
@@ -9630,7 +9630,7 @@
 
 DEFUN (__is_handle_visible__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __is_handle_visible__ (@var{h})\n\
+@deftypefn {} {} __is_handle_visible__ (@var{h})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -9642,7 +9642,7 @@
 
 DEFUN (reset, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} reset (@var{h})\n\
+@deftypefn {} {} reset (@var{h})\n\
 Reset the properties of the graphic object @var{h} to their default values.\n\
 \n\
 For figures, the properties @qcode{\"position\"}, @qcode{\"units\"},\n\
@@ -9795,11 +9795,11 @@
 
 DEFUN (set, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} set (@var{h}, @var{property}, @var{value}, @dots{})\n\
-@deftypefnx {Built-in Function} {} set (@var{h}, @var{properties}, @var{values})\n\
-@deftypefnx {Built-in Function} {} set (@var{h}, @var{pv})\n\
-@deftypefnx {Built-in Function} {@var{value_list} =} set (@var{h}, @var{property})\n\
-@deftypefnx {Built-in Function} {@var{all_value_list} =} set (@var{h})\n\
+@deftypefn  {} {} set (@var{h}, @var{property}, @var{value}, @dots{})\n\
+@deftypefnx {} {} set (@var{h}, @var{properties}, @var{values})\n\
+@deftypefnx {} {} set (@var{h}, @var{pv})\n\
+@deftypefnx {} {@var{value_list} =} set (@var{h}, @var{property})\n\
+@deftypefnx {} {@var{all_value_list} =} set (@var{h})\n\
 Set named property values for the graphics handle (or vector of graphics\n\
 handles) @var{h}.\n\
 \n\
@@ -9982,8 +9982,8 @@
 
 DEFUN (get, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} get (@var{h})\n\
-@deftypefnx {Built-in Function} {@var{val} =} get (@var{h}, @var{p})\n\
+@deftypefn  {} {@var{val} =} get (@var{h})\n\
+@deftypefnx {} {@var{val} =} get (@var{h}, @var{p})\n\
 Return the value of the named property @var{p} from the graphics handle\n\
 @var{h}.\n\
 \n\
@@ -10127,7 +10127,7 @@
 
 DEFUN (__get__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __get__ (@var{h})\n\
+@deftypefn {} {} __get__ (@var{h})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10238,7 +10238,7 @@
 
 DEFUN (__go_figure__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_figure__ (@var{fignum})\n\
+@deftypefn {} {} __go_figure__ (@var{fignum})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10369,7 +10369,7 @@
 
 DEFUN (__calc_dimensions__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __calc_dimensions__ (@var{axes})\n\
+@deftypefn {} {} __calc_dimensions__ (@var{axes})\n\
 Internal function.\n\
 \n\
 Determine the number of dimensions in a graphics object, either 2 or 3.\n\
@@ -10387,7 +10387,7 @@
 
 DEFUN (__go_axes__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_axes__ (@var{parent})\n\
+@deftypefn {} {} __go_axes__ (@var{parent})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10396,7 +10396,7 @@
 
 DEFUN (__go_line__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_line__ (@var{parent})\n\
+@deftypefn {} {} __go_line__ (@var{parent})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10405,7 +10405,7 @@
 
 DEFUN (__go_text__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_text__ (@var{parent})\n\
+@deftypefn {} {} __go_text__ (@var{parent})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10414,7 +10414,7 @@
 
 DEFUN (__go_image__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_image__ (@var{parent})\n\
+@deftypefn {} {} __go_image__ (@var{parent})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10423,7 +10423,7 @@
 
 DEFUN (__go_surface__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_surface__ (@var{parent})\n\
+@deftypefn {} {} __go_surface__ (@var{parent})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10432,7 +10432,7 @@
 
 DEFUN (__go_patch__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_patch__ (@var{parent})\n\
+@deftypefn {} {} __go_patch__ (@var{parent})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10441,7 +10441,7 @@
 
 DEFUN (__go_hggroup__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_hggroup__ (@var{parent})\n\
+@deftypefn {} {} __go_hggroup__ (@var{parent})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10450,7 +10450,7 @@
 
 DEFUN (__go_uimenu__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_uimenu__ (@var{parent})\n\
+@deftypefn {} {} __go_uimenu__ (@var{parent})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10459,7 +10459,7 @@
 
 DEFUN (__go_uicontrol__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_uicontrol__ (@var{parent})\n\
+@deftypefn {} {} __go_uicontrol__ (@var{parent})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10468,7 +10468,7 @@
 
 DEFUN (__go_uipanel__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_uipanel__ (@var{parent})\n\
+@deftypefn {} {} __go_uipanel__ (@var{parent})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10477,7 +10477,7 @@
 
 DEFUN (__go_uicontextmenu__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_uicontextmenu__ (@var{parent})\n\
+@deftypefn {} {} __go_uicontextmenu__ (@var{parent})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10486,7 +10486,7 @@
 
 DEFUN (__go_uitoolbar__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_uitoolbar__ (@var{parent})\n\
+@deftypefn {} {} __go_uitoolbar__ (@var{parent})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10495,7 +10495,7 @@
 
 DEFUN (__go_uipushtool__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_uipushtool__ (@var{parent})\n\
+@deftypefn {} {} __go_uipushtool__ (@var{parent})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10504,7 +10504,7 @@
 
 DEFUN (__go_uitoggletool__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_uitoggletool__ (@var{parent})\n\
+@deftypefn {} {} __go_uitoggletool__ (@var{parent})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10513,7 +10513,7 @@
 
 DEFUN (__go_delete__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_delete__ (@var{h})\n\
+@deftypefn {} {} __go_delete__ (@var{h})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10548,7 +10548,7 @@
 
 DEFUN (__go_axes_init__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_axes_init__ (@var{h}, @var{mode})\n\
+@deftypefn {} {} __go_axes_init__ (@var{h}, @var{mode})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10591,7 +10591,7 @@
 
 DEFUN (__go_handles__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_handles__ (@var{show_hidden})\n\
+@deftypefn {} {} __go_handles__ (@var{show_hidden})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10607,7 +10607,7 @@
 
 DEFUN (__go_figure_handles__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __go_figure_handles__ (@var{show_hidden})\n\
+@deftypefn {} {} __go_figure_handles__ (@var{show_hidden})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10623,8 +10623,8 @@
 
 DEFUN (__go_execute_callback__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} __go_execute_callback__ (@var{h}, @var{name})\n\
-@deftypefnx {Built-in Function} {} __go_execute_callback__ (@var{h}, @var{name}, @var{param})\n\
+@deftypefn  {} {} __go_execute_callback__ (@var{h}, @var{name})\n\
+@deftypefnx {} {} __go_execute_callback__ (@var{h}, @var{name}, @var{param})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -10656,7 +10656,7 @@
 
 DEFUN (__image_pixel_size__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{px}, @var{py}} __image_pixel_size__ (@var{h})\n\
+@deftypefn {} {@var{px}, @var{py}} __image_pixel_size__ (@var{h})\n\
 Internal function: returns the pixel size of the image in normalized units.\n\
 @end deftypefn")
 {
@@ -10776,7 +10776,7 @@
 
 DEFUN (available_graphics_toolkits, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} available_graphics_toolkits ()\n\
+@deftypefn {} {} available_graphics_toolkits ()\n\
 Return a cell array of registered graphics toolkits.\n\
 @seealso{graphics_toolkit, register_graphics_toolkit}\n\
 @end deftypefn")
@@ -10788,7 +10788,7 @@
 
 DEFUN (register_graphics_toolkit, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} register_graphics_toolkit (@var{toolkit})\n\
+@deftypefn {} {} register_graphics_toolkit (@var{toolkit})\n\
 List @var{toolkit} as an available graphics toolkit.\n\
 @seealso{available_graphics_toolkits}\n\
 @end deftypefn")
@@ -10809,7 +10809,7 @@
 
 DEFUN (loaded_graphics_toolkits, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} loaded_graphics_toolkits ()\n\
+@deftypefn {} {} loaded_graphics_toolkits ()\n\
 Return a cell array of the currently loaded graphics toolkits.\n\
 @seealso{available_graphics_toolkits}\n\
 @end deftypefn")
@@ -10821,9 +10821,9 @@
 
 DEFUN (drawnow, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} drawnow ()\n\
-@deftypefnx {Built-in Function} {} drawnow (\"expose\")\n\
-@deftypefnx {Built-in Function} {} drawnow (@var{term}, @var{file}, @var{mono}, @var{debug_file})\n\
+@deftypefn  {} {} drawnow ()\n\
+@deftypefnx {} {} drawnow (\"expose\")\n\
+@deftypefnx {} {} drawnow (@var{term}, @var{file}, @var{mono}, @var{debug_file})\n\
 Update figure windows and their children.\n\
 \n\
 The event queue is flushed and any callbacks generated are executed.\n\
@@ -11002,7 +11002,7 @@
 
 DEFUN (addlistener, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} addlistener (@var{h}, @var{prop}, @var{fcn})\n\
+@deftypefn {} {} addlistener (@var{h}, @var{prop}, @var{fcn})\n\
 Register @var{fcn} as listener for the property @var{prop} of the graphics\n\
 object @var{h}.\n\
 \n\
@@ -11069,7 +11069,7 @@
 
 DEFUN (dellistener, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} dellistener (@var{h}, @var{prop}, @var{fcn})\n\
+@deftypefn {} {} dellistener (@var{h}, @var{prop}, @var{fcn})\n\
 Remove the registration of @var{fcn} as a listener for the property\n\
 @var{prop} of the graphics object @var{h}.\n\
 \n\
@@ -11136,8 +11136,8 @@
 
 DEFUN (addproperty, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} addproperty (@var{name}, @var{h}, @var{type})\n\
-@deftypefnx {Built-in Function} {} addproperty (@var{name}, @var{h}, @var{type}, @var{arg}, @dots{})\n\
+@deftypefn  {} {} addproperty (@var{name}, @var{h}, @var{type})\n\
+@deftypefnx {} {} addproperty (@var{name}, @var{h}, @var{type}, @var{arg}, @dots{})\n\
 Create a new property named @var{name} in graphics object @var{h}.\n\
 \n\
 @var{type} determines the type of the property to create.  @var{args}\n\
@@ -11392,10 +11392,10 @@
 
 DEFUN (waitfor, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} waitfor (@var{h})\n\
-@deftypefnx {Built-in Function} {} waitfor (@var{h}, @var{prop})\n\
-@deftypefnx {Built-in Function} {} waitfor (@var{h}, @var{prop}, @var{value})\n\
-@deftypefnx {Built-in Function} {} waitfor (@dots{}, \"timeout\", @var{timeout})\n\
+@deftypefn  {} {} waitfor (@var{h})\n\
+@deftypefnx {} {} waitfor (@var{h}, @var{prop})\n\
+@deftypefnx {} {} waitfor (@var{h}, @var{prop}, @var{value})\n\
+@deftypefnx {} {} waitfor (@dots{}, \"timeout\", @var{timeout})\n\
 Suspend the execution of the current program until a condition is\n\
 satisfied on the graphics handle @var{h}.\n\
 \n\
@@ -11633,9 +11633,9 @@
 
 DEFUN (__zoom__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} __zoom__ (@var{axes}, @var{mode}, @var{factor})\n\
-@deftypefnx {Built-in Function} {} __zoom__ (@var{axes}, \"out\")\n\
-@deftypefnx {Built-in Function} {} __zoom__ (@var{axes}, \"reset\")\n\
+@deftypefn  {} {} __zoom__ (@var{axes}, @var{mode}, @var{factor})\n\
+@deftypefnx {} {} __zoom__ (@var{axes}, \"out\")\n\
+@deftypefnx {} {} __zoom__ (@var{axes}, \"reset\")\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
--- a/libinterp/corefcn/help.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/help.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -109,55 +109,55 @@
 {
   pair_type ("!",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} !\n\
+@deftypefn {} {} !\n\
 Logical 'not' operator.\n\
 @seealso{~, not}\n\
 @end deftypefn"),
 
   pair_type ("~",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} ~\n\
+@deftypefn {} {} ~\n\
 Logical 'not' operator.\n\
 @seealso{!, not}\n\
 @end deftypefn"),
 
   pair_type ("!=",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} !=\n\
+@deftypefn {} {} !=\n\
 Logical 'not equals' operator.\n\
 @seealso{~=, ne}\n\
 @end deftypefn"),
 
   pair_type ("~=",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} ~=\n\
+@deftypefn {} {} ~=\n\
 Logical 'not equals' operator.\n\
 @seealso{!=, ne}\n\
 @end deftypefn"),
 
   pair_type ("\"",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} \"\n\
+@deftypefn {} {} \"\n\
 String delimiter.\n\
 @end deftypefn"),
 
   pair_type ("#",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} #\n\
+@deftypefn {} {} #\n\
 Begin comment character.\n\
 @seealso{%, #@\\{}\n\
 @end deftypefn"),
 
   pair_type ("%",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} %\n\
+@deftypefn {} {} %\n\
 Begin comment character.\n\
 @seealso{#, %@\\{}\n\
 @end deftypefn"),
 
   pair_type ("#{",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} #@{\n\
+@deftypefn {} {} #@{\n\
 Begin block comment.  There must be nothing else, other than\n\
 whitespace, in the line both before and after @code{#@{}.\n\
 It is possible to nest block comments.\n\
@@ -166,7 +166,7 @@
 
   pair_type ("%{",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} %@{\n\
+@deftypefn {} {} %@{\n\
 Begin block comment.  There must be nothing else, other than\n\
 whitespace, in the line both before and after @code{%@{}.\n\
 It is possible to nest block comments.\n\
@@ -175,7 +175,7 @@
 
   pair_type ("#}",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} #@}\n\
+@deftypefn {} {} #@}\n\
 Close block comment.  There must be nothing else, other than\n\
 whitespace, in the line both before and after @code{#@}}.\n\
 It is possible to nest block comments.\n\
@@ -184,7 +184,7 @@
 
   pair_type ("%}",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} %@}\n\
+@deftypefn {} {} %@}\n\
 Close block comment.  There must be nothing else, other than\n\
 whitespace, in the line both before and after @code{%@}}.\n\
 It is possible to nest block comments.\n\
@@ -193,27 +193,27 @@
 
   pair_type ("...",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} ...\n\
+@deftypefn {} {} ...\n\
 Continuation marker.  Joins current line with following line.\n\
 @end deftypefn"),
 
   pair_type ("&",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} &\n\
+@deftypefn {} {} &\n\
 Element by element logical 'and' operator.\n\
 @seealso{&&, and}\n\
 @end deftypefn"),
 
   pair_type ("&&",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} &&\n\
+@deftypefn {} {} &&\n\
 Logical 'and' operator (with short-circuit evaluation).\n\
 @seealso{&, and}\n\
 @end deftypefn"),
 
   pair_type ("'",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} '\n\
+@deftypefn {} {} '\n\
 Matrix transpose operator.  For complex matrices, computes the\n\
 complex conjugate (Hermitian) transpose.\n\
 \n\
@@ -225,26 +225,26 @@
 
   pair_type ("(",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} (\n\
+@deftypefn {} {} (\n\
 Array index or function argument delimiter.\n\
 @end deftypefn"),
 
   pair_type (")",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {})\n\
+@deftypefn {} {})\n\
 Array index or function argument delimiter.\n\
 @end deftypefn"),
 
   pair_type ("*",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} *\n\
+@deftypefn {} {} *\n\
 Multiplication operator.\n\
 @seealso{.*, times}\n\
 @end deftypefn"),
 
   pair_type ("**",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} **\n\
+@deftypefn {} {} **\n\
 Power operator.  This may return complex results for real inputs.  Use\n\
 @code{realsqrt}, @code{cbrt}, @code{nthroot}, or @code{realroot} to obtain\n\
 real results when possible.\n\
@@ -253,7 +253,7 @@
 
   pair_type ("^",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} ^\n\
+@deftypefn {} {} ^\n\
 Power operator.  This may return complex results for real inputs.  Use\n\
 @code{realsqrt}, @code{cbrt}, @code{nthroot}, or @code{realroot} to obtain\n\
 real results when possible.\n\
@@ -262,14 +262,14 @@
 
   pair_type ("+",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} +\n\
+@deftypefn {} {} +\n\
 Addition operator.\n\
 @seealso{plus}\n\
 @end deftypefn"),
 
   pair_type ("++",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} ++\n\
+@deftypefn {} {} ++\n\
 Increment operator.  As in C, may be applied as a prefix or postfix\n\
 operator.\n\
 @seealso{--}\n\
@@ -277,20 +277,20 @@
 
   pair_type (",",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} ,\n\
+@deftypefn {} {} ,\n\
 Array index, function argument, or command separator.\n\
 @end deftypefn"),
 
   pair_type ("-",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} -\n\
+@deftypefn {} {} -\n\
 Subtraction or unary negation operator.\n\
 @seealso{minus}\n\
 @end deftypefn"),
 
   pair_type ("--",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} --\n\
+@deftypefn {} {} --\n\
 Decrement operator.  As in C, may be applied as a prefix or postfix\n\
 operator.\n\
 @seealso{++}\n\
@@ -298,7 +298,7 @@
 
   pair_type (".'",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} .'\n\
+@deftypefn {} {} .'\n\
 Matrix transpose operator.  For complex matrices, computes the\n\
 transpose, @emph{not} the complex conjugate transpose.\n\
 @seealso{', transpose}\n\
@@ -306,14 +306,14 @@
 
   pair_type (".*",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} .*\n\
+@deftypefn {} {} .*\n\
 Element by element multiplication operator.\n\
 @seealso{*, times}\n\
 @end deftypefn"),
 
   pair_type (".**",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} .*\n\
+@deftypefn {} {} .*\n\
 Element by element power operator.  If several complex results are possible,\n\
 returns the one with smallest non-negative argument (angle).  Use\n\
 @code{realpow}, @code{realsqrt}, @code{cbrt}, or @code{nthroot} if a\n\
@@ -323,7 +323,7 @@
 
   pair_type (".^",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} .^\n\
+@deftypefn {} {} .^\n\
 Element by element power operator.  If several complex results are possible,\n\
 returns the one with smallest non-negative argument (angle).  Use\n\
 @code{realpow}, @code{realsqrt}, @code{cbrt}, or @code{nthroot} if a\n\
@@ -333,110 +333,110 @@
 
   pair_type ("./",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} ./\n\
+@deftypefn {} {} ./\n\
 Element by element right division operator.\n\
 @seealso{/, .\\, rdivide, mrdivide}\n\
 @end deftypefn"),
 
   pair_type ("/",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} /\n\
+@deftypefn {} {} /\n\
 Right division operator.\n\
 @seealso{./, \\, rdivide, mrdivide}\n\
 @end deftypefn"),
 
   pair_type (".\\",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} .\\\n\
+@deftypefn {} {} .\\\n\
 Element by element left division operator.\n\
 @seealso{\\, ./, rdivide, mrdivide}\n\
 @end deftypefn"),
 
   pair_type ("\\",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} \\\n\
+@deftypefn {} {} \\\n\
 Left division operator.\n\
 @seealso{.\\, /, ldivide, mldivide}\n\
 @end deftypefn"),
 
   pair_type (":",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} :\n\
+@deftypefn {} {} :\n\
 Select entire rows or columns of matrices.\n\
 @end deftypefn"),
 
   pair_type (";",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} ;\n\
+@deftypefn {} {} ;\n\
 Array row or command separator.\n\
 @seealso{,}\n\
 @end deftypefn"),
 
   pair_type ("<",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} <\n\
+@deftypefn {} {} <\n\
 'Less than' operator.\n\
 @seealso{lt}\n\
 @end deftypefn"),
 
   pair_type ("<=",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} <=\n\
+@deftypefn {} {} <=\n\
 'Less than' or 'equals' operator.\n\
 @seealso{le}\n\
 @end deftypefn"),
 
   pair_type ("=",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} =\n\
+@deftypefn {} {} =\n\
 Assignment operator.\n\
 @end deftypefn"),
 
   pair_type ("==",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} ==\n\
+@deftypefn {} {} ==\n\
 Equality test operator.\n\
 @seealso{eq}\n\
 @end deftypefn"),
 
   pair_type (">",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} >\n\
+@deftypefn {} {} >\n\
 'Greater than' operator.\n\
 @seealso{gt}\n\
 @end deftypefn"),
 
   pair_type (">=",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} >=\n\
+@deftypefn {} {} >=\n\
 'Greater than' or 'equals' operator.\n\
 @seealso{ge}\n\
 @end deftypefn"),
 
   pair_type ("[",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} [\n\
+@deftypefn {} {} [\n\
 Return list delimiter.\n\
 @seealso{]}\n\
 @end deftypefn"),
 
   pair_type ("]",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} ]\n\
+@deftypefn {} {} ]\n\
 Return list delimiter.\n\
 @seealso{[}\n\
 @end deftypefn"),
 
   pair_type ("|",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} |\n\
+@deftypefn {} {} |\n\
 Element by element logical 'or' operator.\n\
 @seealso{||, or}\n\
 @end deftypefn"),
 
   pair_type ("||",
   "-*- texinfo -*-\n\
-@deftypefn {Operator} {} ||\n\
+@deftypefn {} {} ||\n\
 Logical 'or' (with short-circuit evaluation) operator.\n\
 @seealso{|, or}\n\
 @end deftypefn"),
@@ -446,15 +446,15 @@
 {
   pair_type ("break",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} break\n\
+@deftypefn {} {} break\n\
 Exit the innermost enclosing do, while or for loop.\n\
 @seealso{do, while, for, parfor, continue}\n\
 @end deftypefn"),
 
   pair_type ("case",
   "-*- texinfo -*-\n\
-@deftypefn  {Keyword} {} case @var{value}\n\
-@deftypefnx {Keyword} {} case @{@var{value}, @dots{}@}\n\
+@deftypefn  {} {} case @var{value}\n\
+@deftypefnx {} {} case @{@var{value}, @dots{}@}\n\
 A case statement in a 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\
@@ -463,22 +463,22 @@
 
   pair_type ("catch",
   "-*- texinfo -*-\n\
-@deftypefn  {Keyword} {} catch\n\
-@deftypefnx {Keyword} {} catch @var{value}\n\
+@deftypefn  {} {} catch\n\
+@deftypefnx {} {} catch @var{value}\n\
 Begin the cleanup part of a try-catch block.\n\
 @seealso{try}\n\
 @end deftypefn"),
 
   pair_type ("continue",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} continue\n\
+@deftypefn {} {} continue\n\
 Jump to the end of the innermost enclosing do, while or for loop.\n\
 @seealso{do, while, for, parfor, break}\n\
 @end deftypefn"),
 
   pair_type ("do",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} do\n\
+@deftypefn {} {} 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\
 \n\
@@ -495,21 +495,21 @@
 
   pair_type ("else",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} else\n\
+@deftypefn {} {} else\n\
 Alternate action for an if block.  See @code{if} for an example.\n\
 @seealso{if}\n\
 @end deftypefn"),
 
   pair_type ("elseif",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} elseif (@var{condition})\n\
+@deftypefn {} {} elseif (@var{condition})\n\
 Alternate conditional test for an if block.  See @code{if} for an example.\n\
 @seealso{if}\n\
 @end deftypefn"),
 
   pair_type ("end",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} end\n\
+@deftypefn {} {} end\n\
 Mark the end of any @code{for}, @code{parfor}, @code{if}, @code{do},\n\
 @code{while}, @code{function}, @code{switch}, @code{try}, or\n\
 @code{unwind_protect} block.\n\
@@ -518,63 +518,63 @@
 
   pair_type ("end_try_catch",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} end_try_catch\n\
+@deftypefn {} {} end_try_catch\n\
 Mark the end of an @code{try-catch} block.\n\
 @seealso{try, catch}\n\
 @end deftypefn"),
 
   pair_type ("end_unwind_protect",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} end_unwind_protect\n\
+@deftypefn {} {} end_unwind_protect\n\
 Mark the end of an unwind_protect block.\n\
 @seealso{unwind_protect}\n\
 @end deftypefn"),
 
   pair_type ("endfor",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} endfor\n\
+@deftypefn {} {} endfor\n\
 Mark the end of a for loop.  See @code{for} for an example.\n\
 @seealso{for}\n\
 @end deftypefn"),
 
   pair_type ("endfunction",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} endfunction\n\
+@deftypefn {} {} endfunction\n\
 Mark the end of a function.\n\
 @seealso{function}\n\
 @end deftypefn"),
 
   pair_type ("endif",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} endif\n\
+@deftypefn {} {} endif\n\
 Mark the end of an if block.  See @code{if} for an example.\n\
 @seealso{if}\n\
 @end deftypefn"),
 
   pair_type ("endparfor",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} endparfor\n\
+@deftypefn {} {} endparfor\n\
 Mark the end of a parfor loop.  See @code{parfor} for an example.\n\
 @seealso{parfor}\n\
 @end deftypefn"),
 
   pair_type ("endswitch",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} endswitch\n\
+@deftypefn {} {} endswitch\n\
 Mark the end of a switch block.  See @code{switch} for an example.\n\
 @seealso{switch}\n\
 @end deftypefn"),
 
   pair_type ("endwhile",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} endwhile\n\
+@deftypefn {} {} endwhile\n\
 Mark the end of a while loop.  See @code{while} for an example.\n\
 @seealso{do, while}\n\
 @end deftypefn"),
 
   pair_type ("for",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} for @var{i} = @var{range}\n\
+@deftypefn {} {} for @var{i} = @var{range}\n\
 Begin a for loop.\n\
 \n\
 @example\n\
@@ -589,9 +589,9 @@
 
   pair_type ("function",
   "-*- texinfo -*-\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\
+@deftypefn  {} {} function @var{outputs} = function (@var{input}, @dots{})\n\
+@deftypefnx {} {} function {} function (@var{input}, @dots{})\n\
+@deftypefnx {} {} function @var{outputs} = function\n\
 Begin a function body with @var{outputs} as results and @var{inputs} as\n\
 parameters.\n\
 @seealso{return}\n\
@@ -599,7 +599,7 @@
 
   pair_type ("global",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} global @var{var}\n\
+@deftypefn {} {} global @var{var}\n\
 Declare variables to have global scope.\n\
 \n\
 @example\n\
@@ -615,10 +615,10 @@
 
   pair_type ("if",
   "-*- texinfo -*-\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\
+@deftypefn  {} {} if (@var{cond}) @dots{} endif\n\
+@deftypefnx {} {} if (@var{cond}) @dots{} else @dots{} endif\n\
+@deftypefnx {} {} if (@var{cond}) @dots{} elseif (@var{cond}) @dots{} endif\n\
+@deftypefnx {} {} if (@var{cond}) @dots{} elseif (@var{cond}) @dots{} else @dots{} endif\n\
 Begin an if block.\n\
 \n\
 @example\n\
@@ -638,15 +638,15 @@
 
   pair_type ("otherwise",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} otherwise\n\
+@deftypefn {} {} otherwise\n\
 The default statement in a switch block (similar to else in an if block).\n\
 @seealso{switch}\n\
 @end deftypefn"),
 
   pair_type ("parfor",
   "-*- texinfo -*-\n\
-@deftypefn  {Keyword} {} parfor @var{i} = @var{range}\n\
-@deftypefnx {Keyword} {} parfor (@var{i} = @var{range}, @var{maxproc})\n\
+@deftypefn  {} {} parfor @var{i} = @var{range}\n\
+@deftypefnx {} {} parfor (@var{i} = @var{range}, @var{maxproc})\n\
 Begin a for loop that may execute in parallel.\n\
 \n\
 @example\n\
@@ -661,7 +661,7 @@
 
   pair_type ("persistent",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} persistent @var{var}\n\
+@deftypefn {} {} 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\
@@ -672,21 +672,21 @@
 
   pair_type ("return",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} return\n\
+@deftypefn {} {} return\n\
 Return from a function.\n\
 @seealso{function}\n\
 @end deftypefn"),
 
   pair_type ("static",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} static\n\
+@deftypefn {} {} static\n\
 This statement has been deprecated in favor of @code{persistent}.\n\
 @seealso{persistent}\n\
 @end deftypefn"),
 
   pair_type ("switch",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} switch @var{statement}\n\
+@deftypefn {} {} switch @var{statement}\n\
 Begin a switch block.\n\
 \n\
 @example\n\
@@ -708,7 +708,7 @@
 
   pair_type ("try",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} try\n\
+@deftypefn {} {} 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\
@@ -720,14 +720,14 @@
 
   pair_type ("until",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} until (@var{cond})\n\
+@deftypefn {} {} until (@var{cond})\n\
 End a do-until loop.  See @code{do} for an example.\n\
 @seealso{do}\n\
 @end deftypefn"),
 
   pair_type ("unwind_protect",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} unwind_protect\n\
+@deftypefn {} {} unwind_protect\n\
 Begin an unwind_protect block.\n\
 \n\
 If an error occurs within the first part of an unwind_protect block\n\
@@ -741,28 +741,28 @@
 
   pair_type ("unwind_protect_cleanup",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} unwind_protect_cleanup\n\
+@deftypefn {} {} unwind_protect_cleanup\n\
 Begin the cleanup section of an unwind_protect block.\n\
 @seealso{unwind_protect}\n\
 @end deftypefn"),
 
   pair_type ("varargin",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} varargin\n\
+@deftypefn {} {} varargin\n\
 Pass an arbitrary number of arguments into a function.\n\
 @seealso{varargout, nargin, isargout, nargout, nthargout}\n\
 @end deftypefn"),
 
   pair_type ("varargout",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} varargout\n\
+@deftypefn {} {} varargout\n\
 Pass an arbitrary number of arguments out of a function.\n\
 @seealso{varargin, nargin, isargout, nargout, nthargout}\n\
 @end deftypefn"),
 
   pair_type ("while",
   "-*- texinfo -*-\n\
-@deftypefn {Keyword} {} while\n\
+@deftypefn {} {} while\n\
 Begin a while loop.\n\
 \n\
 @example\n\
@@ -954,9 +954,9 @@
 
 DEFUN (built_in_docstrings_file, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} built_in_docstrings_file ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} built_in_docstrings_file (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} built_in_docstrings_file (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} built_in_docstrings_file ()\n\
+@deftypefnx {} {@var{old_val} =} built_in_docstrings_file (@var{new_val})\n\
+@deftypefnx {} {} built_in_docstrings_file (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the name of the\n\
 file containing docstrings for built-in Octave functions.\n\
 \n\
@@ -1080,7 +1080,7 @@
 }
 
 DEFUN (get_help_text, args, , "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{text}, @var{format}] =} get_help_text (@var{name})\n\
+@deftypefn {} {[@var{text}, @var{format}] =} get_help_text (@var{name})\n\
 Return the raw help text of function @var{name}.\n\
 \n\
 The raw help text is returned in @var{text} and the format in @var{format}\n\
@@ -1143,7 +1143,7 @@
 
 DEFUN (get_help_text_from_file, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{text}, @var{format}] =} get_help_text_from_file (@var{fname})\n\
+@deftypefn {} {[@var{text}, @var{format}] =} get_help_text_from_file (@var{fname})\n\
 Return the raw help text from the file @var{fname}.\n\
 \n\
 The raw help text is returned in @var{text} and the format in @var{format}\n\
@@ -1175,7 +1175,7 @@
 
 DEFUN (__operators__, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Function File} {} __operators__ ()\n\
+@deftypefn {} {} __operators__ ()\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -1187,7 +1187,7 @@
 
 DEFUN (__keywords__, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Function File} {} __keywords__ ()\n\
+@deftypefn {} {} __keywords__ ()\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -1199,7 +1199,7 @@
 
 DEFUN (__builtins__, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Function File} {} __builtins__ ()\n\
+@deftypefn {} {} __builtins__ ()\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -1280,7 +1280,7 @@
 
 DEFUN (__which__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __which__ (@var{name}, @dots{})\n\
+@deftypefn {} {} __which__ (@var{name}, @dots{})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -1345,8 +1345,8 @@
 
 DEFUN (__list_functions__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Function File} {@var{retval} =} __list_functions__ ()\n\
-@deftypefnx {Function File} {@var{retval} =} __list_functions__ (@var{directory})\n\
+@deftypefn  {} {@var{retval} =} __list_functions__ ()\n\
+@deftypefnx {} {@var{retval} =} __list_functions__ (@var{directory})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -1377,9 +1377,9 @@
 
 DEFUN (doc_cache_file, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} doc_cache_file ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} doc_cache_file (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} doc_cache_file (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} doc_cache_file ()\n\
+@deftypefnx {} {@var{old_val} =} doc_cache_file (@var{new_val})\n\
+@deftypefnx {} {} doc_cache_file (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the name of the\n\
 Octave documentation cache file.\n\
 \n\
@@ -1404,9 +1404,9 @@
 
 DEFUN (texi_macros_file, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} texi_macros_file ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} texi_macros_file (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} texi_macros_file (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} texi_macros_file ()\n\
+@deftypefnx {} {@var{old_val} =} texi_macros_file (@var{new_val})\n\
+@deftypefnx {} {} texi_macros_file (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the name of the\n\
 file containing Texinfo macros that are prepended to documentation strings\n\
 before they are passed to makeinfo.\n\
@@ -1430,9 +1430,9 @@
 
 DEFUN (info_file, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} info_file ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} info_file (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} info_file (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} info_file ()\n\
+@deftypefnx {} {@var{old_val} =} info_file (@var{new_val})\n\
+@deftypefnx {} {} info_file (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the name of the\n\
 Octave info file.\n\
 \n\
@@ -1454,9 +1454,9 @@
 
 DEFUN (info_program, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} info_program ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} info_program (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} info_program (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} info_program ()\n\
+@deftypefnx {} {@var{old_val} =} info_program (@var{new_val})\n\
+@deftypefnx {} {} info_program (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the name of the\n\
 info program to run.\n\
 \n\
@@ -1480,9 +1480,9 @@
 
 DEFUN (makeinfo_program, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} makeinfo_program ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} makeinfo_program (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} makeinfo_program (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} makeinfo_program ()\n\
+@deftypefnx {} {@var{old_val} =} makeinfo_program (@var{new_val})\n\
+@deftypefnx {} {} makeinfo_program (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the name of the\n\
 program that Octave runs to format help text containing\n\
 Texinfo markup commands.\n\
@@ -1500,9 +1500,9 @@
 
 DEFUN (suppress_verbose_help_message, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} suppress_verbose_help_message ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} suppress_verbose_help_message (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} suppress_verbose_help_message (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} suppress_verbose_help_message ()\n\
+@deftypefnx {} {@var{old_val} =} suppress_verbose_help_message (@var{new_val})\n\
+@deftypefnx {} {} suppress_verbose_help_message (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether Octave\n\
 will add additional help information to the end of the output from\n\
 the @code{help} command and usage messages for built-in commands.\n\
--- a/libinterp/corefcn/hess.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/hess.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -37,8 +37,8 @@
 
 DEFUN (hess, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{H} =} hess (@var{A})\n\
-@deftypefnx {Built-in Function} {[@var{P}, @var{H}] =} hess (@var{A})\n\
+@deftypefn  {} {@var{H} =} hess (@var{A})\n\
+@deftypefnx {} {[@var{P}, @var{H}] =} hess (@var{A})\n\
 @cindex Hessenberg decomposition\n\
 Compute the Hessenberg decomposition of the matrix @var{A}.\n\
 \n\
--- a/libinterp/corefcn/hex2num.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/hex2num.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -34,8 +34,8 @@
 
 DEFUN (hex2num, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{n} =} hex2num (@var{s})\n\
-@deftypefnx {Built-in Function} {@var{n} =} hex2num (@var{s}, @var{class})\n\
+@deftypefn  {} {@var{n} =} hex2num (@var{s})\n\
+@deftypefnx {} {@var{n} =} hex2num (@var{s}, @var{class})\n\
 Typecast the 16 character hexadecimal character string to an IEEE 754\n\
 double precision number.\n\
 \n\
@@ -189,7 +189,7 @@
 
 DEFUN (num2hex, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{s} =} num2hex (@var{n})\n\
+@deftypefn {} {@var{s} =} num2hex (@var{n})\n\
 Typecast a double or single precision number or vector to a 8 or 16\n\
 character hexadecimal string of the IEEE 754 representation of the number.\n\
 \n\
--- a/libinterp/corefcn/input.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/input.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -765,8 +765,8 @@
 
 DEFUN (input, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{ans} =} input (@var{prompt})\n\
-@deftypefnx {Built-in Function} {@var{ans} =} input (@var{prompt}, \"s\")\n\
+@deftypefn  {} {@var{ans} =} input (@var{prompt})\n\
+@deftypefnx {} {@var{ans} =} input (@var{prompt}, \"s\")\n\
 Print @var{prompt} and wait for user input.\n\
 \n\
 For example,\n\
@@ -832,7 +832,7 @@
 
 DEFUN (yes_or_no, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{ans} =} yes_or_no (\"@var{prompt}\")\n\
+@deftypefn {} {@var{ans} =} yes_or_no (\"@var{prompt}\")\n\
 Ask the user a yes-or-no question.\n\
 \n\
 Return logical true if the answer is yes or false if the answer is no.\n\
@@ -897,8 +897,8 @@
 
 DEFUN (keyboard, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} keyboard ()\n\
-@deftypefnx {Built-in Function} {} keyboard (\"@var{prompt}\")\n\
+@deftypefn  {} {} keyboard ()\n\
+@deftypefnx {} {} keyboard (\"@var{prompt}\")\n\
 Stop m-file execution and enter debug mode.\n\
 \n\
 When the @code{keyboard} function is executed, Octave prints a prompt and\n\
@@ -938,11 +938,11 @@
 
 DEFUN (echo, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} echo\n\
-@deftypefnx {Command} {} echo on\n\
-@deftypefnx {Command} {} echo off\n\
-@deftypefnx {Command} {} echo on all\n\
-@deftypefnx {Command} {} echo off all\n\
+@deftypefn  {} {} echo\n\
+@deftypefnx {} {} echo on\n\
+@deftypefnx {} {} echo off\n\
+@deftypefnx {} {} echo on all\n\
+@deftypefnx {} {} echo off all\n\
 Control whether commands are displayed as they are executed.\n\
 \n\
 Valid options are:\n\
@@ -1069,7 +1069,7 @@
 
 DEFUN (__echostate__, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{state} =} __echostate__ ()\n\
+@deftypefn {} {@var{state} =} __echostate__ ()\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -1078,7 +1078,7 @@
 
 DEFUN (completion_matches, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} completion_matches (@var{hint})\n\
+@deftypefn {} {} completion_matches (@var{hint})\n\
 Generate possible completions given @var{hint}.\n\
 \n\
 This function is provided for the benefit of programs like Emacs which\n\
@@ -1162,7 +1162,7 @@
 
 DEFUN (readline_read_init_file, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} readline_read_init_file (@var{file})\n\
+@deftypefn {} {} readline_read_init_file (@var{file})\n\
 Read the readline library initialization file @var{file}.\n\
 \n\
 If @var{file} is omitted, read the default initialization file\n\
@@ -1194,7 +1194,7 @@
 
 DEFUN (readline_re_read_init_file, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} readline_re_read_init_file ()\n\
+@deftypefn {} {} readline_re_read_init_file ()\n\
 Re-read the last readline library initialization file that was read.\n\
 \n\
 @xref{Readline Init File, , , readline, GNU Readline Library},\n\
@@ -1225,8 +1225,8 @@
 
 DEFUN (add_input_event_hook, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{id} =} add_input_event_hook (@var{fcn})\n\
-@deftypefnx {Built-in Function} {@var{id} =} add_input_event_hook (@var{fcn}, @var{data})\n\
+@deftypefn  {} {@var{id} =} add_input_event_hook (@var{fcn})\n\
+@deftypefnx {} {@var{id} =} add_input_event_hook (@var{fcn}, @var{data})\n\
 Add the named function or function handle @var{fcn} to the list of functions\n\
 to call periodically when Octave is waiting for input.\n\
 \n\
@@ -1265,8 +1265,8 @@
 
 DEFUN (remove_input_event_hook, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} remove_input_event_hook (@var{name})\n\
-@deftypefnx {Built-in Function} {} remove_input_event_hook (@var{fcn_id})\n\
+@deftypefn  {} {} remove_input_event_hook (@var{name})\n\
+@deftypefnx {} {} remove_input_event_hook (@var{fcn_id})\n\
 Remove the named function or function handle with the given identifier\n\
 from the list of functions to call periodically when Octave is waiting\n\
 for input.\n\
@@ -1301,9 +1301,9 @@
 
 DEFUN (PS1, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} PS1 ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} PS1 (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} PS1 (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} PS1 ()\n\
+@deftypefnx {} {@var{old_val} =} PS1 (@var{new_val})\n\
+@deftypefnx {} {} PS1 (@var{new_val}, \"local\")\n\
 Query or set the primary prompt string.\n\
 \n\
 When executing interactively, Octave displays the primary prompt when it is\n\
@@ -1343,9 +1343,9 @@
 
 DEFUN (PS2, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} PS2 ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} PS2 (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} PS2 (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} PS2 ()\n\
+@deftypefnx {} {@var{old_val} =} PS2 (@var{new_val})\n\
+@deftypefnx {} {} PS2 (@var{new_val}, \"local\")\n\
 Query or set the secondary prompt string.\n\
 \n\
 The secondary prompt is printed when Octave is expecting additional input to\n\
@@ -1365,9 +1365,9 @@
 
 DEFUN (PS4, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} PS4 ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} PS4 (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} PS4 (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} PS4 ()\n\
+@deftypefnx {} {@var{old_val} =} PS4 (@var{new_val})\n\
+@deftypefnx {} {} PS4 (@var{new_val}, \"local\")\n\
 Query or set the character string used to prefix output produced\n\
 when echoing commands is enabled.\n\
 \n\
@@ -1385,9 +1385,9 @@
 
 DEFUN (completion_append_char, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} completion_append_char ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} completion_append_char (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} completion_append_char (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} completion_append_char ()\n\
+@deftypefnx {} {@var{old_val} =} completion_append_char (@var{new_val})\n\
+@deftypefnx {} {} completion_append_char (@var{new_val}, \"local\")\n\
 Query or set the internal character variable that is appended to\n\
 successful command-line completion attempts.\n\
 \n\
@@ -1403,9 +1403,9 @@
 
 DEFUN (echo_executing_commands, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} echo_executing_commands ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} echo_executing_commands (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} echo_executing_commands (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} echo_executing_commands ()\n\
+@deftypefnx {} {@var{old_val} =} echo_executing_commands (@var{new_val})\n\
+@deftypefnx {} {} echo_executing_commands (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls the echo state.\n\
 \n\
 It may be the sum of the following values:\n\
@@ -1437,8 +1437,8 @@
 
 DEFUN (__request_drawnow__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} __request_drawnow__ ()\n\
-@deftypefnx {Built-in Function} {} __request_drawnow__ (@var{flag})\n\
+@deftypefn  {} {} __request_drawnow__ ()\n\
+@deftypefnx {} {} __request_drawnow__ (@var{flag})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -1459,7 +1459,7 @@
 
 DEFUN (__gud_mode__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __gud_mode__ ()\n\
+@deftypefn {} {} __gud_mode__ ()\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -1480,9 +1480,9 @@
 
 DEFUN (filemarker, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} filemarker ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} filemarker (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} filemarker (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} filemarker ()\n\
+@deftypefnx {} {@var{old_val} =} filemarker (@var{new_val})\n\
+@deftypefnx {} {} filemarker (@var{new_val}, \"local\")\n\
 Query or set the character used to separate the filename from the subfunction\n\
 names contained within the file.\n\
 \n\
--- a/libinterp/corefcn/inv.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/inv.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -38,8 +38,8 @@
 
 DEFUN (inv, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{x} =} inv (@var{A})\n\
-@deftypefnx {Built-in Function} {[@var{x}, @var{rcond}] =} inv (@var{A})\n\
+@deftypefn  {} {@var{x} =} inv (@var{A})\n\
+@deftypefnx {} {[@var{x}, @var{rcond}] =} inv (@var{A})\n\
 Compute the inverse of the square matrix @var{A}.\n\
 \n\
 Return an estimate of the reciprocal condition number if requested,\n\
@@ -240,8 +240,8 @@
 
 DEFUN (inverse, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{x} =} inverse (@var{A})\n\
-@deftypefnx {Built-in Function} {[@var{x}, @var{rcond}] =} inverse (@var{A})\n\
+@deftypefn  {} {@var{x} =} inverse (@var{A})\n\
+@deftypefnx {} {[@var{x}, @var{rcond}] =} inverse (@var{A})\n\
 Compute the inverse of the square matrix @var{A}.\n\
 \n\
 This is an alias for @code{inv}.\n\
--- a/libinterp/corefcn/kron.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/kron.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -232,8 +232,8 @@
 
 
 DEFUN (kron, args, , "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} kron (@var{A}, @var{B})\n\
-@deftypefnx {Built-in Function} {} kron (@var{A1}, @var{A2}, @dots{})\n\
+@deftypefn  {} {} kron (@var{A}, @var{B})\n\
+@deftypefnx {} {} kron (@var{A1}, @var{A2}, @dots{})\n\
 Form the Kronecker product of two or more matrices.\n\
 \n\
 This is defined block by block as\n\
--- a/libinterp/corefcn/load-path.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/load-path.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -2233,8 +2233,8 @@
 
 DEFUN (genpath, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} genpath (@var{dir})\n\
-@deftypefnx {Built-in Function} {} genpath (@var{dir}, @var{skip}, @dots{})\n\
+@deftypefn  {} {} genpath (@var{dir})\n\
+@deftypefnx {} {} genpath (@var{dir}, @var{skip}, @dots{})\n\
 Return a path constructed from @var{dir} and all its subdirectories.\n\
 \n\
 If additional string parameters are given, the resulting path will exclude\n\
@@ -2283,7 +2283,7 @@
 
 DEFUN (rehash, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} rehash ()\n\
+@deftypefn {} {} rehash ()\n\
 Reinitialize Octave's load path directory cache.\n\
 @end deftypefn")
 {
@@ -2296,7 +2296,7 @@
 
 DEFUN (command_line_path, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} command_line_path (@dots{})\n\
+@deftypefn {} {} command_line_path (@dots{})\n\
 Return the command line path variable.\n\
 \n\
 @seealso{path, addpath, rmpath, genpath, pathdef, savepath, pathsep}\n\
@@ -2307,7 +2307,7 @@
 
 DEFUN (restoredefaultpath, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} restoredefaultpath (@dots{})\n\
+@deftypefn {} {} restoredefaultpath (@dots{})\n\
 Restore Octave's path to its initial state at startup.\n\
 \n\
 @seealso{path, addpath, rmpath, genpath, pathdef, savepath, pathsep}\n\
@@ -2325,7 +2325,7 @@
 
 DEFUN (__pathorig__, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{val} =} __pathorig__ ()\n\
+@deftypefn {} {@var{val} =} __pathorig__ ()\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2334,9 +2334,9 @@
 
 DEFUN (path, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} path ()\n\
-@deftypefnx {Built-in Function} {@var{str} =} path ()\n\
-@deftypefnx {Built-in Function} {@var{str} =} path (@var{path1}, @dots{})\n\
+@deftypefn  {} {} path ()\n\
+@deftypefnx {} {@var{str} =} path ()\n\
+@deftypefnx {} {@var{str} =} path (@var{path1}, @dots{})\n\
 Modify or display Octave's load path.\n\
 \n\
 If @var{nargin} and @var{nargout} are zero, display the elements of\n\
@@ -2388,8 +2388,8 @@
 
 DEFUN (addpath, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} addpath (@var{dir1}, @dots{})\n\
-@deftypefnx {Built-in Function} {} addpath (@var{dir1}, @dots{}, @var{option})\n\
+@deftypefn  {} {} addpath (@var{dir1}, @dots{})\n\
+@deftypefnx {} {} addpath (@var{dir1}, @dots{}, @var{option})\n\
 Add named directories to the function search path.\n\
 \n\
 If @var{option} is @qcode{\"-begin\"} or 0 (the default), prepend the\n\
@@ -2487,7 +2487,7 @@
 
 DEFUN (rmpath, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} rmpath (@var{dir1}, @dots{})\n\
+@deftypefn {} {} rmpath (@var{dir1}, @dots{})\n\
 Remove @var{dir1}, @dots{} from the current function search path.\n\
 \n\
 In addition to accepting individual directory arguments, lists of\n\
--- a/libinterp/corefcn/load-save.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/load-save.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -532,13 +532,13 @@
 
 DEFUN (load, args, nargout,
        "-*- texinfo -*-\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\
-@deftypefnx {Command} {} load file options\n\
-@deftypefnx {Command} {} load file options v1 v2 @dots{}\n\
-@deftypefnx {Command} {S =} load (\"file\", \"options\", \"v1\", \"v2\", @dots{})\n\
+@deftypefn  {} {} load file\n\
+@deftypefnx {} {} load options file\n\
+@deftypefnx {} {} load options file v1 v2 @dots{}\n\
+@deftypefnx {} {S =} load (\"options\", \"file\", \"v1\", \"v2\", @dots{})\n\
+@deftypefnx {} {} load file options\n\
+@deftypefnx {} {} load file options v1 v2 @dots{}\n\
+@deftypefnx {} {S =} load (\"file\", \"options\", \"v1\", \"v2\", @dots{})\n\
 Load the named variables @var{v1}, @var{v2}, @dots{}, from the file\n\
 @var{file}.\n\
 \n\
@@ -1453,12 +1453,12 @@
 
 DEFUN (save, args, nargout,
        "-*- texinfo -*-\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\
-@deftypefnx {Command} {} save @code{\"-\"} @var{v1} @var{v2} @dots{}\n\
-@deftypefnx {Built-in Function} {@var{s} =} save (@code{\"-\"} @var{v1} @var{v2} @dots{})\n\
+@deftypefn  {} {} save file\n\
+@deftypefnx {} {} save options file\n\
+@deftypefnx {} {} save options file @var{v1} @var{v2} @dots{}\n\
+@deftypefnx {} {} save options file -struct @var{STRUCT} @var{f1} @var{f2} @dots{}\n\
+@deftypefnx {} {} save @code{\"-\"} @var{v1} @var{v2} @dots{}\n\
+@deftypefnx {} {@var{s} =} save (@code{\"-\"} @var{v1} @var{v2} @dots{})\n\
 Save the named variables @var{v1}, @var{v2}, @dots{}, in the file\n\
 @var{file}.\n\
 \n\
@@ -1743,9 +1743,9 @@
 
 DEFUN (crash_dumps_octave_core, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} crash_dumps_octave_core ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} crash_dumps_octave_core (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} crash_dumps_octave_core (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} crash_dumps_octave_core ()\n\
+@deftypefnx {} {@var{old_val} =} crash_dumps_octave_core (@var{new_val})\n\
+@deftypefnx {} {} crash_dumps_octave_core (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether Octave tries\n\
 to save all current variables to the file @file{octave-workspace} if it\n\
 crashes or receives a hangup, terminate or similar signal.\n\
@@ -1761,9 +1761,9 @@
 
 DEFUN (save_default_options, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} save_default_options ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} save_default_options (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} save_default_options (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} save_default_options ()\n\
+@deftypefnx {} {@var{old_val} =} save_default_options (@var{new_val})\n\
+@deftypefnx {} {} save_default_options (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the default options\n\
 for the @code{save} command, and defines the default format.\n\
 \n\
@@ -1781,9 +1781,9 @@
 
 DEFUN (octave_core_file_limit, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} octave_core_file_limit ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} octave_core_file_limit (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} octave_core_file_limit (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} octave_core_file_limit ()\n\
+@deftypefnx {} {@var{old_val} =} octave_core_file_limit (@var{new_val})\n\
+@deftypefnx {} {} octave_core_file_limit (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the maximum amount\n\
 of memory (in kilobytes) of the top-level workspace that Octave will\n\
 attempt to save when writing data to the crash dump file (the name of\n\
@@ -1805,9 +1805,9 @@
 
 DEFUN (octave_core_file_name, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} octave_core_file_name ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} octave_core_file_name (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} octave_core_file_name (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} octave_core_file_name ()\n\
+@deftypefnx {} {@var{old_val} =} octave_core_file_name (@var{new_val})\n\
+@deftypefnx {} {} octave_core_file_name (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the name of the file\n\
 used for saving data from the top-level workspace if Octave aborts.\n\
 \n\
@@ -1824,9 +1824,9 @@
 
 DEFUN (octave_core_file_options, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} octave_core_file_options ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} octave_core_file_options (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} octave_core_file_options (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} octave_core_file_options ()\n\
+@deftypefnx {} {@var{old_val} =} octave_core_file_options (@var{new_val})\n\
+@deftypefnx {} {} octave_core_file_options (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the options used for\n\
 saving the workspace data if Octave aborts.\n\
 \n\
@@ -1845,9 +1845,9 @@
 
 DEFUN (save_header_format_string, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} save_header_format_string ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} save_header_format_string (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} save_header_format_string (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} save_header_format_string ()\n\
+@deftypefnx {} {@var{old_val} =} save_header_format_string (@var{new_val})\n\
+@deftypefnx {} {} save_header_format_string (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the format\n\
 string used for the comment line written at the beginning of\n\
 text-format data files saved by Octave.\n\
--- a/libinterp/corefcn/lookup.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/lookup.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -189,8 +189,8 @@
 
 DEFUN (lookup, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{idx} =} lookup (@var{table}, @var{y})\n\
-@deftypefnx {Built-in Function} {@var{idx} =} lookup (@var{table}, @var{y}, @var{opt})\n\
+@deftypefn  {} {@var{idx} =} lookup (@var{table}, @var{y})\n\
+@deftypefnx {} {@var{idx} =} lookup (@var{table}, @var{y}, @var{opt})\n\
 Lookup values in a sorted table.\n\
 \n\
 This function is usually used as a prelude to interpolation.\n\
--- a/libinterp/corefcn/ls-oct-text.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/ls-oct-text.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -404,9 +404,9 @@
 
 DEFUN (save_precision, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} save_precision ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} save_precision (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} save_precision (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} save_precision ()\n\
+@deftypefnx {} {@var{old_val} =} save_precision (@var{new_val})\n\
+@deftypefnx {} {} save_precision (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the number of digits to\n\
 keep when saving data in text format.\n\
 \n\
--- a/libinterp/corefcn/lsode.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/lsode.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -145,8 +145,8 @@
 
 DEFUN (lsode, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{x}, @var{istate}, @var{msg}] =} lsode (@var{fcn}, @var{x_0}, @var{t})\n\
-@deftypefnx {Built-in Function} {[@var{x}, @var{istate}, @var{msg}] =} lsode (@var{fcn}, @var{x_0}, @var{t}, @var{t_crit})\n\
+@deftypefn  {} {[@var{x}, @var{istate}, @var{msg}] =} lsode (@var{fcn}, @var{x_0}, @var{t})\n\
+@deftypefnx {} {[@var{x}, @var{istate}, @var{msg}] =} lsode (@var{fcn}, @var{x_0}, @var{t}, @var{t_crit})\n\
 Ordinary Differential Equation (ODE) solver.\n\
 \n\
 The set of differential equations to solve is\n\
--- a/libinterp/corefcn/lu.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/lu.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -63,13 +63,13 @@
 
 DEFUN (lu, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{L}, @var{U}] =} lu (@var{A})\n\
-@deftypefnx {Built-in Function} {[@var{L}, @var{U}, @var{P}] =} lu (@var{A})\n\
-@deftypefnx {Built-in Function} {[@var{L}, @var{U}, @var{P}, @var{Q}] =} lu (@var{S})\n\
-@deftypefnx {Built-in Function} {[@var{L}, @var{U}, @var{P}, @var{Q}, @var{R}] =} lu (@var{S})\n\
-@deftypefnx {Built-in Function} {[@dots{}] =} lu (@var{S}, @var{thres})\n\
-@deftypefnx {Built-in Function} {@var{y} =} lu (@dots{})\n\
-@deftypefnx {Built-in Function} {[@dots{}] =} lu (@dots{}, \"vector\")\n\
+@deftypefn  {} {[@var{L}, @var{U}] =} lu (@var{A})\n\
+@deftypefnx {} {[@var{L}, @var{U}, @var{P}] =} lu (@var{A})\n\
+@deftypefnx {} {[@var{L}, @var{U}, @var{P}, @var{Q}] =} lu (@var{S})\n\
+@deftypefnx {} {[@var{L}, @var{U}, @var{P}, @var{Q}, @var{R}] =} lu (@var{S})\n\
+@deftypefnx {} {[@dots{}] =} lu (@var{S}, @var{thres})\n\
+@deftypefnx {} {@var{y} =} lu (@dots{})\n\
+@deftypefnx {} {[@dots{}] =} lu (@dots{}, \"vector\")\n\
 @cindex LU decomposition\n\
 Compute the LU@tie{}decomposition of @var{A}.\n\
 \n\
@@ -583,8 +583,8 @@
 
 DEFUN (luupdate, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{L}, @var{U}] =} luupdate (@var{L}, @var{U}, @var{x}, @var{y})\n\
-@deftypefnx {Built-in Function} {[@var{L}, @var{U}, @var{P}] =} luupdate (@var{L}, @var{U}, @var{P}, @var{x}, @var{y})\n\
+@deftypefn  {} {[@var{L}, @var{U}] =} luupdate (@var{L}, @var{U}, @var{x}, @var{y})\n\
+@deftypefnx {} {[@var{L}, @var{U}, @var{P}] =} luupdate (@var{L}, @var{U}, @var{P}, @var{x}, @var{y})\n\
 Given an LU@tie{}factorization of a real or complex matrix\n\
 @w{@var{A} = @var{L}*@var{U}}, @var{L}@tie{}lower unit trapezoidal and\n\
 @var{U}@tie{}upper trapezoidal, return the LU@tie{}factorization\n\
--- a/libinterp/corefcn/luinc.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/luinc.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -40,9 +40,9 @@
 // FIXME: Deprecated in 4.0 and should be removed in 4.4.
 DEFUN (__luinc__, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{L}, @var{U}, @var{P}, @var{Q}] =} luinc (@var{A}, '0')\n\
-@deftypefnx {Built-in Function} {[@var{L}, @var{U}, @var{P}, @var{Q}] =} luinc (@var{A}, @var{droptol})\n\
-@deftypefnx {Built-in Function} {[@var{L}, @var{U}, @var{P}, @var{Q}] =} luinc (@var{A}, @var{opts})\n\
+@deftypefn  {} {[@var{L}, @var{U}, @var{P}, @var{Q}] =} luinc (@var{A}, '0')\n\
+@deftypefnx {} {[@var{L}, @var{U}, @var{P}, @var{Q}] =} luinc (@var{A}, @var{droptol})\n\
+@deftypefnx {} {[@var{L}, @var{U}, @var{P}, @var{Q}] =} luinc (@var{A}, @var{opts})\n\
 @cindex LU decomposition\n\
 Produce the incomplete LU@tie{}factorization of the sparse matrix @var{A}.\n\
 \n\
--- a/libinterp/corefcn/mappers.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/mappers.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -38,7 +38,7 @@
 
 DEFUN (abs, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} abs (@var{z})\n\
+@deftypefn {} {} abs (@var{z})\n\
 Compute the magnitude of @var{z}.\n\
 \n\
 The magnitude is defined as\n\
@@ -85,7 +85,7 @@
 
 DEFUN (acos, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} acos (@var{x})\n\
+@deftypefn {} {} acos (@var{x})\n\
 Compute the inverse cosine in radians for each element of @var{x}.\n\
 @seealso{cos, acosd}\n\
 @end deftypefn")
@@ -131,7 +131,7 @@
 
 DEFUN (acosh, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} acosh (@var{x})\n\
+@deftypefn {} {} acosh (@var{x})\n\
 Compute the inverse hyperbolic cosine for each element of @var{x}.\n\
 @seealso{cosh}\n\
 @end deftypefn")
@@ -170,7 +170,7 @@
 
 DEFUN (angle, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} angle (@var{z})\n\
+@deftypefn {} {} angle (@var{z})\n\
 See @code{arg}.\n\
 @seealso{arg}\n\
 @end deftypefn")
@@ -183,8 +183,8 @@
 
 DEFUN (arg, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Mapping Function} {} arg (@var{z})\n\
-@deftypefnx {Mapping Function} {} angle (@var{z})\n\
+@deftypefn  {} {} arg (@var{z})\n\
+@deftypefnx {} {} angle (@var{z})\n\
 Compute the argument, i.e., angle of @var{z}.\n\
 \n\
 This is defined as,\n\
@@ -238,7 +238,7 @@
 
 DEFUN (asin, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} asin (@var{x})\n\
+@deftypefn {} {} asin (@var{x})\n\
 Compute the inverse sine in radians for each element of @var{x}.\n\
 @seealso{sin, asind}\n\
 @end deftypefn")
@@ -283,7 +283,7 @@
 
 DEFUN (asinh, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} asinh (@var{x})\n\
+@deftypefn {} {} asinh (@var{x})\n\
 Compute the inverse hyperbolic sine for each element of @var{x}.\n\
 @seealso{sinh}\n\
 @end deftypefn")
@@ -311,7 +311,7 @@
 
 DEFUN (atan, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} atan (@var{x})\n\
+@deftypefn {} {} atan (@var{x})\n\
 Compute the inverse tangent in radians for each element of @var{x}.\n\
 @seealso{tan, atand}\n\
 @end deftypefn")
@@ -343,7 +343,7 @@
 
 DEFUN (atanh, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} atanh (@var{x})\n\
+@deftypefn {} {} atanh (@var{x})\n\
 Compute the inverse hyperbolic tangent for each element of @var{x}.\n\
 @seealso{tanh}\n\
 @end deftypefn")
@@ -371,7 +371,7 @@
 
 DEFUN (cbrt, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} cbrt (@var{x})\n\
+@deftypefn {} {} cbrt (@var{x})\n\
 Compute the real cube root of each element of @var{x}.\n\
 \n\
 Unlike @code{@var{x}^(1/3)}, the result will be negative if @var{x} is\n\
@@ -401,7 +401,7 @@
 
 DEFUN (ceil, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} ceil (@var{x})\n\
+@deftypefn {} {} ceil (@var{x})\n\
 Return the smallest integer not less than @var{x}.\n\
 \n\
 This is equivalent to rounding towards positive infinity.\n\
@@ -443,7 +443,7 @@
 
 DEFUN (conj, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} conj (@var{z})\n\
+@deftypefn {} {} conj (@var{z})\n\
 Return the complex conjugate of @var{z}.\n\
 \n\
 The complex conjugate is defined as\n\
@@ -481,7 +481,7 @@
 
 DEFUN (cos, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} cos (@var{x})\n\
+@deftypefn {} {} cos (@var{x})\n\
 Compute the cosine for each element of @var{x} in radians.\n\
 @seealso{acos, cosd, cosh}\n\
 @end deftypefn")
@@ -515,7 +515,7 @@
 
 DEFUN (cosh, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} cosh (@var{x})\n\
+@deftypefn {} {} cosh (@var{x})\n\
 Compute the hyperbolic cosine for each element of @var{x}.\n\
 @seealso{acosh, sinh, tanh}\n\
 @end deftypefn")
@@ -543,7 +543,7 @@
 
 DEFUN (erf, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} erf (@var{z})\n\
+@deftypefn {} {} erf (@var{z})\n\
 Compute the error function.\n\
 \n\
 The error function is defined as\n\
@@ -612,7 +612,7 @@
 
 DEFUN (erfinv, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} erfinv (@var{x})\n\
+@deftypefn {} {} erfinv (@var{x})\n\
 Compute the inverse error function.\n\
 \n\
 The inverse error function is defined such that\n\
@@ -649,7 +649,7 @@
 
 DEFUN (erfcinv, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} erfcinv (@var{x})\n\
+@deftypefn {} {} erfcinv (@var{x})\n\
 Compute the inverse complementary error function.\n\
 \n\
 The inverse complementary error function is defined such that\n\
@@ -686,7 +686,7 @@
 
 DEFUN (erfc, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} erfc (@var{z})\n\
+@deftypefn {} {} erfc (@var{z})\n\
 Compute the complementary error function.\n\
 \n\
 The complementary error function is defined as\n\
@@ -716,7 +716,7 @@
 
 DEFUN (erfcx, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} erfcx (@var{z})\n\
+@deftypefn {} {} erfcx (@var{z})\n\
 Compute the scaled complementary error function.\n\
 \n\
 The scaled complementary error function is defined as\n\
@@ -758,7 +758,7 @@
 
 DEFUN (erfi, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} erfi (@var{z})\n\
+@deftypefn {} {} erfi (@var{z})\n\
 Compute the imaginary error function.\n\
 \n\
 The imaginary error function is defined as\n\
@@ -795,7 +795,7 @@
 
 DEFUN (dawson, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} dawson (@var{z})\n\
+@deftypefn {} {} dawson (@var{z})\n\
 Compute the Dawson (scaled imaginary error) function.\n\
 \n\
 The Dawson function is defined as\n\
@@ -834,7 +834,7 @@
 
 DEFUN (exp, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} exp (@var{x})\n\
+@deftypefn {} {} exp (@var{x})\n\
 Compute\n\
 @tex\n\
 $e^{x}$\n\
@@ -869,7 +869,7 @@
 
 DEFUN (expm1, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} expm1 (@var{x})\n\
+@deftypefn {} {} expm1 (@var{x})\n\
 Compute\n\
 @tex\n\
 $ e^{x} - 1 $\n\
@@ -899,7 +899,7 @@
 
 DEFUN (isfinite, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} isfinite (@var{x})\n\
+@deftypefn {} {} isfinite (@var{x})\n\
 Return a logical array which is true where the elements of @var{x} are\n\
 finite values and false where they are not.\n\
 \n\
@@ -935,7 +935,7 @@
 
 DEFUN (fix, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} fix (@var{x})\n\
+@deftypefn {} {} fix (@var{x})\n\
 Truncate fractional portion of @var{x} and return the integer portion.\n\
 \n\
 This is equivalent to rounding towards zero.  If @var{x} is complex, return\n\
@@ -968,7 +968,7 @@
 
 DEFUN (floor, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} floor (@var{x})\n\
+@deftypefn {} {} floor (@var{x})\n\
 Return the largest integer not greater than @var{x}.\n\
 \n\
 This is equivalent to rounding towards negative infinity.  If @var{x} is\n\
@@ -1001,7 +1001,7 @@
 
 DEFUN (gamma, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} gamma (@var{z})\n\
+@deftypefn {} {} gamma (@var{z})\n\
 Compute the Gamma function.\n\
 \n\
 The Gamma function is defined as\n\
@@ -1070,7 +1070,7 @@
 
 DEFUN (imag, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} imag (@var{z})\n\
+@deftypefn {} {} imag (@var{z})\n\
 Return the imaginary part of @var{z} as a real number.\n\
 @seealso{real, conj}\n\
 @end deftypefn")
@@ -1098,7 +1098,7 @@
 
 DEFUNX ("isalnum", Fisalnum, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} isalnum (@var{s})\n\
+@deftypefn {} {} isalnum (@var{s})\n\
 Return a logical array which is true where the elements of @var{s} are\n\
 letters or digits and false where they are not.\n\
 \n\
@@ -1127,7 +1127,7 @@
 
 DEFUNX ("isalpha", Fisalpha, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} isalpha (@var{s})\n\
+@deftypefn {} {} isalpha (@var{s})\n\
 Return a logical array which is true where the elements of @var{s} are\n\
 letters and false where they are not.\n\
 \n\
@@ -1155,7 +1155,7 @@
 
 DEFUNX ("isascii", Fisascii, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} isascii (@var{s})\n\
+@deftypefn {} {} isascii (@var{s})\n\
 Return a logical array which is true where the elements of @var{s} are\n\
 ASCII characters (in the range 0 to 127 decimal) and false where they are\n\
 not.\n\
@@ -1179,7 +1179,7 @@
 
 DEFUNX ("iscntrl", Fiscntrl, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} iscntrl (@var{s})\n\
+@deftypefn {} {} iscntrl (@var{s})\n\
 Return a logical array which is true where the elements of @var{s} are\n\
 control characters and false where they are not.\n\
 @seealso{ispunct, isspace, isalpha, isdigit}\n\
@@ -1205,7 +1205,7 @@
 
 DEFUNX ("isdigit", Fisdigit, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} isdigit (@var{s})\n\
+@deftypefn {} {} isdigit (@var{s})\n\
 Return a logical array which is true where the elements of @var{s} are\n\
 decimal digits (0-9) and false where they are not.\n\
 @seealso{isxdigit, isalpha, isletter, ispunct, isspace, iscntrl}\n\
@@ -1230,7 +1230,7 @@
 
 DEFUN (isinf, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} isinf (@var{x})\n\
+@deftypefn {} {} isinf (@var{x})\n\
 Return a logical array which is true where the elements of @var{x} are\n\
 infinite and false where they are not.\n\
 \n\
@@ -1270,7 +1270,7 @@
 
 DEFUNX ("isgraph", Fisgraph, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} isgraph (@var{s})\n\
+@deftypefn {} {} isgraph (@var{s})\n\
 Return a logical array which is true where the elements of @var{s} are\n\
 printable characters (but not the space character) and false where they are\n\
 not.\n\
@@ -1296,7 +1296,7 @@
 
 DEFUNX ("islower", Fislower, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} islower (@var{s})\n\
+@deftypefn {} {} islower (@var{s})\n\
 Return a logical array which is true where the elements of @var{s} are\n\
 lowercase letters and false where they are not.\n\
 @seealso{isupper, isalpha, isletter, isalnum}\n\
@@ -1321,7 +1321,7 @@
 
 DEFUN (isna, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} isna (@var{x})\n\
+@deftypefn {} {} isna (@var{x})\n\
 Return a logical array which is true where the elements of @var{x} are\n\
 NA (missing) values and false where they are not.\n\
 \n\
@@ -1361,7 +1361,7 @@
 
 DEFUN (isnan, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} isnan (@var{x})\n\
+@deftypefn {} {} isnan (@var{x})\n\
 Return a logical array which is true where the elements of @var{x} are\n\
 NaN values and false where they are not.\n\
 \n\
@@ -1401,7 +1401,7 @@
 
 DEFUNX ("isprint", Fisprint, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} isprint (@var{s})\n\
+@deftypefn {} {} isprint (@var{s})\n\
 Return a logical array which is true where the elements of @var{s} are\n\
 printable characters (including the space character) and false where they\n\
 are not.\n\
@@ -1427,7 +1427,7 @@
 
 DEFUNX ("ispunct", Fispunct, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} ispunct (@var{s})\n\
+@deftypefn {} {} ispunct (@var{s})\n\
 Return a logical array which is true where the elements of @var{s} are\n\
 punctuation characters and false where they are not.\n\
 @seealso{isalpha, isdigit, isspace, iscntrl}\n\
@@ -1455,7 +1455,7 @@
 
 DEFUNX ("isspace", Fisspace, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} isspace (@var{s})\n\
+@deftypefn {} {} isspace (@var{s})\n\
 Return a logical array which is true where the elements of @var{s} are\n\
 whitespace characters (space, formfeed, newline, carriage return, tab, and\n\
 vertical tab) and false where they are not.\n\
@@ -1481,7 +1481,7 @@
 
 DEFUNX ("isupper", Fisupper, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} isupper (@var{s})\n\
+@deftypefn {} {} isupper (@var{s})\n\
 Return a logical array which is true where the elements of @var{s} are\n\
 uppercase letters and false where they are not.\n\
 @seealso{islower, isalpha, isletter, isalnum}\n\
@@ -1506,7 +1506,7 @@
 
 DEFUNX ("isxdigit", Fisxdigit, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} isxdigit (@var{s})\n\
+@deftypefn {} {} isxdigit (@var{s})\n\
 Return a logical array which is true where the elements of @var{s} are\n\
 hexadecimal digits (0-9 and @nospell{a-fA-F}).\n\
 @seealso{isdigit}\n\
@@ -1533,8 +1533,8 @@
 
 DEFUN (lgamma, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Mapping Function} {} gammaln (@var{x})\n\
-@deftypefnx {Mapping Function} {} lgamma (@var{x})\n\
+@deftypefn  {} {} gammaln (@var{x})\n\
+@deftypefnx {} {} lgamma (@var{x})\n\
 Return the natural logarithm of the gamma function of @var{x}.\n\
 @seealso{gamma, gammainc}\n\
 @end deftypefn")
@@ -1576,7 +1576,7 @@
 
 DEFUN (log, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} log (@var{x})\n\
+@deftypefn {} {} log (@var{x})\n\
 Compute the natural logarithm,\n\
 @tex\n\
 $\\ln{(x)},$\n\
@@ -1609,7 +1609,7 @@
 
 DEFUN (log10, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} log10 (@var{x})\n\
+@deftypefn {} {} log10 (@var{x})\n\
 Compute the base-10 logarithm of each element of @var{x}.\n\
 @seealso{log, log2, logspace, exp}\n\
 @end deftypefn")
@@ -1630,7 +1630,7 @@
 
 DEFUN (log1p, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} log1p (@var{x})\n\
+@deftypefn {} {} log1p (@var{x})\n\
 Compute\n\
 @tex\n\
 $\\ln{(1 + x)}$\n\
@@ -1658,7 +1658,7 @@
 
 DEFUN (real, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} real (@var{z})\n\
+@deftypefn {} {} real (@var{z})\n\
 Return the real part of @var{z}.\n\
 @seealso{imag, conj}\n\
 @end deftypefn")
@@ -1686,7 +1686,7 @@
 
 DEFUN (round, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} round (@var{x})\n\
+@deftypefn {} {} round (@var{x})\n\
 Return the integer nearest to @var{x}.\n\
 \n\
 If @var{x} is complex, return\n\
@@ -1731,7 +1731,7 @@
 
 DEFUN (roundb, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} roundb (@var{x})\n\
+@deftypefn {} {} roundb (@var{x})\n\
 Return the integer nearest to @var{x}.  If there are two nearest\n\
 integers, return the even one (banker's rounding).\n\
 \n\
@@ -1771,7 +1771,7 @@
 
 DEFUN (sign, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} sign (@var{x})\n\
+@deftypefn {} {} sign (@var{x})\n\
 Compute the @dfn{signum} function.\n\
 \n\
 This is defined as\n\
@@ -1823,7 +1823,7 @@
 
 DEFUNX ("signbit", Fsignbit, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} signbit (@var{x})\n\
+@deftypefn {} {} signbit (@var{x})\n\
 Return logical true if the value of @var{x} has its sign bit set and false\n\
 otherwise.\n\
 \n\
@@ -1862,7 +1862,7 @@
 
 DEFUN (sin, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} sin (@var{x})\n\
+@deftypefn {} {} sin (@var{x})\n\
 Compute the sine for each element of @var{x} in radians.\n\
 @seealso{asin, sind, sinh}\n\
 @end deftypefn")
@@ -1894,7 +1894,7 @@
 
 DEFUN (sinh, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} sinh (@var{x})\n\
+@deftypefn {} {} sinh (@var{x})\n\
 Compute the hyperbolic sine for each element of @var{x}.\n\
 @seealso{asinh, cosh, tanh}\n\
 @end deftypefn")
@@ -1922,7 +1922,7 @@
 
 DEFUN (sqrt, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} sqrt (@var{x})\n\
+@deftypefn {} {} sqrt (@var{x})\n\
 Compute the square root of each element of @var{x}.\n\
 \n\
 If @var{x} is negative, a complex result is returned.\n\
@@ -1954,7 +1954,7 @@
 
 DEFUN (tan, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} tan (@var{z})\n\
+@deftypefn {} {} tan (@var{z})\n\
 Compute the tangent for each element of @var{x} in radians.\n\
 @seealso{atan, tand, tanh}\n\
 @end deftypefn")
@@ -1986,7 +1986,7 @@
 
 DEFUN (tanh, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} tanh (@var{x})\n\
+@deftypefn {} {} tanh (@var{x})\n\
 Compute hyperbolic tangent for each element of @var{x}.\n\
 @seealso{atanh, sinh, cosh}\n\
 @end deftypefn")
@@ -2014,7 +2014,7 @@
 
 DEFUNX ("toascii", Ftoascii, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Mapping Function} {} toascii (@var{s})\n\
+@deftypefn {} {} toascii (@var{s})\n\
 Return ASCII representation of @var{s} in a matrix.\n\
 \n\
 For example:\n\
@@ -2049,8 +2049,8 @@
 
 DEFUNX ("tolower", Ftolower, args, ,
         "-*- texinfo -*-\n\
-@deftypefn  {Mapping Function} {} tolower (@var{s})\n\
-@deftypefnx {Mapping Function} {} lower (@var{s})\n\
+@deftypefn  {} {} tolower (@var{s})\n\
+@deftypefnx {} {} lower (@var{s})\n\
 Return a copy of the string or cell string @var{s}, with each uppercase\n\
 character replaced by the corresponding lowercase one; non-alphabetic\n\
 characters are left unchanged.\n\
@@ -2108,8 +2108,8 @@
 
 DEFUNX ("toupper", Ftoupper, args, ,
         "-*- texinfo -*-\n\
-@deftypefn  {Mapping Function} {} toupper (@var{s})\n\
-@deftypefnx {Mapping Function} {} upper (@var{s})\n\
+@deftypefn  {} {} toupper (@var{s})\n\
+@deftypefnx {} {} upper (@var{s})\n\
 Return a copy of the string or cell string @var{s}, with each lowercase\n\
 character replaced by the corresponding uppercase one; non-alphabetic\n\
 characters are left unchanged.\n\
--- a/libinterp/corefcn/matrix_type.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/matrix_type.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -38,12 +38,12 @@
 
 DEFUN (matrix_type, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{type} =} matrix_type (@var{A})\n\
-@deftypefnx {Built-in Function} {@var{type} =} matrix_type (@var{A}, \"nocompute\")\n\
-@deftypefnx {Built-in Function} {@var{A} =} matrix_type (@var{A}, @var{type})\n\
-@deftypefnx {Built-in Function} {@var{A} =} matrix_type (@var{A}, \"upper\", @var{perm})\n\
-@deftypefnx {Built-in Function} {@var{A} =} matrix_type (@var{A}, \"lower\", @var{perm})\n\
-@deftypefnx {Built-in Function} {@var{A} =} matrix_type (@var{A}, \"banded\", @var{nl}, @var{nu})\n\
+@deftypefn  {} {@var{type} =} matrix_type (@var{A})\n\
+@deftypefnx {} {@var{type} =} matrix_type (@var{A}, \"nocompute\")\n\
+@deftypefnx {} {@var{A} =} matrix_type (@var{A}, @var{type})\n\
+@deftypefnx {} {@var{A} =} matrix_type (@var{A}, \"upper\", @var{perm})\n\
+@deftypefnx {} {@var{A} =} matrix_type (@var{A}, \"lower\", @var{perm})\n\
+@deftypefnx {} {@var{A} =} matrix_type (@var{A}, \"banded\", @var{nl}, @var{nu})\n\
 Identify the matrix type or mark a matrix as a particular type.\n\
 \n\
 This allows more rapid solutions of linear equations involving @var{A} to be\n\
--- a/libinterp/corefcn/max.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/max.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -428,10 +428,10 @@
 
 DEFUN (min, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} min (@var{x})\n\
-@deftypefnx {Built-in Function} {} min (@var{x}, [], @var{dim})\n\
-@deftypefnx {Built-in Function} {[@var{w}, @var{iw}] =} min (@var{x})\n\
-@deftypefnx {Built-in Function} {} min (@var{x}, @var{y})\n\
+@deftypefn  {} {} min (@var{x})\n\
+@deftypefnx {} {} min (@var{x}, [], @var{dim})\n\
+@deftypefnx {} {[@var{w}, @var{iw}] =} min (@var{x})\n\
+@deftypefnx {} {} min (@var{x}, @var{y})\n\
 Find minimum values in the array @var{x}.\n\
 \n\
 For a vector argument, return the minimum value.  For a matrix argument,\n\
@@ -649,10 +649,10 @@
 
 DEFUN (max, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} max (@var{x})\n\
-@deftypefnx {Built-in Function} {} max (@var{x}, [], @var{dim})\n\
-@deftypefnx {Built-in Function} {[@var{w}, @var{iw}] =} max (@var{x})\n\
-@deftypefnx {Built-in Function} {} max (@var{x}, @var{y})\n\
+@deftypefn  {} {} max (@var{x})\n\
+@deftypefnx {} {} max (@var{x}, [], @var{dim})\n\
+@deftypefnx {} {[@var{w}, @var{iw}] =} max (@var{x})\n\
+@deftypefnx {} {} max (@var{x}, @var{y})\n\
 Find maximum values in the array @var{x}.\n\
 \n\
 For a vector argument, return the maximum value.  For a matrix argument,\n\
@@ -979,9 +979,9 @@
 
 DEFUN (cummin, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} cummin (@var{x})\n\
-@deftypefnx {Built-in Function} {} cummin (@var{x}, @var{dim})\n\
-@deftypefnx {Built-in Function} {[@var{w}, @var{iw}] =} cummin (@var{x})\n\
+@deftypefn  {} {} cummin (@var{x})\n\
+@deftypefnx {} {} cummin (@var{x}, @var{dim})\n\
+@deftypefnx {} {[@var{w}, @var{iw}] =} cummin (@var{x})\n\
 Return the cumulative minimum values along dimension @var{dim}.\n\
 \n\
 If @var{dim} is unspecified it defaults to column-wise operation.  For\n\
@@ -1035,9 +1035,9 @@
 
 DEFUN (cummax, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} cummax (@var{x})\n\
-@deftypefnx {Built-in Function} {} cummax (@var{x}, @var{dim})\n\
-@deftypefnx {Built-in Function} {[@var{w}, @var{iw}] =} cummax (@dots{})\n\
+@deftypefn  {} {} cummax (@var{x})\n\
+@deftypefnx {} {} cummax (@var{x}, @var{dim})\n\
+@deftypefnx {} {[@var{w}, @var{iw}] =} cummax (@dots{})\n\
 Return the cumulative maximum values along dimension @var{dim}.\n\
 \n\
 If @var{dim} is unspecified it defaults to column-wise operation.  For\n\
--- a/libinterp/corefcn/md5sum.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/md5sum.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -38,8 +38,8 @@
 
 DEFUN (md5sum, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} md5sum (@var{file})\n\
-@deftypefnx {Built-in Function} {} md5sum (@var{str}, @var{opt})\n\
+@deftypefn  {} {} md5sum (@var{file})\n\
+@deftypefnx {} {} md5sum (@var{str}, @var{opt})\n\
 Calculate the MD5 sum of the file @var{file}.\n\
 \n\
 If the second parameter @var{opt} exists and is true, then calculate the MD5\n\
--- a/libinterp/corefcn/mgorth.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/mgorth.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -50,7 +50,7 @@
 
 DEFUN (mgorth, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{y}, @var{h}] =} mgorth (@var{x}, @var{v})\n\
+@deftypefn {} {[@var{y}, @var{h}] =} mgorth (@var{x}, @var{v})\n\
 Orthogonalize a given column vector @var{x} with respect to a set of\n\
 orthonormal vectors comprising the columns of @var{v} using the modified\n\
 Gram-Schmidt method.\n\
--- a/libinterp/corefcn/nproc.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/nproc.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -29,8 +29,8 @@
 
 DEFUN (nproc, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} nproc ()\n\
-@deftypefnx {Built-in Function} {} nproc (@var{query})\n\
+@deftypefn  {} {} nproc ()\n\
+@deftypefnx {} {} nproc (@var{query})\n\
 Return the current number of available processors.\n\
 \n\
 If called with the optional argument @var{query}, modify how processors\n\
--- a/libinterp/corefcn/oct-hist.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/oct-hist.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -572,9 +572,9 @@
 
 DEFUN (edit_history, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} edit_history\n\
-@deftypefnx {Command} {} edit_history @var{cmd_number}\n\
-@deftypefnx {Command} {} edit_history @var{first} @var{last}\n\
+@deftypefn  {} {} edit_history\n\
+@deftypefnx {} {} edit_history @var{cmd_number}\n\
+@deftypefnx {} {} edit_history @var{first} @var{last}\n\
 Edit the history list using the editor named by the variable @env{EDITOR}.\n\
 \n\
 The commands to be edited are first copied to a temporary file.  When you\n\
@@ -614,10 +614,10 @@
 
 DEFUN (history, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} history\n\
-@deftypefnx {Command} {} history @var{opt1} @dots{}\n\
-@deftypefnx {Built-in Function} {@var{h} =} history ()\n\
-@deftypefnx {Built-in Function} {@var{h} =} history (@var{opt1}, @dots{})\n\
+@deftypefn  {} {} history\n\
+@deftypefnx {} {} history @var{opt1} @dots{}\n\
+@deftypefnx {} {@var{h} =} history ()\n\
+@deftypefnx {} {@var{h} =} history (@var{opt1}, @dots{})\n\
 If invoked with no arguments, @code{history} displays a list of commands\n\
 that you have executed.\n\
 \n\
@@ -666,9 +666,9 @@
 
 DEFUN (run_history, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} run_history\n\
-@deftypefnx {Command} {} run_history @var{cmd_number}\n\
-@deftypefnx {Command} {} run_history @var{first} @var{last}\n\
+@deftypefn  {} {} run_history\n\
+@deftypefnx {} {} run_history @var{cmd_number}\n\
+@deftypefnx {} {} run_history @var{first} @var{last}\n\
 Run commands from the history list.\n\
 \n\
 When invoked with no arguments, run the previously executed command;\n\
@@ -725,8 +725,8 @@
 
 DEFUN (history_control, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} history_control ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} history_control (@var{new_val})\n\
+@deftypefn  {} {@var{val} =} history_control ()\n\
+@deftypefnx {} {@var{old_val} =} history_control (@var{new_val})\n\
 Query or set the internal variable that specifies how commands are saved\n\
 to the history list.\n\
 \n\
@@ -763,8 +763,8 @@
 
 DEFUN (history_size, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} history_size ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} history_size (@var{new_val})\n\
+@deftypefn  {} {@var{val} =} history_size ()\n\
+@deftypefnx {} {@var{old_val} =} history_size (@var{new_val})\n\
 Query or set the internal variable that specifies how many entries\n\
 to store in the history file.\n\
 \n\
@@ -791,8 +791,8 @@
 
 DEFUN (history_file, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} history_file ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} history_file (@var{new_val})\n\
+@deftypefn  {} {@var{val} =} history_file ()\n\
+@deftypefnx {} {@var{old_val} =} history_file (@var{new_val})\n\
 Query or set the internal variable that specifies the name of the\n\
 file used to store command history.\n\
 \n\
@@ -817,9 +817,9 @@
 
 DEFUN (history_timestamp_format_string, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} history_timestamp_format_string ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} history_timestamp_format_string (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} history_timestamp_format_string (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} history_timestamp_format_string ()\n\
+@deftypefnx {} {@var{old_val} =} history_timestamp_format_string (@var{new_val})\n\
+@deftypefnx {} {} history_timestamp_format_string (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the format string\n\
 for the comment line that is written to the history file when Octave\n\
 exits.\n\
@@ -841,9 +841,9 @@
 
 DEFUN (history_save, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} history_save ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} history_save (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} history_save (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} history_save ()\n\
+@deftypefnx {} {@var{old_val} =} history_save (@var{new_val})\n\
+@deftypefnx {} {} history_save (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether commands entered\n\
 on the command line are saved in the history file.\n\
 \n\
--- a/libinterp/corefcn/octave-link.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/octave-link.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -105,7 +105,7 @@
 
 DEFUN (__octave_link_enabled__, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __octave_link_enabled__ ()\n\
+@deftypefn {} {} __octave_link_enabled__ ()\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -114,7 +114,7 @@
 
 DEFUN (__octave_link_edit_file__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __octave_link_edit_file__ (@var{file})\n\
+@deftypefn {} {} __octave_link_edit_file__ (@var{file})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -142,7 +142,7 @@
 
 DEFUN (__octave_link_message_dialog__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __octave_link_message_dialog__ (@var{dlg}, @var{msg}, @var{title})\n\
+@deftypefn {} {} __octave_link_message_dialog__ (@var{dlg}, @var{msg}, @var{title})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -164,7 +164,7 @@
 
 DEFUN (__octave_link_question_dialog__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __octave_link_question_dialog__ (@var{msg}, @var{title}, @var{btn1}, @var{btn2}, @var{btn3}, @var{default})\n\
+@deftypefn {} {} __octave_link_question_dialog__ (@var{msg}, @var{title}, @var{btn1}, @var{btn2}, @var{btn3}, @var{default})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -190,7 +190,7 @@
 
 DEFUN (__octave_link_file_dialog__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __octave_link_file_dialog__ (@var{filterlist}, @var{title}, @var{filename}, @var{size} @var{multiselect}, @var{pathname})\n\
+@deftypefn {} {} __octave_link_file_dialog__ (@var{filterlist}, @var{title}, @var{filename}, @var{size} @var{multiselect}, @var{pathname})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -265,7 +265,7 @@
 
 DEFUN (__octave_link_list_dialog__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __octave_link_list_dialog__ (@var{list}, @var{mode}, @var{size}, @var{intial}, @var{name}, @var{prompt}, @var{ok_string}, @var{cancel_string})\n\
+@deftypefn {} {} __octave_link_list_dialog__ (@var{list}, @var{mode}, @var{size}, @var{intial}, @var{name}, @var{prompt}, @var{ok_string}, @var{cancel_string})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -328,7 +328,7 @@
 
 DEFUN (__octave_link_input_dialog__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __octave_link_input_dialog__ (@var{prompt}, @var{title}, @var{rowscols}, @var{defaults})\n\
+@deftypefn {} {} __octave_link_input_dialog__ (@var{prompt}, @var{title}, @var{rowscols}, @var{defaults})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -385,7 +385,7 @@
 
 DEFUN (__octave_link_show_preferences__, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __octave_link_show_preferences__ ()\n\
+@deftypefn {} {} __octave_link_show_preferences__ ()\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -398,7 +398,7 @@
 
 DEFUN (__octave_link_show_doc__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __octave_link_show_doc__ (@var{filename})\n\
+@deftypefn {} {} __octave_link_show_doc__ (@var{filename})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
--- a/libinterp/corefcn/ordschur.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/ordschur.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -64,7 +64,7 @@
 
 DEFUN (ordschur, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {[@var{UR}, @var{SR}] =} ordschur (@var{U}, @var{S}, @var{select})\n\
+@deftypefn {} {[@var{UR}, @var{SR}] =} ordschur (@var{U}, @var{S}, @var{select})\n\
 Reorders the real Schur factorization (@var{U},@var{S}) obtained with the\n\
 @code{schur} function, so that selected eigenvalues appear in the upper left\n\
 diagonal blocks of the quasi triangular Schur matrix.\n\
--- a/libinterp/corefcn/pager.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/pager.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -514,10 +514,10 @@
 
 DEFUN (diary, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} diary\n\
-@deftypefnx {Command} {} diary on\n\
-@deftypefnx {Command} {} diary off\n\
-@deftypefnx {Command} {} diary @var{filename}\n\
+@deftypefn  {} {} diary\n\
+@deftypefnx {} {} diary on\n\
+@deftypefnx {} {} diary off\n\
+@deftypefnx {} {} diary @var{filename}\n\
 Record a list of all commands @emph{and} the output they produce, mixed\n\
 together just as they appear on the terminal.\n\
 \n\
@@ -579,7 +579,7 @@
 
 DEFUN (__diaryfile__, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{fname} =} __diaryfile__ ()\n\
+@deftypefn {} {@var{fname} =} __diaryfile__ ()\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -588,7 +588,7 @@
 
 DEFUN (__diarystate__, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{state} =} __diarystate__ ()\n\
+@deftypefn {} {@var{state} =} __diarystate__ ()\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -597,9 +597,9 @@
 
 DEFUN (more, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} more\n\
-@deftypefnx {Command} {} more on\n\
-@deftypefnx {Command} {} more off\n\
+@deftypefn  {} {} more\n\
+@deftypefnx {} {} more on\n\
+@deftypefnx {} {} more off\n\
 Turn output pagination on or off.\n\
 \n\
 Without an argument, @code{more} toggles the current state.\n\
@@ -636,7 +636,7 @@
 
 DEFUN (terminal_size, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} terminal_size ()\n\
+@deftypefn {} {} terminal_size ()\n\
 Return a two-element row vector containing the current size of the terminal\n\
 window in characters (rows and columns).\n\
 @seealso{list_in_columns}\n\
@@ -652,9 +652,9 @@
 
 DEFUN (page_output_immediately, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} page_output_immediately ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} page_output_immediately (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} page_output_immediately (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} page_output_immediately ()\n\
+@deftypefnx {} {@var{old_val} =} page_output_immediately (@var{new_val})\n\
+@deftypefnx {} {} page_output_immediately (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether Octave sends\n\
 output to the pager as soon as it is available.\n\
 \n\
@@ -672,9 +672,9 @@
 
 DEFUN (page_screen_output, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} page_screen_output ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} page_screen_output (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} page_screen_output (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} page_screen_output ()\n\
+@deftypefnx {} {@var{old_val} =} page_screen_output (@var{new_val})\n\
+@deftypefnx {} {} page_screen_output (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether output intended\n\
 for the terminal window that is longer than one page is sent through a\n\
 pager.\n\
@@ -694,9 +694,9 @@
 
 DEFUN (PAGER, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} PAGER ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} PAGER (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} PAGER (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} PAGER ()\n\
+@deftypefnx {} {@var{old_val} =} PAGER (@var{new_val})\n\
+@deftypefnx {} {} PAGER (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the program to use\n\
 to display terminal output on your system.\n\
 \n\
@@ -715,9 +715,9 @@
 
 DEFUN (PAGER_FLAGS, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} PAGER_FLAGS ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} PAGER_FLAGS (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} PAGER_FLAGS (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} PAGER_FLAGS ()\n\
+@deftypefnx {} {@var{old_val} =} PAGER_FLAGS (@var{new_val})\n\
+@deftypefnx {} {} PAGER_FLAGS (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the options to pass\n\
 to the pager.\n\
 \n\
--- a/libinterp/corefcn/pinv.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/pinv.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -38,8 +38,8 @@
 
 DEFUN (pinv, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} pinv (@var{x})\n\
-@deftypefnx {Built-in Function} {} pinv (@var{x}, @var{tol})\n\
+@deftypefn  {} {} pinv (@var{x})\n\
+@deftypefnx {} {} pinv (@var{x}, @var{tol})\n\
 Return the pseudoinverse of @var{x}.\n\
 \n\
 Singular values less than @var{tol} are ignored.\n\
--- a/libinterp/corefcn/pr-output.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/pr-output.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -3405,7 +3405,7 @@
 
 DEFUN (rats, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} rats (@var{x}, @var{len})\n\
+@deftypefn {} {} rats (@var{x}, @var{len})\n\
 Convert @var{x} into a rational approximation represented as a string.\n\
 \n\
 The string can be converted back into a matrix as follows:\n\
@@ -3484,7 +3484,7 @@
 
 DEFUN (disp, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} disp (@var{x})\n\
+@deftypefn {} {} disp (@var{x})\n\
 Display the value of @var{x}.\n\
 \n\
 For example:\n\
@@ -3527,7 +3527,7 @@
 
 DEFUN (fdisp, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} fdisp (@var{fid}, @var{x})\n\
+@deftypefn {} {} fdisp (@var{fid}, @var{x})\n\
 Display the value of @var{x} on the stream @var{fid}.\n\
 \n\
 For example:\n\
@@ -3862,8 +3862,8 @@
 
 DEFUN (format, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} format\n\
-@deftypefnx {Command} {} format options\n\
+@deftypefn  {} {} format\n\
+@deftypefnx {} {} format options\n\
 Reset or specify the format of the output produced by @code{disp} and\n\
 Octave's normal echoing mechanism.\n\
 \n\
@@ -4046,8 +4046,8 @@
 
 DEFUN (__compactformat__, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} __compactformat__ ()\n\
-@deftypefnx {Built-in Function} {} __compactformat__ (@var{TRUE|FALSE})\n\
+@deftypefn  {} {@var{val} =} __compactformat__ ()\n\
+@deftypefnx {} {} __compactformat__ (@var{TRUE|FALSE})\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -4056,7 +4056,7 @@
 
 DEFUN (__formatstring__, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{val} =} __formatstring__ ()\n\
+@deftypefn {} {@var{val} =} __formatstring__ ()\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -4065,9 +4065,9 @@
 
 DEFUN (fixed_point_format, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} fixed_point_format ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} fixed_point_format (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} fixed_point_format (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} fixed_point_format ()\n\
+@deftypefnx {} {@var{old_val} =} fixed_point_format (@var{new_val})\n\
+@deftypefnx {} {} fixed_point_format (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether Octave will\n\
 use a scaled format to print matrix values.\n\
 \n\
@@ -4106,9 +4106,9 @@
 
 DEFUN (print_empty_dimensions, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} print_empty_dimensions ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} print_empty_dimensions (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} print_empty_dimensions (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} print_empty_dimensions ()\n\
+@deftypefnx {} {@var{old_val} =} print_empty_dimensions (@var{new_val})\n\
+@deftypefnx {} {} print_empty_dimensions (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether the dimensions of\n\
 empty matrices are printed along with the empty matrix symbol, @samp{[]}.\n\
 \n\
@@ -4136,9 +4136,9 @@
 
 DEFUN (split_long_rows, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} split_long_rows ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} split_long_rows (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} split_long_rows (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} split_long_rows ()\n\
+@deftypefnx {} {@var{old_val} =} split_long_rows (@var{new_val})\n\
+@deftypefnx {} {} split_long_rows (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether rows of a matrix\n\
 may be split when displayed to a terminal window.\n\
 \n\
@@ -4175,9 +4175,9 @@
 
 DEFUN (output_max_field_width, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} output_max_field_width ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} output_max_field_width (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} output_max_field_width (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} output_max_field_width ()\n\
+@deftypefnx {} {@var{old_val} =} output_max_field_width (@var{new_val})\n\
+@deftypefnx {} {} output_max_field_width (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the maximum width\n\
 of a numeric output field.\n\
 \n\
@@ -4193,9 +4193,9 @@
 
 DEFUN (output_precision, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} output_precision ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} output_precision (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} output_precision (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} output_precision ()\n\
+@deftypefnx {} {@var{old_val} =} output_precision (@var{new_val})\n\
+@deftypefnx {} {} output_precision (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the minimum number of\n\
 significant figures to display for numeric output.\n\
 \n\
--- a/libinterp/corefcn/profiler.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/profiler.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -394,7 +394,7 @@
 // Enable or disable the profiler data collection.
 DEFUN (__profiler_enable__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Function File} {} __profiler_enable__ ()\n\
+@deftypefn {} {} __profiler_enable__ ()\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -412,7 +412,7 @@
 // Clear all collected profiling data.
 DEFUN (__profiler_reset__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Function File} {} __profiler_reset__ ()\n\
+@deftypefn {} {} __profiler_reset__ ()\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -429,7 +429,7 @@
 // Query the timings collected by the profiler.
 DEFUN (__profiler_data__, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Function File} {} __profiler_data__ ()\n\
+@deftypefn {} {} __profiler_data__ ()\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
--- a/libinterp/corefcn/psi.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/psi.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -34,8 +34,8 @@
 
 DEFUN (psi, args, ,
 "-*- texinfo -*-\n\
-@deftypefn  {Function File} {} psi (@var{z})\n\
-@deftypefnx {Function File} {} psi (@var{k}, @var{z})\n\
+@deftypefn  {} {} psi (@var{z})\n\
+@deftypefnx {} {} psi (@var{k}, @var{z})\n\
 Compute the psi (polygamma) function.\n\
 \n\
 The polygamma functions are the @var{k}th derivative of the logarithm\n\
--- a/libinterp/corefcn/pt-jit.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/pt-jit.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -2517,9 +2517,9 @@
 DEFUN (jit_failcnt, UNUSED_WITHOUT_LLVM (args),
        UNUSED_WITHOUT_LLVM (nargout),
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} jit_failcnt ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} jit_failcnt (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} jit_failcnt (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} jit_failcnt ()\n\
+@deftypefnx {} {@var{old_val} =} jit_failcnt (@var{new_val})\n\
+@deftypefnx {} {} jit_failcnt (@var{new_val}, \"local\")\n\
 Query or set the internal variable that counts the number of JIT fail\n\
 exceptions for Octave's JIT compiler.\n\
 \n\
@@ -2540,9 +2540,9 @@
 DEFUN (debug_jit, UNUSED_WITHOUT_LLVM (args),
        UNUSED_WITHOUT_LLVM (nargout),
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} debug_jit ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} debug_jit (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} debug_jit (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} debug_jit ()\n\
+@deftypefnx {} {@var{old_val} =} debug_jit (@var{new_val})\n\
+@deftypefnx {} {} debug_jit (@var{new_val}, \"local\")\n\
 Query or set the internal variable that determines whether\n\
 debugging/tracing is enabled for Octave's JIT compiler.\n\
 \n\
@@ -2563,9 +2563,9 @@
 DEFUN (jit_enable, UNUSED_WITHOUT_LLVM (args),
        UNUSED_WITHOUT_LLVM (nargout),
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} jit_enable ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} jit_enable (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} jit_enable (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} jit_enable ()\n\
+@deftypefnx {} {@var{old_val} =} jit_enable (@var{new_val})\n\
+@deftypefnx {} {} jit_enable (@var{new_val}, \"local\")\n\
 Query or set the internal variable that enables Octave's JIT compiler.\n\
 \n\
 When called from inside a function with the @qcode{\"local\"} option, the\n\
@@ -2585,9 +2585,9 @@
 DEFUN (jit_startcnt, UNUSED_WITHOUT_LLVM (args),
        UNUSED_WITHOUT_LLVM (nargout),
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} jit_startcnt ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} jit_startcnt (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} jit_startcnt (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} jit_startcnt ()\n\
+@deftypefnx {} {@var{old_val} =} jit_startcnt (@var{new_val})\n\
+@deftypefnx {} {} jit_startcnt (@var{new_val}, \"local\")\n\
 Query or set the internal variable that determines whether JIT compilation\n\
 will take place for a specific loop.\n\
 \n\
--- a/libinterp/corefcn/quad.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/quad.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -136,10 +136,10 @@
 
 DEFUN (quad, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{q} =} quad (@var{f}, @var{a}, @var{b})\n\
-@deftypefnx {Built-in Function} {@var{q} =} quad (@var{f}, @var{a}, @var{b}, @var{tol})\n\
-@deftypefnx {Built-in Function} {@var{q} =} quad (@var{f}, @var{a}, @var{b}, @var{tol}, @var{sing})\n\
-@deftypefnx {Built-in Function} {[@var{q}, @var{ier}, @var{nfun}, @var{err}] =} quad (@dots{})\n\
+@deftypefn  {} {@var{q} =} quad (@var{f}, @var{a}, @var{b})\n\
+@deftypefnx {} {@var{q} =} quad (@var{f}, @var{a}, @var{b}, @var{tol})\n\
+@deftypefnx {} {@var{q} =} quad (@var{f}, @var{a}, @var{b}, @var{tol}, @var{sing})\n\
+@deftypefnx {} {[@var{q}, @var{ier}, @var{nfun}, @var{err}] =} quad (@dots{})\n\
 Numerically evaluate the integral of @var{f} from @var{a} to @var{b} using\n\
 Fortran routines from @w{@sc{quadpack}}.\n\
 \n\
--- a/libinterp/corefcn/quadcc.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/quadcc.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -1487,10 +1487,10 @@
 
 DEFUN (quadcc, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Function File} {@var{q} =} quadcc (@var{f}, @var{a}, @var{b})\n\
-@deftypefnx {Function File} {@var{q} =} quadcc (@var{f}, @var{a}, @var{b}, @var{tol})\n\
-@deftypefnx {Function File} {@var{q} =} quadcc (@var{f}, @var{a}, @var{b}, @var{tol}, @var{sing})\n\
-@deftypefnx {Function File} {[@var{q}, @var{err}, @var{nr_points}] =} quadcc (@dots{})\n\
+@deftypefn  {} {@var{q} =} quadcc (@var{f}, @var{a}, @var{b})\n\
+@deftypefnx {} {@var{q} =} quadcc (@var{f}, @var{a}, @var{b}, @var{tol})\n\
+@deftypefnx {} {@var{q} =} quadcc (@var{f}, @var{a}, @var{b}, @var{tol}, @var{sing})\n\
+@deftypefnx {} {[@var{q}, @var{err}, @var{nr_points}] =} quadcc (@dots{})\n\
 Numerically evaluate the integral of @var{f} from @var{a} to @var{b}\n\
 using doubly-adaptive @nospell{Clenshaw-Curtis} quadrature.\n\
 \n\
--- a/libinterp/corefcn/qz.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/qz.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -293,8 +293,8 @@
 //       Compatibility problem?
 DEFUN (qz, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{lambda} =} qz (@var{A}, @var{B})\n\
-@deftypefnx {Built-in Function} {@var{lambda} =} qz (@var{A}, @var{B}, @var{opt})\n\
+@deftypefn  {} {@var{lambda} =} qz (@var{A}, @var{B})\n\
+@deftypefnx {} {@var{lambda} =} qz (@var{A}, @var{B}, @var{opt})\n\
 QZ@tie{}decomposition of the generalized eigenvalue problem\n\
 (@math{A x = s B x}).\n\
 \n\
--- a/libinterp/corefcn/rand.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/rand.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -348,17 +348,17 @@
 
 DEFUN (rand, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} rand (@var{n})\n\
-@deftypefnx {Built-in Function} {} rand (@var{m}, @var{n}, @dots{})\n\
-@deftypefnx {Built-in Function} {} rand ([@var{m} @var{n} @dots{}])\n\
-@deftypefnx {Built-in Function} {@var{v} =} rand (\"state\")\n\
-@deftypefnx {Built-in Function} {} rand (\"state\", @var{v})\n\
-@deftypefnx {Built-in Function} {} rand (\"state\", \"reset\")\n\
-@deftypefnx {Built-in Function} {@var{v} =} rand (\"seed\")\n\
-@deftypefnx {Built-in Function} {} rand (\"seed\", @var{v})\n\
-@deftypefnx {Built-in Function} {} rand (\"seed\", \"reset\")\n\
-@deftypefnx {Built-in Function} {} rand (@dots{}, \"single\")\n\
-@deftypefnx {Built-in Function} {} rand (@dots{}, \"double\")\n\
+@deftypefn  {} {} rand (@var{n})\n\
+@deftypefnx {} {} rand (@var{m}, @var{n}, @dots{})\n\
+@deftypefnx {} {} rand ([@var{m} @var{n} @dots{}])\n\
+@deftypefnx {} {@var{v} =} rand (\"state\")\n\
+@deftypefnx {} {} rand (\"state\", @var{v})\n\
+@deftypefnx {} {} rand (\"state\", \"reset\")\n\
+@deftypefnx {} {@var{v} =} rand (\"seed\")\n\
+@deftypefnx {} {} rand (\"seed\", @var{v})\n\
+@deftypefnx {} {} rand (\"seed\", \"reset\")\n\
+@deftypefnx {} {} rand (@dots{}, \"single\")\n\
+@deftypefnx {} {} rand (@dots{}, \"double\")\n\
 Return a matrix with random elements uniformly distributed on the\n\
 interval (0, 1).\n\
 \n\
@@ -533,17 +533,17 @@
 
 DEFUN (randn, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} randn (@var{n})\n\
-@deftypefnx {Built-in Function} {} randn (@var{m}, @var{n}, @dots{})\n\
-@deftypefnx {Built-in Function} {} randn ([@var{m} @var{n} @dots{}])\n\
-@deftypefnx {Built-in Function} {@var{v} =} randn (\"state\")\n\
-@deftypefnx {Built-in Function} {} randn (\"state\", @var{v})\n\
-@deftypefnx {Built-in Function} {} randn (\"state\", \"reset\")\n\
-@deftypefnx {Built-in Function} {@var{v} =} randn (\"seed\")\n\
-@deftypefnx {Built-in Function} {} randn (\"seed\", @var{v})\n\
-@deftypefnx {Built-in Function} {} randn (\"seed\", \"reset\")\n\
-@deftypefnx {Built-in Function} {} randn (@dots{}, \"single\")\n\
-@deftypefnx {Built-in Function} {} randn (@dots{}, \"double\")\n\
+@deftypefn  {} {} randn (@var{n})\n\
+@deftypefnx {} {} randn (@var{m}, @var{n}, @dots{})\n\
+@deftypefnx {} {} randn ([@var{m} @var{n} @dots{}])\n\
+@deftypefnx {} {@var{v} =} randn (\"state\")\n\
+@deftypefnx {} {} randn (\"state\", @var{v})\n\
+@deftypefnx {} {} randn (\"state\", \"reset\")\n\
+@deftypefnx {} {@var{v} =} randn (\"seed\")\n\
+@deftypefnx {} {} randn (\"seed\", @var{v})\n\
+@deftypefnx {} {} randn (\"seed\", \"reset\")\n\
+@deftypefnx {} {} randn (@dots{}, \"single\")\n\
+@deftypefnx {} {} randn (@dots{}, \"double\")\n\
 Return a matrix with normally distributed random elements having zero mean\n\
 and variance one.\n\
 \n\
@@ -606,17 +606,17 @@
 
 DEFUN (rande, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} rande (@var{n})\n\
-@deftypefnx {Built-in Function} {} rande (@var{m}, @var{n}, @dots{})\n\
-@deftypefnx {Built-in Function} {} rande ([@var{m} @var{n} @dots{}])\n\
-@deftypefnx {Built-in Function} {@var{v} =} rande (\"state\")\n\
-@deftypefnx {Built-in Function} {} rande (\"state\", @var{v})\n\
-@deftypefnx {Built-in Function} {} rande (\"state\", \"reset\")\n\
-@deftypefnx {Built-in Function} {@var{v} =} rande (\"seed\")\n\
-@deftypefnx {Built-in Function} {} rande (\"seed\", @var{v})\n\
-@deftypefnx {Built-in Function} {} rande (\"seed\", \"reset\")\n\
-@deftypefnx {Built-in Function} {} rande (@dots{}, \"single\")\n\
-@deftypefnx {Built-in Function} {} rande (@dots{}, \"double\")\n\
+@deftypefn  {} {} rande (@var{n})\n\
+@deftypefnx {} {} rande (@var{m}, @var{n}, @dots{})\n\
+@deftypefnx {} {} rande ([@var{m} @var{n} @dots{}])\n\
+@deftypefnx {} {@var{v} =} rande (\"state\")\n\
+@deftypefnx {} {} rande (\"state\", @var{v})\n\
+@deftypefnx {} {} rande (\"state\", \"reset\")\n\
+@deftypefnx {} {@var{v} =} rande (\"seed\")\n\
+@deftypefnx {} {} rande (\"seed\", @var{v})\n\
+@deftypefnx {} {} rande (\"seed\", \"reset\")\n\
+@deftypefnx {} {} rande (@dots{}, \"single\")\n\
+@deftypefnx {} {} rande (@dots{}, \"double\")\n\
 Return a matrix with exponentially distributed random elements.\n\
 \n\
 The arguments are handled the same as the arguments for @code{rand}.\n\
@@ -680,17 +680,17 @@
 
 DEFUN (randg, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} randg (@var{n})\n\
-@deftypefnx {Built-in Function} {} randg (@var{m}, @var{n}, @dots{})\n\
-@deftypefnx {Built-in Function} {} randg ([@var{m} @var{n} @dots{}])\n\
-@deftypefnx {Built-in Function} {@var{v} =} randg (\"state\")\n\
-@deftypefnx {Built-in Function} {} randg (\"state\", @var{v})\n\
-@deftypefnx {Built-in Function} {} randg (\"state\", \"reset\")\n\
-@deftypefnx {Built-in Function} {@var{v} =} randg (\"seed\")\n\
-@deftypefnx {Built-in Function} {} randg (\"seed\", @var{v})\n\
-@deftypefnx {Built-in Function} {} randg (\"seed\", \"reset\")\n\
-@deftypefnx {Built-in Function} {} randg (@dots{}, \"single\")\n\
-@deftypefnx {Built-in Function} {} randg (@dots{}, \"double\")\n\
+@deftypefn  {} {} randg (@var{n})\n\
+@deftypefnx {} {} randg (@var{m}, @var{n}, @dots{})\n\
+@deftypefnx {} {} randg ([@var{m} @var{n} @dots{}])\n\
+@deftypefnx {} {@var{v} =} randg (\"state\")\n\
+@deftypefnx {} {} randg (\"state\", @var{v})\n\
+@deftypefnx {} {} randg (\"state\", \"reset\")\n\
+@deftypefnx {} {@var{v} =} randg (\"seed\")\n\
+@deftypefnx {} {} randg (\"seed\", @var{v})\n\
+@deftypefnx {} {} randg (\"seed\", \"reset\")\n\
+@deftypefnx {} {} randg (@dots{}, \"single\")\n\
+@deftypefnx {} {} randg (@dots{}, \"double\")\n\
 Return a matrix with @code{gamma (@var{a},1)} distributed random elements.\n\
 \n\
 The arguments are handled the same as the arguments for @code{rand}, except\n\
@@ -958,17 +958,17 @@
 
 DEFUN (randp, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} randp (@var{l}, @var{n})\n\
-@deftypefnx {Built-in Function} {} randp (@var{l}, @var{m}, @var{n}, @dots{})\n\
-@deftypefnx {Built-in Function} {} randp (@var{l}, [@var{m} @var{n} @dots{}])\n\
-@deftypefnx {Built-in Function} {@var{v} =} randp (\"state\")\n\
-@deftypefnx {Built-in Function} {} randp (\"state\", @var{v})\n\
-@deftypefnx {Built-in Function} {} randp (\"state\", \"reset\")\n\
-@deftypefnx {Built-in Function} {@var{v} =} randp (\"seed\")\n\
-@deftypefnx {Built-in Function} {} randp (\"seed\", @var{v})\n\
-@deftypefnx {Built-in Function} {} randp (\"seed\", \"reset\")\n\
-@deftypefnx {Built-in Function} {} randp (@dots{}, \"single\")\n\
-@deftypefnx {Built-in Function} {} randp (@dots{}, \"double\")\n\
+@deftypefn  {} {} randp (@var{l}, @var{n})\n\
+@deftypefnx {} {} randp (@var{l}, @var{m}, @var{n}, @dots{})\n\
+@deftypefnx {} {} randp (@var{l}, [@var{m} @var{n} @dots{}])\n\
+@deftypefnx {} {@var{v} =} randp (\"state\")\n\
+@deftypefnx {} {} randp (\"state\", @var{v})\n\
+@deftypefnx {} {} randp (\"state\", \"reset\")\n\
+@deftypefnx {} {@var{v} =} randp (\"seed\")\n\
+@deftypefnx {} {} randp (\"seed\", @var{v})\n\
+@deftypefnx {} {} randp (\"seed\", \"reset\")\n\
+@deftypefnx {} {} randp (@dots{}, \"single\")\n\
+@deftypefnx {} {} randp (@dots{}, \"double\")\n\
 Return a matrix with Poisson distributed random elements with mean value\n\
 parameter given by the first argument, @var{l}.\n\
 \n\
@@ -1107,8 +1107,8 @@
 
 DEFUN (randperm, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} randperm (@var{n})\n\
-@deftypefnx {Built-in Function} {} randperm (@var{n}, @var{m})\n\
+@deftypefn  {} {} randperm (@var{n})\n\
+@deftypefnx {} {} randperm (@var{n}, @var{m})\n\
 Return a row vector containing a random permutation of @code{1:@var{n}}.\n\
 \n\
 If @var{m} is supplied, return @var{m} unique entries, sampled without\n\
--- a/libinterp/corefcn/rcond.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/rcond.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -32,7 +32,7 @@
 
 DEFUN (rcond, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{c} =} rcond (@var{A})\n\
+@deftypefn {} {@var{c} =} rcond (@var{A})\n\
 Compute the 1-norm estimate of the reciprocal condition number as returned\n\
 by @sc{lapack}.\n\
 \n\
--- a/libinterp/corefcn/regexp.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/regexp.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -649,8 +649,8 @@
 
 DEFUN (regexp, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{s}, @var{e}, @var{te}, @var{m}, @var{t}, @var{nm}, @var{sp}] =} regexp (@var{str}, @var{pat})\n\
-@deftypefnx {Built-in Function} {[@dots{}] =} regexp (@var{str}, @var{pat}, \"@var{opt1}\", @dots{})\n\
+@deftypefn  {} {[@var{s}, @var{e}, @var{te}, @var{m}, @var{t}, @var{nm}, @var{sp}] =} regexp (@var{str}, @var{pat})\n\
+@deftypefnx {} {[@dots{}] =} regexp (@var{str}, @var{pat}, \"@var{opt1}\", @dots{})\n\
 Regular expression string matching.\n\
 \n\
 Search for @var{pat} in @var{str} and return the positions and substrings of\n\
@@ -1136,8 +1136,8 @@
 
 DEFUN (regexpi, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{s}, @var{e}, @var{te}, @var{m}, @var{t}, @var{nm}, @var{sp}] =} regexpi (@var{str}, @var{pat})\n\
-@deftypefnx {Built-in Function} {[@dots{}] =} regexpi (@var{str}, @var{pat}, \"@var{opt1}\", @dots{})\n\
+@deftypefn  {} {[@var{s}, @var{e}, @var{te}, @var{m}, @var{t}, @var{nm}, @var{sp}] =} regexpi (@var{str}, @var{pat})\n\
+@deftypefnx {} {[@dots{}] =} regexpi (@var{str}, @var{pat}, \"@var{opt1}\", @dots{})\n\
 \n\
 Case insensitive regular expression string matching.\n\
 \n\
@@ -1342,8 +1342,8 @@
 
 DEFUN (regexprep, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{outstr} =} regexprep (@var{string}, @var{pat}, @var{repstr})\n\
-@deftypefnx {Built-in Function} {@var{outstr} =} regexprep (@var{string}, @var{pat}, @var{repstr}, \"@var{opt1}\", @dots{})\n\
+@deftypefn  {} {@var{outstr} =} regexprep (@var{string}, @var{pat}, @var{repstr})\n\
+@deftypefnx {} {@var{outstr} =} regexprep (@var{string}, @var{pat}, @var{repstr}, \"@var{opt1}\", @dots{})\n\
 Replace occurrences of pattern @var{pat} in @var{string} with @var{repstr}.\n\
 \n\
 The pattern is a regular expression as documented for @code{regexp}.\n\
--- a/libinterp/corefcn/schur.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/schur.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -59,11 +59,11 @@
 
 DEFUN (schur, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{S} =} schur (@var{A})\n\
-@deftypefnx {Built-in Function} {@var{S} =} schur (@var{A}, \"real\")\n\
-@deftypefnx {Built-in Function} {@var{S} =} schur (@var{A}, \"complex\")\n\
-@deftypefnx {Built-in Function} {@var{S} =} schur (@var{A}, @var{opt})\n\
-@deftypefnx {Built-in Function} {[@var{U}, @var{S}] =} schur (@dots{})\n\
+@deftypefn  {} {@var{S} =} schur (@var{A})\n\
+@deftypefnx {} {@var{S} =} schur (@var{A}, \"real\")\n\
+@deftypefnx {} {@var{S} =} schur (@var{A}, \"complex\")\n\
+@deftypefnx {} {@var{S} =} schur (@var{A}, @var{opt})\n\
+@deftypefnx {} {[@var{U}, @var{S}] =} schur (@dots{})\n\
 @cindex Schur decomposition\n\
 Compute the Schur@tie{}decomposition of @var{A}.\n\
 \n\
@@ -273,7 +273,7 @@
 
 DEFUN (rsf2csf, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Function File} {[@var{U}, @var{T}] =} rsf2csf (@var{UR}, @var{TR})\n\
+@deftypefn {} {[@var{U}, @var{T}] =} rsf2csf (@var{UR}, @var{TR})\n\
 Convert a real, upper quasi-triangular Schur@tie{}form @var{TR} to a complex,\n\
 upper triangular Schur@tie{}form @var{T}.\n\
 \n\
--- a/libinterp/corefcn/sighandlers.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/sighandlers.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -1048,7 +1048,7 @@
 
 DEFUN (SIG, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} SIG ()\n\
+@deftypefn {} {} SIG ()\n\
 Return a structure containing Unix signal names and their defined values.\n\
 @end deftypefn")
 {
@@ -1069,9 +1069,9 @@
 
 DEFUN (debug_on_interrupt, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} debug_on_interrupt ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} debug_on_interrupt (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} debug_on_interrupt (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} debug_on_interrupt ()\n\
+@deftypefnx {} {@var{old_val} =} debug_on_interrupt (@var{new_val})\n\
+@deftypefnx {} {} debug_on_interrupt (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether Octave will try\n\
 to enter debugging mode when it receives an interrupt signal (typically\n\
 generated with @kbd{C-c}).\n\
@@ -1102,9 +1102,9 @@
 
 DEFUN (sighup_dumps_octave_core, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} sighup_dumps_octave_core ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} sighup_dumps_octave_core (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} sighup_dumps_octave_core (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} sighup_dumps_octave_core ()\n\
+@deftypefnx {} {@var{old_val} =} sighup_dumps_octave_core (@var{new_val})\n\
+@deftypefnx {} {} sighup_dumps_octave_core (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether Octave tries\n\
 to save all current variables to the file @file{octave-workspace} if it\n\
 receives a hangup signal.\n\
@@ -1131,9 +1131,9 @@
 
 DEFUN (sigterm_dumps_octave_core, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} sigterm_dumps_octave_core ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} sigterm_dumps_octave_core (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} sigterm_dumps_octave_core (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} sigterm_dumps_octave_core ()\n\
+@deftypefnx {} {@var{old_val} =} sigterm_dumps_octave_core (@var{new_val})\n\
+@deftypefnx {} {} sigterm_dumps_octave_core (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether Octave tries\n\
 to save all current variables to the file @file{octave-workspace} if it\n\
 receives a terminate signal.\n\
--- a/libinterp/corefcn/sparse.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/sparse.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -43,7 +43,7 @@
 
 DEFUN (issparse, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} issparse (@var{x})\n\
+@deftypefn {} {} issparse (@var{x})\n\
 Return true if @var{x} is a sparse matrix.\n\
 @seealso{ismatrix}\n\
 @end deftypefn")
@@ -56,12 +56,12 @@
 
 DEFUN (sparse, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{s} =} sparse (@var{a})\n\
-@deftypefnx {Built-in Function} {@var{s} =} sparse (@var{i}, @var{j}, @var{sv}, @var{m}, @var{n})\n\
-@deftypefnx {Built-in Function} {@var{s} =} sparse (@var{i}, @var{j}, @var{sv})\n\
-@deftypefnx {Built-in Function} {@var{s} =} sparse (@var{m}, @var{n})\n\
-@deftypefnx {Built-in Function} {@var{s} =} sparse (@var{i}, @var{j}, @var{s}, @var{m}, @var{n}, \"unique\")\n\
-@deftypefnx {Built-in Function} {@var{s} =} sparse (@var{i}, @var{j}, @var{sv}, @var{m}, @var{n}, @var{nzmax})\n\
+@deftypefn  {} {@var{s} =} sparse (@var{a})\n\
+@deftypefnx {} {@var{s} =} sparse (@var{i}, @var{j}, @var{sv}, @var{m}, @var{n})\n\
+@deftypefnx {} {@var{s} =} sparse (@var{i}, @var{j}, @var{sv})\n\
+@deftypefnx {} {@var{s} =} sparse (@var{m}, @var{n})\n\
+@deftypefnx {} {@var{s} =} sparse (@var{i}, @var{j}, @var{s}, @var{m}, @var{n}, \"unique\")\n\
+@deftypefnx {} {@var{s} =} sparse (@var{i}, @var{j}, @var{sv}, @var{m}, @var{n}, @var{nzmax})\n\
 Create a sparse matrix from a full matrix, or row, column, value triplets.\n\
 \n\
 If @var{a} is a full matrix, convert it to a sparse matrix representation,\n\
@@ -221,7 +221,7 @@
 
 DEFUN (spalloc, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{s} =} spalloc (@var{m}, @var{n}, @var{nz})\n\
+@deftypefn {} {@var{s} =} spalloc (@var{m}, @var{n}, @var{nz})\n\
 Create an @var{m}-by-@var{n} sparse matrix with pre-allocated space for at\n\
 most @var{nz} nonzero elements.\n\
 \n\
--- a/libinterp/corefcn/spparms.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/spparms.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -35,14 +35,14 @@
 
 DEFUN (spparms, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} { } spparms ()\n\
-@deftypefnx {Built-in Function} {@var{vals} =} spparms ()\n\
-@deftypefnx {Built-in Function} {[@var{keys}, @var{vals}] =} spparms ()\n\
-@deftypefnx {Built-in Function} {@var{val} =} spparms (@var{key})\n\
-@deftypefnx {Built-in Function} { } spparms (@var{vals})\n\
-@deftypefnx {Built-in Function} { } spparms (\"default\")\n\
-@deftypefnx {Built-in Function} { } spparms (\"tight\")\n\
-@deftypefnx {Built-in Function} { } spparms (@var{key}, @var{val})\n\
+@deftypefn  {} { } spparms ()\n\
+@deftypefnx {} {@var{vals} =} spparms ()\n\
+@deftypefnx {} {[@var{keys}, @var{vals}] =} spparms ()\n\
+@deftypefnx {} {@var{val} =} spparms (@var{key})\n\
+@deftypefnx {} { } spparms (@var{vals})\n\
+@deftypefnx {} { } spparms (\"default\")\n\
+@deftypefnx {} { } spparms (\"tight\")\n\
+@deftypefnx {} { } spparms (@var{key}, @var{val})\n\
 Query or set the parameters used by the sparse solvers and factorization\n\
 functions.\n\
 \n\
--- a/libinterp/corefcn/sqrtm.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/sqrtm.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -202,8 +202,8 @@
 
 DEFUN (sqrtm, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{s} =} sqrtm (@var{A})\n\
-@deftypefnx {Built-in Function} {[@var{s}, @var{error_estimate}] =} sqrtm (@var{A})\n\
+@deftypefn  {} {@var{s} =} sqrtm (@var{A})\n\
+@deftypefnx {} {[@var{s}, @var{error_estimate}] =} sqrtm (@var{A})\n\
 Compute the matrix square root of the square matrix @var{A}.\n\
 \n\
 Ref: @nospell{N.J. Higham}.  @cite{A New sqrtm for @sc{matlab}}.  Numerical\n\
--- a/libinterp/corefcn/str2double.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/str2double.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -296,7 +296,7 @@
 
 DEFUN (str2double, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} str2double (@var{s})\n\
+@deftypefn {} {} str2double (@var{s})\n\
 Convert a string to a real or complex number.\n\
 \n\
 The string must be in one of the following formats where a and b are real\n\
--- a/libinterp/corefcn/strfind.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/strfind.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -150,9 +150,9 @@
 
 DEFUN (strfind, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{idx} =} strfind (@var{str}, @var{pattern})\n\
-@deftypefnx {Built-in Function} {@var{idx} =} strfind (@var{cellstr}, @var{pattern})\n\
-@deftypefnx {Built-in Function} {@var{idx} =} strfind (@dots{}, \"overlaps\", @var{val})\n\
+@deftypefn  {} {@var{idx} =} strfind (@var{str}, @var{pattern})\n\
+@deftypefnx {} {@var{idx} =} strfind (@var{cellstr}, @var{pattern})\n\
+@deftypefnx {} {@var{idx} =} strfind (@dots{}, \"overlaps\", @var{val})\n\
 Search for @var{pattern} in the string @var{str} and return the starting\n\
 index of every such occurrence in the vector @var{idx}.\n\
 \n\
@@ -358,9 +358,9 @@
 
 DEFUN (strrep, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{newstr} =} strrep (@var{str}, @var{ptn}, @var{rep})\n\
-@deftypefnx {Built-in Function} {@var{newstr} =} strrep (@var{cellstr}, @var{ptn}, @var{rep})\n\
-@deftypefnx {Built-in Function} {@var{newstr} =} strrep (@dots{}, \"overlaps\", @var{val})\n\
+@deftypefn  {} {@var{newstr} =} strrep (@var{str}, @var{ptn}, @var{rep})\n\
+@deftypefnx {} {@var{newstr} =} strrep (@var{cellstr}, @var{ptn}, @var{rep})\n\
+@deftypefnx {} {@var{newstr} =} strrep (@dots{}, \"overlaps\", @var{val})\n\
 Replace all occurrences of the pattern @var{ptn} in the string @var{str}\n\
 with the string @var{rep} and return the result.\n\
 \n\
--- a/libinterp/corefcn/strfns.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/strfns.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -42,10 +42,10 @@
 
 DEFUN (char, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} char (@var{x})\n\
-@deftypefnx {Built-in Function} {} char (@var{x}, @dots{})\n\
-@deftypefnx {Built-in Function} {} char (@var{s1}, @var{s2}, @dots{})\n\
-@deftypefnx {Built-in Function} {} char (@var{cell_array})\n\
+@deftypefn  {} {} char (@var{x})\n\
+@deftypefnx {} {} char (@var{x}, @dots{})\n\
+@deftypefnx {} {} char (@var{s1}, @var{s2}, @dots{})\n\
+@deftypefnx {} {} char (@var{cell_array})\n\
 Create a string array from one or more numeric matrices, character\n\
 matrices, or cell arrays.\n\
 \n\
@@ -167,10 +167,10 @@
 
 DEFUN (strvcat, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} strvcat (@var{x})\n\
-@deftypefnx {Built-in Function} {} strvcat (@var{x}, @dots{})\n\
-@deftypefnx {Built-in Function} {} strvcat (@var{s1}, @var{s2}, @dots{})\n\
-@deftypefnx {Built-in Function} {} strvcat (@var{cell_array})\n\
+@deftypefn  {} {} strvcat (@var{x})\n\
+@deftypefnx {} {} strvcat (@var{x}, @dots{})\n\
+@deftypefnx {} {} strvcat (@var{s1}, @var{s2}, @dots{})\n\
+@deftypefnx {} {} strvcat (@var{cell_array})\n\
 Create a character array from one or more numeric matrices, character\n\
 matrices, or cell arrays.\n\
 \n\
@@ -284,7 +284,7 @@
 
 DEFUN (ischar, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} ischar (@var{x})\n\
+@deftypefn {} {} ischar (@var{x})\n\
 Return true if @var{x} is a character array.\n\
 @seealso{isfloat, isinteger, islogical, isnumeric, iscellstr, isa}\n\
 @end deftypefn")
@@ -536,7 +536,7 @@
 
 DEFUN (strcmp, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} strcmp (@var{s1}, @var{s2})\n\
+@deftypefn {} {} 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\
@@ -632,7 +632,7 @@
 
 DEFUN (strncmp, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} strncmp (@var{s1}, @var{s2}, @var{n})\n\
+@deftypefn {} {} strncmp (@var{s1}, @var{s2}, @var{n})\n\
 Return 1 if the first @var{n} characters of strings @var{s1} and @var{s2} are\n\
 the same, and 0 otherwise.\n\
 \n\
@@ -721,7 +721,7 @@
 
 DEFUNX ("strcmpi", Fstrcmpi, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} strcmpi (@var{s1}, @var{s2})\n\
+@deftypefn {} {} strcmpi (@var{s1}, @var{s2})\n\
 Return 1 if the character strings @var{s1} and @var{s2} are the same,\n\
 disregarding case of alphabetic characters, and 0 otherwise.\n\
 \n\
@@ -778,7 +778,7 @@
 
 DEFUNX ("strncmpi", Fstrncmpi, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} strncmpi (@var{s1}, @var{s2}, @var{n})\n\
+@deftypefn {} {} strncmpi (@var{s1}, @var{s2}, @var{n})\n\
 Return 1 if the first @var{n} character of @var{s1} and @var{s2} are the\n\
 same, disregarding case of alphabetic characters, and 0 otherwise.\n\
 \n\
@@ -818,7 +818,7 @@
 
 DEFUN (list_in_columns, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} list_in_columns (@var{arg}, @var{width}, @var{prefix})\n\
+@deftypefn {} {} list_in_columns (@var{arg}, @var{width}, @var{prefix})\n\
 Return a string containing the elements of @var{arg} listed in columns with\n\
 an overall maximum width of @var{width} and optional prefix @var{prefix}.\n\
 \n\
--- a/libinterp/corefcn/sub2ind.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/sub2ind.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -65,8 +65,8 @@
 
 DEFUN (sub2ind, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Function File} {@var{ind} =} sub2ind (@var{dims}, @var{i}, @var{j})\n\
-@deftypefnx {Function File} {@var{ind} =} sub2ind (@var{dims}, @var{s1}, @var{s2}, @dots{}, @var{sN})\n\
+@deftypefn  {} {@var{ind} =} sub2ind (@var{dims}, @var{i}, @var{j})\n\
+@deftypefnx {} {@var{ind} =} sub2ind (@var{dims}, @var{s1}, @var{s2}, @dots{}, @var{sN})\n\
 Convert subscripts to a linear index.\n\
 \n\
 The following example shows how to convert the two-dimensional index\n\
@@ -164,7 +164,7 @@
 
 DEFUN (ind2sub, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Function File} {[@var{s1}, @var{s2}, @dots{}, @var{sN}] =} ind2sub (@var{dims}, @var{ind})\n\
+@deftypefn {} {[@var{s1}, @var{s2}, @dots{}, @var{sN}] =} ind2sub (@var{dims}, @var{ind})\n\
 Convert a linear index to subscripts.\n\
 \n\
 The following example shows how to convert the linear index @code{8}\n\
--- a/libinterp/corefcn/svd.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/svd.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -41,9 +41,9 @@
 
 DEFUN (svd, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{s} =} svd (@var{A})\n\
-@deftypefnx {Built-in Function} {[@var{U}, @var{S}, @var{V}] =} svd (@var{A})\n\
-@deftypefnx {Built-in Function} {[@var{U}, @var{S}, @var{V}] =} svd (@var{A}, @var{econ})\n\
+@deftypefn  {} {@var{s} =} svd (@var{A})\n\
+@deftypefnx {} {[@var{U}, @var{S}, @var{V}] =} svd (@var{A})\n\
+@deftypefnx {} {[@var{U}, @var{S}, @var{V}] =} svd (@var{A}, @var{econ})\n\
 @cindex singular value decomposition\n\
 Compute the singular value decomposition of @var{A}\n\
 @tex\n\
@@ -367,9 +367,9 @@
 
 DEFUN (svd_driver, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} svd_driver ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} svd_driver (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} svd_driver (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} svd_driver ()\n\
+@deftypefnx {} {@var{old_val} =} svd_driver (@var{new_val})\n\
+@deftypefnx {} {} svd_driver (@var{new_val}, \"local\")\n\
 Query or set the underlying @sc{lapack} driver used by @code{svd}.\n\
 \n\
 Currently recognized values are @qcode{\"gesvd\"} and @qcode{\"gesdd\"}.\n\
--- a/libinterp/corefcn/sylvester.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/sylvester.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -34,7 +34,7 @@
 
 DEFUN (sylvester, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{X} =} syl (@var{A}, @var{B}, @var{C})\n\
+@deftypefn {} {@var{X} =} syl (@var{A}, @var{B}, @var{C})\n\
 Solve the Sylvester equation\n\
 @tex\n\
 $$\n\
--- a/libinterp/corefcn/symtab.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/symtab.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -1647,8 +1647,8 @@
 
 DEFUN (ignore_function_time_stamp, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} ignore_function_time_stamp ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} ignore_function_time_stamp (@var{new_val})\n\
+@deftypefn  {} {@var{val} =} ignore_function_time_stamp ()\n\
+@deftypefnx {} {@var{old_val} =} ignore_function_time_stamp (@var{new_val})\n\
 Query or set the internal variable that controls whether Octave checks\n\
 the time stamp on files each time it looks up functions defined in\n\
 function files.\n\
@@ -1726,7 +1726,7 @@
 
 DEFUN (__current_scope__, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{scope}, @var{context}]} __current_scope__ ()\n\
+@deftypefn {} {[@var{scope}, @var{context}]} __current_scope__ ()\n\
 Return the current scope and context as integers.\n\
 @seealso{__dump_symtab_info__}\n\
 @end deftypefn")
@@ -1741,10 +1741,10 @@
 
 DEFUN (__dump_symtab_info__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} __dump_symtab_info__ ()\n\
-@deftypefnx {Built-in Function} {} __dump_symtab_info__ (@var{scope})\n\
-@deftypefnx {Built-in Function} {} __dump_symtab_info__ (\"scopes\")\n\
-@deftypefnx {Built-in Function} {} __dump_symtab_info__ (\"functions\")\n\
+@deftypefn  {} {} __dump_symtab_info__ ()\n\
+@deftypefnx {} {} __dump_symtab_info__ (@var{scope})\n\
+@deftypefnx {} {} __dump_symtab_info__ (\"scopes\")\n\
+@deftypefnx {} {} __dump_symtab_info__ (\"functions\")\n\
 Undocumented internal function.\n\
 @seealso{__current_scope__}\n\
 @end deftypefn")
@@ -1810,7 +1810,7 @@
 
 DEFUN (__get_cmdline_fcn_txt__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __get_cmdline_fcn_txt__ (@var{name})\n\
+@deftypefn {} {} __get_cmdline_fcn_txt__ (@var{name})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
--- a/libinterp/corefcn/syscalls.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/syscalls.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -111,7 +111,7 @@
 
 DEFUNX ("dup2", Fdup2, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{fid}, @var{msg}] =} dup2 (@var{old}, @var{new})\n\
+@deftypefn {} {[@var{fid}, @var{msg}] =} dup2 (@var{old}, @var{new})\n\
 Duplicate a file descriptor.\n\
 \n\
 If successful, @var{fid} is greater than zero and contains the new file ID@.\n\
@@ -152,7 +152,7 @@
 
 DEFUNX ("exec", Fexec, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{err}, @var{msg}] =} exec (@var{file}, @var{args})\n\
+@deftypefn {} {[@var{err}, @var{msg}] =} exec (@var{file}, @var{args})\n\
 Replace current process with a new process.\n\
 \n\
 Calling @code{exec} without first calling @code{fork} will terminate your\n\
@@ -222,7 +222,7 @@
 
 DEFUNX ("popen2", Fpopen2, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{in}, @var{out}, @var{pid}] =} popen2 (@var{command}, @var{args})\n\
+@deftypefn {} {[@var{in}, @var{out}, @var{pid}] =} popen2 (@var{command}, @var{args})\n\
 Start a subprocess with two-way communication.\n\
 \n\
 The name of the process is given by @var{command}, and @var{args} is an\n\
@@ -407,7 +407,7 @@
 
 DEFUNX ("fcntl", Ffcntl, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{err}, @var{msg}] =} fcntl (@var{fid}, @var{request}, @var{arg})\n\
+@deftypefn {} {[@var{err}, @var{msg}] =} fcntl (@var{fid}, @var{request}, @var{arg})\n\
 Change the properties of the open file @var{fid}.\n\
 \n\
 The following values may be passed as @var{request}:\n\
@@ -499,7 +499,7 @@
 
 DEFUNX ("fork", Ffork, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{pid}, @var{msg}] =} fork ()\n\
+@deftypefn {} {[@var{pid}, @var{msg}] =} fork ()\n\
 Create a copy of the current process.\n\
 \n\
 Fork can return one of the following values:\n\
@@ -542,7 +542,7 @@
 
 DEFUNX ("getpgrp", Fgetpgrp, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {pgid =} getpgrp ()\n\
+@deftypefn {} {pgid =} getpgrp ()\n\
 Return the process group id of the current process.\n\
 @end deftypefn")
 {
@@ -566,7 +566,7 @@
 
 DEFUNX ("getpid", Fgetpid, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {pid =} getpid ()\n\
+@deftypefn {} {pid =} getpid ()\n\
 Return the process id of the current process.\n\
 @seealso{getppid}\n\
 @end deftypefn")
@@ -581,7 +581,7 @@
 
 DEFUNX ("getppid", Fgetppid, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {pid =} getppid ()\n\
+@deftypefn {} {pid =} getppid ()\n\
 Return the process id of the parent process.\n\
 @seealso{getpid}\n\
 @end deftypefn")
@@ -596,7 +596,7 @@
 
 DEFUNX ("getegid", Fgetegid, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {egid =} getegid ()\n\
+@deftypefn {} {egid =} getegid ()\n\
 Return the effective group id of the current process.\n\
 @seealso{getgid}\n\
 @end deftypefn")
@@ -611,7 +611,7 @@
 
 DEFUNX ("getgid", Fgetgid, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {gid =} getgid ()\n\
+@deftypefn {} {gid =} getgid ()\n\
 Return the real group id of the current process.\n\
 @seealso{getegid}\n\
 @end deftypefn")
@@ -626,7 +626,7 @@
 
 DEFUNX ("geteuid", Fgeteuid, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {euid =} geteuid ()\n\
+@deftypefn {} {euid =} geteuid ()\n\
 Return the effective user id of the current process.\n\
 @seealso{getuid}\n\
 @end deftypefn")
@@ -645,7 +645,7 @@
 
 DEFUNX ("getuid", Fgetuid, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {uid =} getuid ()\n\
+@deftypefn {} {uid =} getuid ()\n\
 Return the real user id of the current process.\n\
 @seealso{geteuid}\n\
 @end deftypefn")
@@ -664,7 +664,7 @@
 
 DEFUNX ("kill", Fkill, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{err}, @var{msg}] =} kill (@var{pid}, @var{sig})\n\
+@deftypefn {} {[@var{err}, @var{msg}] =} kill (@var{pid}, @var{sig})\n\
 Send signal @var{sig} to process @var{pid}.\n\
 \n\
 If @var{pid} is positive, then signal @var{sig} is sent to @var{pid}.\n\
@@ -710,8 +710,8 @@
 
 DEFUNX ("lstat", Flstat, args, ,
         "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{info} =} lstat (@var{symlink})\n\
-@deftypefnx {Built-in Function} {[@var{info}, @var{err}, @var{msg}] =} lstat (@var{symlink})\n\
+@deftypefn  {} {@var{info} =} lstat (@var{symlink})\n\
+@deftypefnx {} {[@var{info}, @var{err}, @var{msg}] =} lstat (@var{symlink})\n\
 Return a structure @var{info} containing information about the symbolic link\n\
 @var{symlink}.\n\
 \n\
@@ -768,8 +768,8 @@
 
 DEFUNX ("mkfifo", Fmkfifo, args, ,
         "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{err} =} mkfifo (@var{name}, @var{mode})\n\
-@deftypefnx {Built-in Function} {[@var{err}, @var{msg}] =} mkfifo (@var{name}, @var{mode})\n\
+@deftypefn  {} {@var{err} =} mkfifo (@var{name}, @var{mode})\n\
+@deftypefnx {} {[@var{err}, @var{msg}] =} mkfifo (@var{name}, @var{mode})\n\
 Create a FIFO special file named @var{name} with file mode @var{mode}.\n\
 \n\
 @var{mode} is interpreted as an octal number and is subject to umask\n\
@@ -831,7 +831,7 @@
 
 DEFUNX ("pipe", Fpipe, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{read_fd}, @var{write_fd}, @var{err}, @var{msg}] =} pipe ()\n\
+@deftypefn {} {[@var{read_fd}, @var{write_fd}, @var{err}, @var{msg}] =} pipe ()\n\
 Create a pipe and return the reading and writing ends of the pipe into\n\
 @var{read_fd} and @var{write_fd} respectively.\n\
 \n\
@@ -884,10 +884,10 @@
 
 DEFUNX ("stat", Fstat, args, ,
         "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {[@var{info}, @var{err}, @var{msg}] =} stat (@var{file})\n\
-@deftypefnx {Built-in Function} {[@var{info}, @var{err}, @var{msg}] =} stat (@var{fid})\n\
-@deftypefnx {Built-in Function} {[@var{info}, @var{err}, @var{msg}] =} lstat (@var{file})\n\
-@deftypefnx {Built-in Function} {[@var{info}, @var{err}, @var{msg}] =} lstat (@var{fid})\n\
+@deftypefn  {} {[@var{info}, @var{err}, @var{msg}] =} stat (@var{file})\n\
+@deftypefnx {} {[@var{info}, @var{err}, @var{msg}] =} stat (@var{fid})\n\
+@deftypefnx {} {[@var{info}, @var{err}, @var{msg}] =} lstat (@var{file})\n\
+@deftypefnx {} {[@var{info}, @var{err}, @var{msg}] =} lstat (@var{fid})\n\
 Return a structure @var{info} containing the following information about\n\
 @var{file} or file identifier @var{fid}.\n\
 \n\
@@ -1007,7 +1007,7 @@
 
 DEFUNX ("S_ISREG", FS_ISREG, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} S_ISREG (@var{mode})\n\
+@deftypefn {} {} S_ISREG (@var{mode})\n\
 Return true if @var{mode} corresponds to a regular file.\n\
 \n\
 The value of @var{mode} is assumed to be returned from a call to @code{stat}.\n\
@@ -1030,7 +1030,7 @@
 
 DEFUNX ("S_ISDIR", FS_ISDIR, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} S_ISDIR (@var{mode})\n\
+@deftypefn {} {} S_ISDIR (@var{mode})\n\
 Return true if @var{mode} corresponds to a directory.\n\
 \n\
 The value of @var{mode} is assumed to be returned from a call to @code{stat}.\n\
@@ -1053,7 +1053,7 @@
 
 DEFUNX ("S_ISCHR", FS_ISCHR, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} S_ISCHR (@var{mode})\n\
+@deftypefn {} {} S_ISCHR (@var{mode})\n\
 Return true if @var{mode} corresponds to a character device.\n\
 \n\
 The value of @var{mode} is assumed to be returned from a call to @code{stat}.\n\
@@ -1076,7 +1076,7 @@
 
 DEFUNX ("S_ISBLK", FS_ISBLK, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} S_ISBLK (@var{mode})\n\
+@deftypefn {} {} S_ISBLK (@var{mode})\n\
 Return true if @var{mode} corresponds to a block device.\n\
 \n\
 The value of @var{mode} is assumed to be returned from a call to @code{stat}.\n\
@@ -1099,7 +1099,7 @@
 
 DEFUNX ("S_ISFIFO", FS_ISFIFO, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} S_ISFIFO (@var{mode})\n\
+@deftypefn {} {} S_ISFIFO (@var{mode})\n\
 Return true if @var{mode} corresponds to a fifo.\n\
 \n\
 The value of @var{mode} is assumed to be returned from a call to @code{stat}.\n\
@@ -1122,7 +1122,7 @@
 
 DEFUNX ("S_ISLNK", FS_ISLNK, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} S_ISLNK (@var{mode})\n\
+@deftypefn {} {} S_ISLNK (@var{mode})\n\
 Return true if @var{mode} corresponds to a symbolic link.\n\
 \n\
 The value of @var{mode} is assumed to be returned from a call to @code{stat}.\n\
@@ -1145,7 +1145,7 @@
 
 DEFUNX ("S_ISSOCK", FS_ISSOCK, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} S_ISSOCK (@var{mode})\n\
+@deftypefn {} {} S_ISSOCK (@var{mode})\n\
 Return true if @var{mode} corresponds to a socket.\n\
 \n\
 The value of @var{mode} is assumed to be returned from a call to @code{stat}.\n\
@@ -1168,7 +1168,7 @@
 
 DEFUN (gethostname, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} gethostname ()\n\
+@deftypefn {} {} gethostname ()\n\
 Return the hostname of the system where Octave is running.\n\
 @end deftypefn")
 {
@@ -1184,7 +1184,7 @@
 
 DEFUN (uname, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{uts}, @var{err}, @var{msg}] =} uname ()\n\
+@deftypefn {} {[@var{uts}, @var{err}, @var{msg}] =} uname ()\n\
 Return system information in the structure.\n\
 \n\
 For example:\n\
@@ -1233,7 +1233,7 @@
 
 DEFUNX ("unlink", Funlink, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{err}, @var{msg}] =} unlink (@var{file})\n\
+@deftypefn {} {[@var{err}, @var{msg}] =} unlink (@var{file})\n\
 Delete the file named @var{file}.\n\
 \n\
 If successful, @var{err} is 0 and @var{msg} is an empty string.\n\
@@ -1268,7 +1268,7 @@
 
 DEFUNX ("waitpid", Fwaitpid, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{pid}, @var{status}, @var{msg}] =} waitpid (@var{pid}, @var{options})\n\
+@deftypefn {} {[@var{pid}, @var{status}, @var{msg}] =} waitpid (@var{pid}, @var{options})\n\
 Wait for process @var{pid} to terminate.\n\
 \n\
 The @var{pid} argument can be:\n\
@@ -1349,7 +1349,7 @@
 
 DEFUNX ("WIFEXITED", FWIFEXITED, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} WIFEXITED (@var{status})\n\
+@deftypefn {} {} WIFEXITED (@var{status})\n\
 Given @var{status} from a call to @code{waitpid}, return\n\
 true if the child terminated normally.\n\
 @seealso{waitpid, WEXITSTATUS, WIFSIGNALED, WTERMSIG, WCOREDUMP, WIFSTOPPED, WSTOPSIG, WIFCONTINUED}\n\
@@ -1371,7 +1371,7 @@
 
 DEFUNX ("WEXITSTATUS", FWEXITSTATUS, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} WEXITSTATUS (@var{status})\n\
+@deftypefn {} {} WEXITSTATUS (@var{status})\n\
 Given @var{status} from a call to @code{waitpid}, return\n\
 the exit status of the child.\n\
 \n\
@@ -1393,7 +1393,7 @@
 
 DEFUNX ("WIFSIGNALED", FWIFSIGNALED, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} WIFSIGNALED (@var{status})\n\
+@deftypefn {} {} WIFSIGNALED (@var{status})\n\
 Given @var{status} from a call to @code{waitpid}, return\n\
 true if the child process was terminated by a signal.\n\
 @seealso{waitpid, WIFEXITED, WEXITSTATUS, WTERMSIG, WCOREDUMP, WIFSTOPPED, WSTOPSIG, WIFCONTINUED}\n\
@@ -1415,7 +1415,7 @@
 
 DEFUNX ("WTERMSIG", FWTERMSIG, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} WTERMSIG (@var{status})\n\
+@deftypefn {} {} WTERMSIG (@var{status})\n\
 Given @var{status} from a call to @code{waitpid}, return\n\
 the number of the signal that caused the child process to terminate.\n\
 \n\
@@ -1439,7 +1439,7 @@
 
 DEFUNX ("WCOREDUMP", FWCOREDUMP, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} WCOREDUMP (@var{status})\n\
+@deftypefn {} {} WCOREDUMP (@var{status})\n\
 Given @var{status} from a call to @code{waitpid}, return\n\
 true if the child produced a core dump.\n\
 \n\
@@ -1465,7 +1465,7 @@
 
 DEFUNX ("WIFSTOPPED", FWIFSTOPPED, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} WIFSTOPPED (@var{status})\n\
+@deftypefn {} {} WIFSTOPPED (@var{status})\n\
 Given @var{status} from a call to @code{waitpid}, return\n\
 true if the child process was stopped by delivery of a signal.\n\
 \n\
@@ -1490,7 +1490,7 @@
 
 DEFUNX ("WSTOPSIG", FWSTOPSIG, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} WSTOPSIG (@var{status})\n\
+@deftypefn {} {} WSTOPSIG (@var{status})\n\
 Given @var{status} from a call to @code{waitpid}, return\n\
 the number of the signal which caused the child to stop.\n\
 \n\
@@ -1514,7 +1514,7 @@
 
 DEFUNX ("WIFCONTINUED", FWIFCONTINUED, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} WIFCONTINUED (@var{status})\n\
+@deftypefn {} {} WIFCONTINUED (@var{status})\n\
 Given @var{status} from a call to @code{waitpid}, return\n\
 true if the child process was resumed by delivery of @code{SIGCONT}.\n\
 @seealso{waitpid, WIFEXITED, WEXITSTATUS, WIFSIGNALED, WTERMSIG, WCOREDUMP, WIFSTOPPED, WSTOPSIG}\n\
@@ -1536,7 +1536,7 @@
 
 DEFUNX ("canonicalize_file_name", Fcanonicalize_file_name, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{cname}, @var{status}, @var{msg}] =} canonicalize_file_name (@var{fname})\n\
+@deftypefn {} {[@var{cname}, @var{status}, @var{msg}] =} canonicalize_file_name (@var{fname})\n\
 Return the canonical name of file @var{fname}.\n\
 \n\
 If the file does not exist the empty string (\"\") is returned.\n\
@@ -1583,7 +1583,7 @@
 
 DEFUNX ("F_DUPFD", FF_DUPFD, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} F_DUPFD ()\n\
+@deftypefn {} {} F_DUPFD ()\n\
 Return the numerical value to pass to @code{fcntl} to return\n\
 a duplicate file descriptor.\n\
 @seealso{fcntl, F_GETFD, F_GETFL, F_SETFD, F_SETFL}\n\
@@ -1599,7 +1599,7 @@
 
 DEFUNX ("F_GETFD", FF_GETFD, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} F_GETFD ()\n\
+@deftypefn {} {} F_GETFD ()\n\
 Return the numerical value to pass to @code{fcntl} to return\n\
 the file descriptor flags.\n\
 @seealso{fcntl, F_DUPFD, F_GETFL, F_SETFD, F_SETFL}\n\
@@ -1615,7 +1615,7 @@
 
 DEFUNX ("F_GETFL", FF_GETFL, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} F_GETFL ()\n\
+@deftypefn {} {} F_GETFL ()\n\
 Return the numerical value to pass to @code{fcntl} to return\n\
 the file status flags.\n\
 @seealso{fcntl, F_DUPFD, F_GETFD, F_SETFD, F_SETFL}\n\
@@ -1631,7 +1631,7 @@
 
 DEFUNX ("F_SETFD", FF_SETFD, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} F_SETFD ()\n\
+@deftypefn {} {} F_SETFD ()\n\
 Return the numerical value to pass to @code{fcntl} to set the file\n\
 descriptor flags.\n\
 @seealso{fcntl, F_DUPFD, F_GETFD, F_GETFL, F_SETFL}\n\
@@ -1647,7 +1647,7 @@
 
 DEFUNX ("F_SETFL", FF_SETFL, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} F_SETFL ()\n\
+@deftypefn {} {} F_SETFL ()\n\
 Return the numerical value to pass to @code{fcntl} to set the file\n\
 status flags.\n\
 @seealso{fcntl, F_DUPFD, F_GETFD, F_GETFL, F_SETFD}\n\
@@ -1663,7 +1663,7 @@
 
 DEFUNX ("O_APPEND", FO_APPEND, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} O_APPEND ()\n\
+@deftypefn {} {} O_APPEND ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate each write operation appends,\n\
 or that may be passed to @code{fcntl} to set the write mode to append.\n\
@@ -1680,7 +1680,7 @@
 
 DEFUNX ("O_ASYNC", FO_ASYNC, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} O_ASYNC ()\n\
+@deftypefn {} {} O_ASYNC ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate asynchronous I/O.\n\
 @seealso{fcntl, O_APPEND, O_CREAT, O_EXCL, O_NONBLOCK, O_RDONLY, O_RDWR, O_SYNC, O_TRUNC, O_WRONLY}\n\
@@ -1696,7 +1696,7 @@
 
 DEFUNX ("O_CREAT", FO_CREAT, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} O_CREAT ()\n\
+@deftypefn {} {} O_CREAT ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate that a file should be created if it\n\
 does not exist.\n\
@@ -1713,7 +1713,7 @@
 
 DEFUNX ("O_EXCL", FO_EXCL, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} O_EXCL ()\n\
+@deftypefn {} {} O_EXCL ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate that file locking is used.\n\
 @seealso{fcntl, O_APPEND, O_ASYNC, O_CREAT, O_NONBLOCK, O_RDONLY, O_RDWR, O_SYNC, O_TRUNC, O_WRONLY}\n\
@@ -1729,7 +1729,7 @@
 
 DEFUNX ("O_NONBLOCK", FO_NONBLOCK, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} O_NONBLOCK ()\n\
+@deftypefn {} {} O_NONBLOCK ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate that non-blocking I/O is in use,\n\
 or that may be passsed to @code{fcntl} to set non-blocking I/O.\n\
@@ -1746,7 +1746,7 @@
 
 DEFUNX ("O_RDONLY", FO_RDONLY, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} O_RDONLY ()\n\
+@deftypefn {} {} O_RDONLY ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate that a file is open for reading only.\n\
 @seealso{fcntl, O_APPEND, O_ASYNC, O_CREAT, O_EXCL, O_NONBLOCK, O_RDWR, O_SYNC, O_TRUNC, O_WRONLY}\n\
@@ -1762,7 +1762,7 @@
 
 DEFUNX ("O_RDWR", FO_RDWR, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} O_RDWR ()\n\
+@deftypefn {} {} O_RDWR ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate that a file is open for both reading\n\
 and writing.\n\
@@ -1779,7 +1779,7 @@
 
 DEFUNX ("O_SYNC", FO_SYNC, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} O_SYNC ()\n\
+@deftypefn {} {} O_SYNC ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate that a file is open for synchronous I/O.\n\
 @seealso{fcntl, O_APPEND, O_ASYNC, O_CREAT, O_EXCL, O_NONBLOCK, O_RDONLY, O_RDWR, O_TRUNC, O_WRONLY}\n\
@@ -1795,7 +1795,7 @@
 
 DEFUNX ("O_TRUNC", FO_TRUNC, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} O_TRUNC ()\n\
+@deftypefn {} {} O_TRUNC ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate that if file exists, it should be\n\
 truncated when writing.\n\
@@ -1812,7 +1812,7 @@
 
 DEFUNX ("O_WRONLY", FO_WRONLY, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} O_WRONLY ()\n\
+@deftypefn {} {} O_WRONLY ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate that a file is open for writing only.\n\
 @seealso{fcntl, O_APPEND, O_ASYNC, O_CREAT, O_EXCL, O_NONBLOCK, O_RDONLY, O_RDWR, O_SYNC, O_TRUNC}\n\
@@ -1832,7 +1832,7 @@
 
 DEFUNX ("WNOHANG", FWNOHANG, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} WNOHANG ()\n\
+@deftypefn {} {} WNOHANG ()\n\
 Return the numerical value of the option argument that may be\n\
 passed to @code{waitpid} to indicate that it should return its status\n\
 immediately instead of waiting for a process to exit.\n\
@@ -1848,7 +1848,7 @@
 
 DEFUNX ("WUNTRACED", FWUNTRACED, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} WUNTRACED ()\n\
+@deftypefn {} {} WUNTRACED ()\n\
 Return the numerical value of the option argument that may be\n\
 passed to @code{waitpid} to indicate that it should also return if the child\n\
 process has stopped but is not traced via the @code{ptrace} system call\n\
@@ -1864,7 +1864,7 @@
 
 DEFUNX ("WCONTINUE", FWCONTINUE, args, ,
         "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} WCONTINUE ()\n\
+@deftypefn {} {} WCONTINUE ()\n\
 Return the numerical value of the option argument that may be\n\
 passed to @code{waitpid} to indicate that it should also return if a stopped\n\
 child has been resumed by delivery of a @code{SIGCONT} signal.\n\
--- a/libinterp/corefcn/sysdep.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/sysdep.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -187,7 +187,7 @@
 
 DEFUN (__open_with_system_app__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __open_with_system_app__ (@var{file})\n\
+@deftypefn {} {} __open_with_system_app__ (@var{file})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -581,8 +581,8 @@
 
 DEFUN (clc, , ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} clc ()\n\
-@deftypefnx {Built-in Function} {} home ()\n\
+@deftypefn  {} {} clc ()\n\
+@deftypefnx {} {} home ()\n\
 Clear the terminal screen and move the cursor to the upper left corner.\n\
 @end deftypefn")
 {
@@ -597,7 +597,7 @@
 
 DEFUN (getenv, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} getenv (@var{var})\n\
+@deftypefn {} {} getenv (@var{var})\n\
 Return the value of the environment variable @var{var}.\n\
 \n\
 For example,\n\
@@ -625,9 +625,9 @@
 
 DEFUN (setenv, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} setenv (@var{var}, @var{value})\n\
-@deftypefnx {Built-in Function} {} setenv (@var{var})\n\
-@deftypefnx {Built-in Function} {} putenv (@dots{})\n\
+@deftypefn  {} {} setenv (@var{var}, @var{value})\n\
+@deftypefnx {} {} setenv (@var{var})\n\
+@deftypefnx {} {} putenv (@dots{})\n\
 Set the value of the environment variable @var{var} to @var{value}.\n\
 \n\
 If no @var{value} is specified then the variable will be assigned the null\n\
@@ -665,7 +665,7 @@
 
 DEFUN (unsetenv, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{status} =} unsetenv (@var{var})\n\
+@deftypefn {} {@var{status} =} unsetenv (@var{var})\n\
 Delete the environment variable @var{var}.\n\
 \n\
 Return 0 if the variable was deleted, or did not exist, and -1 if an error\n\
@@ -689,8 +689,8 @@
 
 DEFUN (kbhit, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} kbhit ()\n\
-@deftypefnx {Built-in Function} {} kbhit (1)\n\
+@deftypefn  {} {} kbhit ()\n\
+@deftypefnx {} {} kbhit (1)\n\
 Read a single keystroke from the keyboard.\n\
 \n\
 If called with an argument, don't wait for a keypress.\n\
@@ -738,8 +738,8 @@
 
 DEFUN (pause, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} pause ()\n\
-@deftypefnx {Built-in Function} {} pause (@var{n})\n\
+@deftypefn  {} {} pause ()\n\
+@deftypefnx {} {} pause (@var{n})\n\
 Suspend the execution of the program for @var{n} seconds.\n\
 \n\
 @var{n} is a positive real value and may be a fraction of a second.\n\
@@ -805,7 +805,7 @@
 
 DEFUN (sleep, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} sleep (@var{seconds})\n\
+@deftypefn {} {} sleep (@var{seconds})\n\
 Suspend the execution of the program for the given number of seconds.\n\
 @seealso{usleep, pause}\n\
 @end deftypefn")
@@ -838,7 +838,7 @@
 
 DEFUN (usleep, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} usleep (@var{microseconds})\n\
+@deftypefn {} {} usleep (@var{microseconds})\n\
 Suspend the execution of the program for the given number of\n\
 microseconds.\n\
 \n\
@@ -883,7 +883,7 @@
 
 DEFUN (isieee, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isieee ()\n\
+@deftypefn {} {} isieee ()\n\
 Return true if your computer @emph{claims} to conform to the IEEE standard\n\
 for floating point calculations.\n\
 \n\
@@ -902,7 +902,7 @@
 
 DEFUN (native_float_format, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} native_float_format ()\n\
+@deftypefn {} {} native_float_format ()\n\
 Return the native floating point format as a string.\n\
 @end deftypefn")
 {
@@ -917,8 +917,8 @@
 
 DEFUN (tilde_expand, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} tilde_expand (@var{string})\n\
-@deftypefnx {Built-in Function} {} tilde_expand (@var{cellstr})\n\
+@deftypefn  {} {} tilde_expand (@var{string})\n\
+@deftypefnx {} {} tilde_expand (@var{cellstr})\n\
 Perform tilde expansion on @var{string}.\n\
 \n\
 If @var{string} begins with a tilde character, (@samp{~}), all of the\n\
@@ -972,7 +972,7 @@
 
 DEFUN (get_home_directory, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{homedir} =} get_home_directory ()\n\
+@deftypefn {} {@var{homedir} =} get_home_directory ()\n\
 Return the current home directory.\n\
 \n\
 On most systems, this is equivalent to @code{getenv (\"HOME\")}.  On Windows\n\
@@ -998,7 +998,7 @@
 
 DEFUN (have_window_system, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} have_window_system ()\n\
+@deftypefn {} {} have_window_system ()\n\
 Return true if a window system is available (X11, Windows, or Apple OS X)\n\
 and false otherwise.\n\
 @seealso{isguirunning}\n\
--- a/libinterp/corefcn/time.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/time.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -105,7 +105,7 @@
 
 DEFUN (time, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{seconds} =} time ()\n\
+@deftypefn {} {@var{seconds} =} time ()\n\
 Return the current time as the number of seconds since the epoch.\n\
 \n\
 The epoch is referenced to 00:00:00 CUT (Coordinated Universal Time) 1 Jan\n\
@@ -128,7 +128,7 @@
 
 DEFUN (gmtime, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{tm_struct} =} gmtime (@var{t})\n\
+@deftypefn {} {@var{tm_struct} =} gmtime (@var{t})\n\
 Given a value returned from @code{time}, or any non-negative integer,\n\
 return a time structure corresponding to CUT (Coordinated Universal Time).\n\
 \n\
@@ -185,7 +185,7 @@
 
 DEFUN (localtime, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{tm_struct} =} localtime (@var{t})\n\
+@deftypefn {} {@var{tm_struct} =} localtime (@var{t})\n\
 Given a value returned from @code{time}, or any non-negative integer,\n\
 return a time structure corresponding to the local time zone.\n\
 \n\
@@ -240,7 +240,7 @@
 
 DEFUN (mktime, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{seconds} =} mktime (@var{tm_struct})\n\
+@deftypefn {} {@var{seconds} =} mktime (@var{tm_struct})\n\
 Convert a time structure corresponding to the local time to the number of\n\
 seconds since the epoch.\n\
 \n\
@@ -284,7 +284,7 @@
 
 DEFUN (strftime, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} strftime (@var{fmt}, @var{tm_struct})\n\
+@deftypefn {} {} strftime (@var{fmt}, @var{tm_struct})\n\
 Format the time structure @var{tm_struct} in a flexible way using the format\n\
 string @var{fmt} that contains @samp{%} substitutions similar to those in\n\
 @code{printf}.\n\
@@ -469,7 +469,7 @@
 
 DEFUN (strptime, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {[@var{tm_struct}, @var{nchars}] =} strptime (@var{str}, @var{fmt})\n\
+@deftypefn {} {[@var{tm_struct}, @var{nchars}] =} strptime (@var{str}, @var{fmt})\n\
 Convert the string @var{str} to the time structure @var{tm_struct} under\n\
 the control of the format string @var{fmt}.\n\
 \n\
--- a/libinterp/corefcn/toplev.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/toplev.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -812,10 +812,10 @@
 
 DEFUN (quit, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} exit\n\
-@deftypefnx {Built-in Function} {} exit (@var{status})\n\
-@deftypefnx {Built-in Function} {} quit\n\
-@deftypefnx {Built-in Function} {} quit (@var{status})\n\
+@deftypefn  {} {} exit\n\
+@deftypefnx {} {} exit (@var{status})\n\
+@deftypefnx {} {} quit\n\
+@deftypefnx {} {} quit (@var{status})\n\
 Exit the current Octave session.\n\
 \n\
 If the optional integer value @var{status} is supplied, pass that value to\n\
@@ -867,7 +867,7 @@
 
 DEFUN (warranty, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} warranty ()\n\
+@deftypefn {} {} warranty ()\n\
 Describe the conditions for copying and distributing Octave.\n\
 @end deftypefn")
 {
@@ -973,10 +973,10 @@
 
 DEFUN (system, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} system (\"@var{string}\")\n\
-@deftypefnx {Built-in Function} {} system (\"@var{string}\", @var{return_output})\n\
-@deftypefnx {Built-in Function} {} system (\"@var{string}\", @var{return_output}, @var{type})\n\
-@deftypefnx {Built-in Function} {[@var{status}, @var{output}] =} system (@dots{})\n\
+@deftypefn  {} {} system (\"@var{string}\")\n\
+@deftypefnx {} {} system (\"@var{string}\", @var{return_output})\n\
+@deftypefnx {} {} system (\"@var{string}\", @var{return_output}, @var{type})\n\
+@deftypefnx {} {[@var{status}, @var{output}] =} system (@dots{})\n\
 Execute a shell command specified by @var{string}.\n\
 \n\
 If the optional argument @var{type} is @qcode{\"async\"}, the process is\n\
@@ -1171,8 +1171,8 @@
 
 DEFUN (atexit, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} atexit (@var{fcn})\n\
-@deftypefnx {Built-in Function} {} atexit (@var{fcn}, @var{flag})\n\
+@deftypefn  {} {} atexit (@var{fcn})\n\
+@deftypefnx {} {} atexit (@var{fcn}, @var{flag})\n\
 Register a function to be called when Octave exits.\n\
 \n\
 For example,\n\
@@ -1237,8 +1237,8 @@
 
 DEFUN (octave_config_info, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} octave_config_info ()\n\
-@deftypefnx {Built-in Function} {} octave_config_info (@var{option})\n\
+@deftypefn  {} {} octave_config_info ()\n\
+@deftypefnx {} {} octave_config_info (@var{option})\n\
 Return a structure containing configuration and installation information for\n\
 Octave.\n\
 \n\
--- a/libinterp/corefcn/tril.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/tril.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -333,12 +333,12 @@
 
 DEFUN (tril, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Function File} {} tril (@var{A})\n\
-@deftypefnx {Function File} {} tril (@var{A}, @var{k})\n\
-@deftypefnx {Function File} {} tril (@var{A}, @var{k}, @var{pack})\n\
-@deftypefnx {Function File} {} triu (@var{A})\n\
-@deftypefnx {Function File} {} triu (@var{A}, @var{k})\n\
-@deftypefnx {Function File} {} triu (@var{A}, @var{k}, @var{pack})\n\
+@deftypefn  {} {} tril (@var{A})\n\
+@deftypefnx {} {} tril (@var{A}, @var{k})\n\
+@deftypefnx {} {} tril (@var{A}, @var{k}, @var{pack})\n\
+@deftypefnx {} {} triu (@var{A})\n\
+@deftypefnx {} {} triu (@var{A}, @var{k})\n\
+@deftypefnx {} {} triu (@var{A}, @var{k}, @var{pack})\n\
 Return a new matrix formed by extracting the lower (@code{tril})\n\
 or upper (@code{triu}) triangular part of the matrix @var{A}, and\n\
 setting all other elements to zero.\n\
@@ -390,9 +390,9 @@
 
 DEFUN (triu, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Function File} {} triu (@var{A})\n\
-@deftypefnx {Function File} {} triu (@var{A}, @var{k})\n\
-@deftypefnx {Function File} {} triu (@var{A}, @var{k}, @var{pack})\n\
+@deftypefn  {} {} triu (@var{A})\n\
+@deftypefnx {} {} triu (@var{A}, @var{k})\n\
+@deftypefnx {} {} triu (@var{A}, @var{k}, @var{pack})\n\
 See the documentation for the @code{tril} function (@pxref{tril}).\n\
 @seealso{tril}\n\
 @end deftypefn")
--- a/libinterp/corefcn/tsearch.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/tsearch.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -61,7 +61,7 @@
 
 DEFUN (tsearch, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{idx} =} tsearch (@var{x}, @var{y}, @var{t}, @var{xi}, @var{yi})\n\
+@deftypefn {} {@var{idx} =} tsearch (@var{x}, @var{y}, @var{t}, @var{xi}, @var{yi})\n\
 Search for the enclosing Delaunay convex hull.\n\
 \n\
 For @code{@var{t} = delaunay (@var{x}, @var{y})}, finds the index in @var{t}\n\
--- a/libinterp/corefcn/typecast.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/typecast.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -89,7 +89,7 @@
 
 DEFUN (typecast, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{y} =} typecast (@var{x}, \"@var{class}\")\n\
+@deftypefn {} {@var{y} =} typecast (@var{x}, \"@var{class}\")\n\
 Return a new array @var{y} resulting from interpreting the data of @var{x}\n\
 in memory as data of the numeric class @var{class}.\n\
 \n\
@@ -297,7 +297,7 @@
 
 DEFUN (bitpack, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{y} =} bitpack (@var{x}, @var{class})\n\
+@deftypefn {} {@var{y} =} bitpack (@var{x}, @var{class})\n\
 Return a new array @var{y} resulting from interpreting the logical array\n\
 @var{x} as raw bit patterns for data of the numeric class @var{class}.\n\
 \n\
@@ -413,7 +413,7 @@
 
 DEFUN (bitunpack, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{y} =} bitunpack (@var{x})\n\
+@deftypefn {} {@var{y} =} bitunpack (@var{x})\n\
 Return a logical array @var{y} corresponding to the raw bit patterns of\n\
 @var{x}.\n\
 \n\
--- a/libinterp/corefcn/urlwrite.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/urlwrite.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -281,10 +281,10 @@
 
 DEFUN (urlwrite, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {} urlwrite (@var{url}, @var{localfile})\n\
-@deftypefnx {Loadable Function} {@var{f} =} urlwrite (@var{url}, @var{localfile})\n\
-@deftypefnx {Loadable Function} {[@var{f}, @var{success}] =} urlwrite (@var{url}, @var{localfile})\n\
-@deftypefnx {Loadable Function} {[@var{f}, @var{success}, @var{message}] =} urlwrite (@var{url}, @var{localfile})\n\
+@deftypefn  {} {} urlwrite (@var{url}, @var{localfile})\n\
+@deftypefnx {} {@var{f} =} urlwrite (@var{url}, @var{localfile})\n\
+@deftypefnx {} {[@var{f}, @var{success}] =} urlwrite (@var{url}, @var{localfile})\n\
+@deftypefnx {} {[@var{f}, @var{success}, @var{message}] =} urlwrite (@var{url}, @var{localfile})\n\
 Download a remote file specified by its @var{url} and save it as\n\
 @var{localfile}.\n\
 \n\
@@ -412,10 +412,10 @@
 
 DEFUN (urlread, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{s} =} urlread (@var{url})\n\
-@deftypefnx {Loadable Function} {[@var{s}, @var{success}] =} urlread (@var{url})\n\
-@deftypefnx {Loadable Function} {[@var{s}, @var{success}, @var{message}] =} urlread (@var{url})\n\
-@deftypefnx {Loadable Function} {[@dots{}] =} urlread (@var{url}, @var{method}, @var{param})\n\
+@deftypefn  {} {@var{s} =} urlread (@var{url})\n\
+@deftypefnx {} {[@var{s}, @var{success}] =} urlread (@var{url})\n\
+@deftypefnx {} {[@var{s}, @var{success}, @var{message}] =} urlread (@var{url})\n\
+@deftypefnx {} {[@dots{}] =} urlread (@var{url}, @var{method}, @var{param})\n\
 Download a remote file specified by its @var{url} and return its content\n\
 in string @var{s}.\n\
 \n\
@@ -508,8 +508,8 @@
 
 DEFUN (__ftp__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{handle} =} __ftp__ (@var{host})\n\
-@deftypefnx {Loadable Function} {@var{handle} =} __ftp__ (@var{host}, @var{username}, @var{password})\n\
+@deftypefn  {} {@var{handle} =} __ftp__ (@var{host})\n\
+@deftypefnx {} {@var{handle} =} __ftp__ (@var{host}, @var{username}, @var{password})\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -536,7 +536,7 @@
 
 DEFUN (__ftp_pwd__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __ftp_pwd__ (@var{handle})\n\
+@deftypefn {} {} __ftp_pwd__ (@var{handle})\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -559,7 +559,7 @@
 
 DEFUN (__ftp_cwd__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __ftp_cwd__ (@var{handle}, @var{path})\n\
+@deftypefn {} {} __ftp_cwd__ (@var{handle}, @var{path})\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -591,7 +591,7 @@
 
 DEFUN (__ftp_dir__, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __ftp_dir__ (@var{handle})\n\
+@deftypefn {} {} __ftp_dir__ (@var{handle})\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -667,7 +667,7 @@
 
 DEFUN (__ftp_ascii__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __ftp_ascii__ (@var{handle})\n\
+@deftypefn {} {} __ftp_ascii__ (@var{handle})\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -690,7 +690,7 @@
 
 DEFUN (__ftp_binary__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __ftp_binary__ (@var{handle})\n\
+@deftypefn {} {} __ftp_binary__ (@var{handle})\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -713,7 +713,7 @@
 
 DEFUN (__ftp_close__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __ftp_close__ (@var{handle})\n\
+@deftypefn {} {} __ftp_close__ (@var{handle})\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -736,7 +736,7 @@
 
 DEFUN (__ftp_mode__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __ftp_mode__ (@var{handle})\n\
+@deftypefn {} {} __ftp_mode__ (@var{handle})\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -759,7 +759,7 @@
 
 DEFUN (__ftp_delete__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __ftp_delete__ (@var{handle}, @var{path})\n\
+@deftypefn {} {} __ftp_delete__ (@var{handle}, @var{path})\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -786,7 +786,7 @@
 
 DEFUN (__ftp_rmdir__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __ftp_rmdir__ (@var{handle}, @var{path})\n\
+@deftypefn {} {} __ftp_rmdir__ (@var{handle}, @var{path})\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -813,7 +813,7 @@
 
 DEFUN (__ftp_mkdir__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __ftp_mkdir__ (@var{handle}, @var{path})\n\
+@deftypefn {} {} __ftp_mkdir__ (@var{handle}, @var{path})\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -840,7 +840,7 @@
 
 DEFUN (__ftp_rename__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __ftp_rename__ (@var{handle}, @var{path})\n\
+@deftypefn {} {} __ftp_rename__ (@var{handle}, @var{path})\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -868,7 +868,7 @@
 
 DEFUN (__ftp_mput__, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __ftp_mput__ (@var{handle}, @var{files})\n\
+@deftypefn {} {} __ftp_mput__ (@var{handle}, @var{files})\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
@@ -937,8 +937,8 @@
 
 DEFUN (__ftp_mget__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {} __ftp_mget__ (@var{handle}, @var{pattern})\n\
-@deftypefnx {Loadable Function} {} __ftp_mget__ (@var{handle}, @var{pattern}, @var{target})\n\
+@deftypefn  {} {} __ftp_mget__ (@var{handle}, @var{pattern})\n\
+@deftypefnx {} {} __ftp_mget__ (@var{handle}, @var{pattern}, @var{target})\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
--- a/libinterp/corefcn/utils.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/utils.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -94,7 +94,7 @@
 
 DEFUN (isvarname, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isvarname (@var{name})\n\
+@deftypefn {} {} isvarname (@var{name})\n\
 Return true if @var{name} is a valid variable name.\n\
 @seealso{iskeyword, exist, who}\n\
 @end deftypefn")
@@ -290,8 +290,8 @@
 
 DEFUN (file_in_loadpath, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} file_in_loadpath (@var{file})\n\
-@deftypefnx {Built-in Function} {} file_in_loadpath (@var{file}, \"all\")\n\
+@deftypefn  {} {} file_in_loadpath (@var{file})\n\
+@deftypefnx {} {} file_in_loadpath (@var{file}, \"all\")\n\
 \n\
 Return the absolute name of @var{file} if it can be found in\n\
 the list of directories specified by @code{path}.\n\
@@ -361,8 +361,8 @@
 
 DEFUN (file_in_path, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} file_in_path (@var{path}, @var{file})\n\
-@deftypefnx {Built-in Function} {} file_in_path (@var{path}, @var{file}, \"all\")\n\
+@deftypefn  {} {} file_in_path (@var{path}, @var{file})\n\
+@deftypefnx {} {} file_in_path (@var{path}, @var{file}, \"all\")\n\
 Return the absolute name of @var{file} if it can be found in @var{path}.\n\
 \n\
 The value of @var{path} should be a colon-separated list of directories in\n\
@@ -737,7 +737,7 @@
 
 DEFUN (do_string_escapes, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} do_string_escapes (@var{string})\n\
+@deftypefn {} {} do_string_escapes (@var{string})\n\
 Convert escape sequences in @var{string} to the characters they represent.\n\
 \n\
 Escape sequences begin with a leading backslash\n\
@@ -852,7 +852,7 @@
 
 DEFUN (undo_string_escapes, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} undo_string_escapes (@var{s})\n\
+@deftypefn {} {} undo_string_escapes (@var{s})\n\
 Convert special characters in strings back to their escaped forms.\n\
 \n\
 For example, the expression\n\
@@ -913,7 +913,7 @@
 
 DEFUN (is_absolute_filename, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} is_absolute_filename (@var{file})\n\
+@deftypefn {} {} is_absolute_filename (@var{file})\n\
 Return true if @var{file} is an absolute filename.\n\
 @seealso{is_rooted_relative_filename, make_absolute_filename, isdir}\n\
 @end deftypefn")
@@ -938,7 +938,7 @@
 
 DEFUN (is_rooted_relative_filename, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} is_rooted_relative_filename (@var{file})\n\
+@deftypefn {} {} is_rooted_relative_filename (@var{file})\n\
 Return true if @var{file} is a rooted-relative filename.\n\
 @seealso{is_absolute_filename, make_absolute_filename, isdir}\n\
 @end deftypefn")
@@ -963,7 +963,7 @@
 
 DEFUN (make_absolute_filename, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} make_absolute_filename (@var{file})\n\
+@deftypefn {} {} make_absolute_filename (@var{file})\n\
 Return the full name of @var{file} beginning from the root of the file\n\
 system.\n\
 \n\
@@ -988,8 +988,8 @@
 
 DEFUN (dir_in_loadpath, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} dir_in_loadpath (@var{dir})\n\
-@deftypefnx {Built-in Function} {} dir_in_loadpath (@var{dir}, \"all\")\n\
+@deftypefn  {} {} dir_in_loadpath (@var{dir})\n\
+@deftypefnx {} {} dir_in_loadpath (@var{dir}, \"all\")\n\
 Return the full name of the path element matching @var{dir}.\n\
 \n\
 The match is performed at the end of each path element.  For example, if\n\
@@ -1042,9 +1042,9 @@
 
 DEFUNX ("errno", Ferrno, args, ,
         "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{err} =} errno ()\n\
-@deftypefnx {Built-in Function} {@var{err} =} errno (@var{val})\n\
-@deftypefnx {Built-in Function} {@var{err} =} errno (@var{name})\n\
+@deftypefn  {} {@var{err} =} errno ()\n\
+@deftypefnx {} {@var{err} =} errno (@var{val})\n\
+@deftypefnx {} {@var{err} =} errno (@var{name})\n\
 Return the current value of the system-dependent variable errno,\n\
 set its value to @var{val} and return the previous value, or return\n\
 the named error code given @var{name} as a character string, or -1\n\
@@ -1097,7 +1097,7 @@
 
 DEFUN (errno_list, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} errno_list ()\n\
+@deftypefn {} {} errno_list ()\n\
 Return a structure containing the system-dependent errno values.\n\
 @seealso{errno}\n\
 @end deftypefn")
@@ -1378,8 +1378,8 @@
 
 DEFUN (isindex, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} isindex (@var{ind})\n\
-@deftypefnx {Built-in Function} {} isindex (@var{ind}, @var{n})\n\
+@deftypefn  {} {} isindex (@var{ind})\n\
+@deftypefnx {} {} isindex (@var{ind}, @var{n})\n\
 Return true if @var{ind} is a valid index.\n\
 \n\
 Valid indices are either positive integers (although possibly of real data\n\
@@ -1529,7 +1529,7 @@
 
 DEFUN (isstudent, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isstudent ()\n\
+@deftypefn {} {} isstudent ()\n\
 Return true if running in the student edition of @sc{matlab}.\n\
 \n\
 @code{isstudent} always returns false in Octave.\n\
--- a/libinterp/corefcn/variables.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/corefcn/variables.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -338,7 +338,7 @@
 
 DEFUN (isglobal, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isglobal (@var{name})\n\
+@deftypefn {} {} isglobal (@var{name})\n\
 Return true if @var{name} is a globally visible variable.\n\
 \n\
 For example:\n\
@@ -511,8 +511,8 @@
 
 DEFUN (exist, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{c} =} exist (@var{name})\n\
-@deftypefnx {Built-in Function} {@var{c} =} exist (@var{name}, @var{type})\n\
+@deftypefn  {} {@var{c} =} exist (@var{name})\n\
+@deftypefnx {} {@var{c} =} exist (@var{name}, @var{type})\n\
 Check for the existence of @var{name} as a variable, function, file,\n\
 directory, or class.\n\
 \n\
@@ -1787,10 +1787,10 @@
 
 DEFUN (who, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} who\n\
-@deftypefnx {Command} {} who pattern @dots{}\n\
-@deftypefnx {Command} {} who option pattern @dots{}\n\
-@deftypefnx {Command} {C =} who (\"pattern\", @dots{})\n\
+@deftypefn  {} {} who\n\
+@deftypefnx {} {} who pattern @dots{}\n\
+@deftypefnx {} {} who option pattern @dots{}\n\
+@deftypefnx {} {C =} who (\"pattern\", @dots{})\n\
 List currently defined variables matching the given patterns.\n\
 \n\
 Valid pattern syntax is the same as described for the @code{clear} command.\n\
@@ -1834,10 +1834,10 @@
 
 DEFUN (whos, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Command} {} whos\n\
-@deftypefnx {Command} {} whos pattern @dots{}\n\
-@deftypefnx {Command} {} whos option pattern @dots{}\n\
-@deftypefnx {Built-in Function} {S =} whos (\"pattern\", @dots{})\n\
+@deftypefn  {} {} whos\n\
+@deftypefnx {} {} whos pattern @dots{}\n\
+@deftypefnx {} {} whos option pattern @dots{}\n\
+@deftypefnx {} {S =} whos (\"pattern\", @dots{})\n\
 Provide detailed information on currently defined variables matching the\n\
 given patterns.\n\
 \n\
@@ -1989,7 +1989,7 @@
 
 DEFUN (mlock, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} mlock ()\n\
+@deftypefn {} {} mlock ()\n\
 Lock the current function into memory so that it can't be cleared.\n\
 @seealso{munlock, mislocked, persistent}\n\
 @end deftypefn")
@@ -2011,8 +2011,8 @@
 
 DEFUN (munlock, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} munlock ()\n\
-@deftypefnx {Built-in Function} {} munlock (@var{fcn})\n\
+@deftypefn  {} {} munlock ()\n\
+@deftypefnx {} {} munlock (@var{fcn})\n\
 Unlock the named function @var{fcn}.\n\
 \n\
 If no function is named then unlock the current function.\n\
@@ -2048,8 +2048,8 @@
 
 DEFUN (mislocked, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} mislocked ()\n\
-@deftypefnx {Built-in Function} {} mislocked (@var{fcn})\n\
+@deftypefn  {} {} mislocked ()\n\
+@deftypefnx {} {} mislocked (@var{fcn})\n\
 Return true if the named function @var{fcn} is locked.\n\
 \n\
 If no function is named then return true if the current function is locked.\n\
@@ -2304,7 +2304,7 @@
 
 DEFUN (clear, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Command} {} clear [options] pattern @dots{}\n\
+@deftypefn {} {} clear [options] pattern @dots{}\n\
 Delete the names matching the given patterns from the symbol table.\n\
 \n\
 The pattern may contain the following special characters:\n\
@@ -2510,9 +2510,9 @@
 
 DEFUN (whos_line_format, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} whos_line_format ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} whos_line_format (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} whos_line_format (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} whos_line_format ()\n\
+@deftypefnx {} {@var{old_val} =} whos_line_format (@var{new_val})\n\
+@deftypefnx {} {} whos_line_format (@var{new_val}, \"local\")\n\
 Query or set the format string used by the command @code{whos}.\n\
 \n\
 A full format string is:\n\
@@ -2589,9 +2589,9 @@
 
 DEFUN (missing_function_hook, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} missing_function_hook ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} missing_function_hook (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} missing_function_hook (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} missing_function_hook ()\n\
+@deftypefnx {} {@var{old_val} =} missing_function_hook (@var{new_val})\n\
+@deftypefnx {} {} missing_function_hook (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the function to call when\n\
 an unknown identifier is requested.\n\
 \n\
@@ -2629,7 +2629,7 @@
 
 DEFUN (__varval__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __varval__ (@var{name})\n\
+@deftypefn {} {} __varval__ (@var{name})\n\
 Return the value of the variable @var{name} directly from the symbol table.\n\
 @end deftypefn")
 {
@@ -2645,9 +2645,9 @@
 
 DEFUN (missing_component_hook, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} missing_component_hook ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} missing_component_hook (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} missing_component_hook (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} missing_component_hook ()\n\
+@deftypefnx {} {@var{old_val} =} missing_component_hook (@var{new_val})\n\
+@deftypefnx {} {} missing_component_hook (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the function to call when\n\
 a component of Octave is missing.\n\
 \n\
--- a/libinterp/dldfcn/__delaunayn__.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/__delaunayn__.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -85,8 +85,8 @@
 
 DEFUN_DLD (__delaunayn__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{T} =} __delaunayn__ (@var{pts})\n\
-@deftypefnx {Loadable Function} {@var{T} =} __delaunayn__ (@var{pts}, @var{options})\n\
+@deftypefn  {} {@var{T} =} __delaunayn__ (@var{pts})\n\
+@deftypefnx {} {@var{T} =} __delaunayn__ (@var{pts}, @var{options})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 
--- a/libinterp/dldfcn/__eigs__.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/__eigs__.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -123,26 +123,26 @@
 
 DEFUN_DLD (__eigs__, args, nargout,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{d} =} __eigs__ (@var{A})\n\
-@deftypefnx {Loadable Function} {@var{d} =} __eigs__ (@var{A}, @var{k})\n\
-@deftypefnx {Loadable Function} {@var{d} =} __eigs__ (@var{A}, @var{k}, @var{sigma})\n\
-@deftypefnx {Loadable Function} {@var{d} =} __eigs__ (@var{A}, @var{k}, @var{sigma}, @var{opts})\n\
-@deftypefnx {Loadable Function} {@var{d} =} __eigs__ (@var{A}, @var{B})\n\
-@deftypefnx {Loadable Function} {@var{d} =} __eigs__ (@var{A}, @var{B}, @var{k})\n\
-@deftypefnx {Loadable Function} {@var{d} =} __eigs__ (@var{A}, @var{B}, @var{k}, @var{sigma})\n\
-@deftypefnx {Loadable Function} {@var{d} =} __eigs__ (@var{A}, @var{B}, @var{k}, @var{sigma}, @var{opts})\n\
-@deftypefnx {Loadable Function} {@var{d} =} __eigs__ (@var{af}, @var{n})\n\
-@deftypefnx {Loadable Function} {@var{d} =} __eigs__ (@var{af}, @var{n}, @var{B})\n\
-@deftypefnx {Loadable Function} {@var{d} =} __eigs__ (@var{af}, @var{n}, @var{k})\n\
-@deftypefnx {Loadable Function} {@var{d} =} __eigs__ (@var{af}, @var{n}, @var{B}, @var{k})\n\
-@deftypefnx {Loadable Function} {@var{d} =} __eigs__ (@var{af}, @var{n}, @var{k}, @var{sigma})\n\
-@deftypefnx {Loadable Function} {@var{d} =} __eigs__ (@var{af}, @var{n}, @var{B}, @var{k}, @var{sigma})\n\
-@deftypefnx {Loadable Function} {@var{d} =} __eigs__ (@var{af}, @var{n}, @var{k}, @var{sigma}, @var{opts})\n\
-@deftypefnx {Loadable Function} {@var{d} =} __eigs__ (@var{af}, @var{n}, @var{B}, @var{k}, @var{sigma}, @var{opts})\n\
-@deftypefnx {Loadable Function} {[@var{V}, @var{d}] =} __eigs__ (@var{A}, @dots{})\n\
-@deftypefnx {Loadable Function} {[@var{V}, @var{d}] =} __eigs__ (@var{af}, @var{n}, @dots{})\n\
-@deftypefnx {Loadable Function} {[@var{V}, @var{d}, @var{flag}] =} __eigs__ (@var{A}, @dots{})\n\
-@deftypefnx {Loadable Function} {[@var{V}, @var{d}, @var{flag}] =} __eigs__ (@var{af}, @var{n}, @dots{})\n\
+@deftypefn  {} {@var{d} =} __eigs__ (@var{A})\n\
+@deftypefnx {} {@var{d} =} __eigs__ (@var{A}, @var{k})\n\
+@deftypefnx {} {@var{d} =} __eigs__ (@var{A}, @var{k}, @var{sigma})\n\
+@deftypefnx {} {@var{d} =} __eigs__ (@var{A}, @var{k}, @var{sigma}, @var{opts})\n\
+@deftypefnx {} {@var{d} =} __eigs__ (@var{A}, @var{B})\n\
+@deftypefnx {} {@var{d} =} __eigs__ (@var{A}, @var{B}, @var{k})\n\
+@deftypefnx {} {@var{d} =} __eigs__ (@var{A}, @var{B}, @var{k}, @var{sigma})\n\
+@deftypefnx {} {@var{d} =} __eigs__ (@var{A}, @var{B}, @var{k}, @var{sigma}, @var{opts})\n\
+@deftypefnx {} {@var{d} =} __eigs__ (@var{af}, @var{n})\n\
+@deftypefnx {} {@var{d} =} __eigs__ (@var{af}, @var{n}, @var{B})\n\
+@deftypefnx {} {@var{d} =} __eigs__ (@var{af}, @var{n}, @var{k})\n\
+@deftypefnx {} {@var{d} =} __eigs__ (@var{af}, @var{n}, @var{B}, @var{k})\n\
+@deftypefnx {} {@var{d} =} __eigs__ (@var{af}, @var{n}, @var{k}, @var{sigma})\n\
+@deftypefnx {} {@var{d} =} __eigs__ (@var{af}, @var{n}, @var{B}, @var{k}, @var{sigma})\n\
+@deftypefnx {} {@var{d} =} __eigs__ (@var{af}, @var{n}, @var{k}, @var{sigma}, @var{opts})\n\
+@deftypefnx {} {@var{d} =} __eigs__ (@var{af}, @var{n}, @var{B}, @var{k}, @var{sigma}, @var{opts})\n\
+@deftypefnx {} {[@var{V}, @var{d}] =} __eigs__ (@var{A}, @dots{})\n\
+@deftypefnx {} {[@var{V}, @var{d}] =} __eigs__ (@var{af}, @var{n}, @dots{})\n\
+@deftypefnx {} {[@var{V}, @var{d}, @var{flag}] =} __eigs__ (@var{A}, @dots{})\n\
+@deftypefnx {} {[@var{V}, @var{d}, @var{flag}] =} __eigs__ (@var{af}, @var{n}, @dots{})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
--- a/libinterp/dldfcn/__glpk__.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/__glpk__.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -331,7 +331,7 @@
 
 DEFUN_DLD (__glpk__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {[@var{values}] =} __glpk__ (@var{args})\n\
+@deftypefn {} {[@var{values}] =} __glpk__ (@var{args})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
--- a/libinterp/dldfcn/__init_gnuplot__.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/__init_gnuplot__.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -216,7 +216,7 @@
 
 DEFUN_DLD (__have_gnuplot__, , ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{gnuplot_available} =} __have_gnuplot__ ()\n\
+@deftypefn {} {@var{gnuplot_available} =} __have_gnuplot__ ()\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
--- a/libinterp/dldfcn/__magick_read__.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/__magick_read__.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -743,7 +743,7 @@
 
 DEFUN_DLD (__magick_read__, args, nargout,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {[@var{img}, @var{map}, @var{alpha}] =} __magick_read__ (@var{fname}, @var{options})\n\
+@deftypefn {} {[@var{img}, @var{map}, @var{alpha}] =} __magick_read__ (@var{fname}, @var{options})\n\
 Read image with GraphicsMagick or ImageMagick.\n\
 \n\
 This is a private internal function not intended for direct use.\n\
@@ -1380,7 +1380,7 @@
 
 DEFUN_DLD (__magick_write__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __magick_write__ (@var{fname}, @var{fmt}, @var{img}, @var{map}, @var{options})\n\
+@deftypefn {} {} __magick_write__ (@var{fname}, @var{fmt}, @var{img}, @var{map}, @var{options})\n\
 Write image with GraphicsMagick or ImageMagick.\n\
 \n\
 This is a private internal function not intended for direct use.\n\
@@ -1556,7 +1556,7 @@
 // done in Octave language), and then again for the actual reading.
 DEFUN_DLD (__magick_ping__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __magick_ping__ (@var{fname}, @var{idx})\n\
+@deftypefn {} {} __magick_ping__ (@var{fname}, @var{idx})\n\
 Ping image information with GraphicsMagick or ImageMagick.\n\
 \n\
 This is a private internal function not intended for direct use.\n\
@@ -1775,7 +1775,7 @@
 
 DEFUN_DLD (__magick_finfo__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __magick_finfo__ (@var{fname})\n\
+@deftypefn {} {} __magick_finfo__ (@var{fname})\n\
 Read image information with GraphicsMagick or ImageMagick.\n\
 \n\
 This is a private internal function not intended for direct use.\n\
@@ -2225,7 +2225,7 @@
 
 DEFUN_DLD (__magick_formats__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __magick_imformats__ (@var{formats})\n\
+@deftypefn {} {} __magick_imformats__ (@var{formats})\n\
 Fill formats info with GraphicsMagick CoderInfo.\n\
 \n\
 @seealso{imfinfo, imformats, imread, imwrite}\n\
--- a/libinterp/dldfcn/__osmesa_print__.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/__osmesa_print__.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -58,8 +58,8 @@
 
 DEFUN_DLD(__osmesa_print__, args, ,
           "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {} __osmesa_print__ (@var{h}, @var{file}, @var{term})\n\
-@deftypefnx {Loadable Function} {@var{img} =} __osmesa_print__ (@var{h})\n\
+@deftypefn  {} {} __osmesa_print__ (@var{h}, @var{file}, @var{term})\n\
+@deftypefnx {} {@var{img} =} __osmesa_print__ (@var{h})\n\
 Print figure @var{h} using OSMesa and gl2ps for vector formats.\n\
 \n\
 This is a private internal function.\n\
--- a/libinterp/dldfcn/__voronoi__.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/__voronoi__.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -76,9 +76,9 @@
 
 DEFUN_DLD (__voronoi__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{C}, @var{F} =} __voronoi__ (@var{caller}, @var{pts})\n\
-@deftypefnx {Loadable Function} {@var{C}, @var{F} =} __voronoi__ (@var{caller}, @var{pts}, @var{options})\n\
-@deftypefnx {Loadable Function} {@var{C}, @var{F}, @var{Inf_Pts} =} __voronoi__ (@dots{})\n\
+@deftypefn  {} {@var{C}, @var{F} =} __voronoi__ (@var{caller}, @var{pts})\n\
+@deftypefnx {} {@var{C}, @var{F} =} __voronoi__ (@var{caller}, @var{pts}, @var{options})\n\
+@deftypefnx {} {@var{C}, @var{F}, @var{Inf_Pts} =} __voronoi__ (@dots{})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
--- a/libinterp/dldfcn/amd.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/amd.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -52,8 +52,8 @@
 
 DEFUN_DLD (amd, args, nargout,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{p} =} amd (@var{S})\n\
-@deftypefnx {Loadable Function} {@var{p} =} amd (@var{S}, @var{opts})\n\
+@deftypefn  {} {@var{p} =} amd (@var{S})\n\
+@deftypefnx {} {@var{p} =} amd (@var{S}, @var{opts})\n\
 \n\
 Return the approximate minimum degree permutation of a matrix.\n\
 \n\
--- a/libinterp/dldfcn/audiodevinfo.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/audiodevinfo.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -68,14 +68,14 @@
 
 DEFUN_DLD (audiodevinfo, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{devinfo} =} audiodevinfo ()\n\
+@deftypefn {} {@var{devinfo} =} audiodevinfo ()\n\
 \n\
-@deftypefnx {Loadable Function} {@var{devs} =} audiodevinfo (@var{io})\n\
-@deftypefnx {Loadable Function} {@var{name} =} audiodevinfo (@var{io}, @var{id})\n\
-@deftypefnx {Loadable Function} {@var{id} =} audiodevinfo (@var{io}, @var{name})\n\
-@deftypefnx {Loadable Function} {@var{id} =} audiodevinfo (@var{io}, @var{rate}, @var{bits}, @var{chans})\n\
+@deftypefnx {} {@var{devs} =} audiodevinfo (@var{io})\n\
+@deftypefnx {} {@var{name} =} audiodevinfo (@var{io}, @var{id})\n\
+@deftypefnx {} {@var{id} =} audiodevinfo (@var{io}, @var{name})\n\
+@deftypefnx {} {@var{id} =} audiodevinfo (@var{io}, @var{rate}, @var{bits}, @var{chans})\n\
 \n\
-@deftypefnx {Loadable Function} {@var{supports} =} audiodevinfo (@var{io}, @var{id}, @var{rate}, @var{bits}, @var{chans})\n\
+@deftypefnx {} {@var{supports} =} audiodevinfo (@var{io}, @var{id}, @var{rate}, @var{bits}, @var{chans})\n\
 \n\
 Return a structure describing the available audio input and output devices.\n\
 \n\
@@ -1802,9 +1802,9 @@
 
 DEFUN_DLD (__recorder_audiorecorder__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{recorder} =} __recorder_audiorecorder__ (@var{fs}, @var{nbits}, @var{channels})\n\
-@deftypefnx {Loadable Function} {@var{recorder} =} __recorder_audiorecorder__ (@var{fs}, @var{nbits}, @var{channels}, @var{id})\n\
-@deftypefnx {Loadable Function} {@var{recorder} =} __recorder_audiorecorder__ (@var{fcn}, @dots{})\n\
+@deftypefn  {} {@var{recorder} =} __recorder_audiorecorder__ (@var{fs}, @var{nbits}, @var{channels})\n\
+@deftypefnx {} {@var{recorder} =} __recorder_audiorecorder__ (@var{fs}, @var{nbits}, @var{channels}, @var{id})\n\
+@deftypefnx {} {@var{recorder} =} __recorder_audiorecorder__ (@var{fcn}, @dots{})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -1872,7 +1872,7 @@
 
 DEFUN_DLD (__recorder_getaudiodata__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{data}} __recorder_getaudiodata__ (@var{recorder})\n\
+@deftypefn {} {@var{data}} __recorder_getaudiodata__ (@var{recorder})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -1898,7 +1898,7 @@
 
 DEFUN_DLD (__recorder_get_channels__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{n} =} __recorder_get_channels__ (@var{recorder})\n\
+@deftypefn {} {@var{n} =} __recorder_get_channels__ (@var{recorder})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -1927,7 +1927,7 @@
 
 DEFUN_DLD (__recorder_get_fs__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{fs} =} __recorder_get_fs__ (@var{recorder})\n\
+@deftypefn {} {@var{fs} =} __recorder_get_fs__ (@var{recorder})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -1956,7 +1956,7 @@
 
 DEFUN_DLD (__recorder_get_id__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{id} =} __recorder_get_id__ (@var{recorder})\n\
+@deftypefn {} {@var{id} =} __recorder_get_id__ (@var{recorder})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -1985,7 +1985,7 @@
 
 DEFUN_DLD (__recorder_get_nbits__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{nbits} =} __recorder_get_nbits__ (@var{recorder})\n\
+@deftypefn {} {@var{nbits} =} __recorder_get_nbits__ (@var{recorder})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2014,7 +2014,7 @@
 
 DEFUN_DLD (__recorder_get_sample_number__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{n} =} __recorder_get_sample_number__ (@var{recorder})\n\
+@deftypefn {} {@var{n} =} __recorder_get_sample_number__ (@var{recorder})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2043,7 +2043,7 @@
 
 DEFUN_DLD (__recorder_get_tag__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{tag} =} __recorder_get_tag__ (@var{recorder})\n\
+@deftypefn {} {@var{tag} =} __recorder_get_tag__ (@var{recorder})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2072,7 +2072,7 @@
 
 DEFUN_DLD (__recorder_get_total_samples__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{n} =} __recorder_get_total_samples__ (@var{recorder})\n\
+@deftypefn {} {@var{n} =} __recorder_get_total_samples__ (@var{recorder})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2101,7 +2101,7 @@
 
 DEFUN_DLD (__recorder_get_userdata__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{data} =} __recorder_get_userdata__ (@var{recorder})\n\
+@deftypefn {} {@var{data} =} __recorder_get_userdata__ (@var{recorder})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2130,7 +2130,7 @@
 
 DEFUN_DLD (__recorder_isrecording__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __recorder_isrecording__ (@var{recorder})\n\
+@deftypefn {} {} __recorder_isrecording__ (@var{recorder})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2159,7 +2159,7 @@
 
 DEFUN_DLD (__recorder_pause__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __recorder_pause__ (@var{recorder})\n\
+@deftypefn {} {} __recorder_pause__ (@var{recorder})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2188,7 +2188,7 @@
 
 DEFUN_DLD (__recorder_recordblocking__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __recorder_recordblocking__ (@var{recorder}, @var{seconds})\n\
+@deftypefn {} {} __recorder_recordblocking__ (@var{recorder}, @var{seconds})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2214,8 +2214,8 @@
 
 DEFUN_DLD (__recorder_record__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {} __recorder_record__ (@var{recorder})\n\
-@deftypefnx {Loadable Function} {} __recorder_record__ (@var{recorder}, @var{seconds})\n\
+@deftypefn  {} {} __recorder_record__ (@var{recorder})\n\
+@deftypefnx {} {} __recorder_record__ (@var{recorder}, @var{seconds})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2249,7 +2249,7 @@
 
 DEFUN_DLD (__recorder_resume__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __recorder_resume__ (@var{recorder})\n\
+@deftypefn {} {} __recorder_resume__ (@var{recorder})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2278,7 +2278,7 @@
 
 DEFUN_DLD (__recorder_set_fs__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __recorder_set_fs__ (@var{recorder}, @var{fs})\n\
+@deftypefn {} {} __recorder_set_fs__ (@var{recorder}, @var{fs})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2307,7 +2307,7 @@
 
 DEFUN_DLD (__recorder_set_tag__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __recorder_set_tag__ (@var{recorder}, @var{tag})\n\
+@deftypefn {} {} __recorder_set_tag__ (@var{recorder}, @var{tag})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2336,7 +2336,7 @@
 
 DEFUN_DLD (__recorder_set_userdata__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __recorder_set_userdata__ (@var{recorder}, @var{data})\n\
+@deftypefn {} {} __recorder_set_userdata__ (@var{recorder}, @var{data})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2365,7 +2365,7 @@
 
 DEFUN_DLD (__recorder_stop__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __recorder_stop__ (@var{recorder})\n\
+@deftypefn {} {} __recorder_stop__ (@var{recorder})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2391,9 +2391,9 @@
 
 DEFUN_DLD (__player_audioplayer__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{player} =} __player_audioplayer__ (@var{y}, @var{fs})\n\
-@deftypefnx {Loadable Function} {@var{player} =} __player_audioplayer__ (@var{y}, @var{fs}, @var{nbits})\n\
-@deftypefnx {Loadable Function} {@var{player} =} __player_audioplayer__ (@var{y}, @var{fs}, @var{nbits}, @var{id})\n\
+@deftypefn  {} {@var{player} =} __player_audioplayer__ (@var{y}, @var{fs})\n\
+@deftypefnx {} {@var{player} =} __player_audioplayer__ (@var{y}, @var{fs}, @var{nbits})\n\
+@deftypefnx {} {@var{player} =} __player_audioplayer__ (@var{y}, @var{fs}, @var{nbits}, @var{id})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2465,7 +2465,7 @@
 
 DEFUN_DLD (__player_get_channels__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{n} =} __player_get_channels__ (@var{player})\n\
+@deftypefn {} {@var{n} =} __player_get_channels__ (@var{player})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2494,7 +2494,7 @@
 
 DEFUN_DLD (__player_get_fs__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{fs} =} __player_get_fs__ (@var{player})\n\
+@deftypefn {} {@var{fs} =} __player_get_fs__ (@var{player})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2523,7 +2523,7 @@
 
 DEFUN_DLD (__player_get_id__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{id} =} __player_get_id__ (@var{player})\n\
+@deftypefn {} {@var{id} =} __player_get_id__ (@var{player})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2552,7 +2552,7 @@
 
 DEFUN_DLD (__player_get_nbits__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{nbits} =} __player_get_nbits__ (@var{player})\n\
+@deftypefn {} {@var{nbits} =} __player_get_nbits__ (@var{player})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2581,7 +2581,7 @@
 
 DEFUN_DLD (__player_get_sample_number__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{n} =} __player_get_sample_number__ (@var{player})\n\
+@deftypefn {} {@var{n} =} __player_get_sample_number__ (@var{player})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2610,7 +2610,7 @@
 
 DEFUN_DLD (__player_get_tag__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{tag} =} __player_get_tag__ (@var{player})\n\
+@deftypefn {} {@var{tag} =} __player_get_tag__ (@var{player})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2639,7 +2639,7 @@
 
 DEFUN_DLD (__player_get_total_samples__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{n} =} __player_get_total_samples__ (@var{player})\n\
+@deftypefn {} {@var{n} =} __player_get_total_samples__ (@var{player})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2668,7 +2668,7 @@
 
 DEFUN_DLD (__player_get_userdata__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{data} =} __player_get_userdata__ (@var{player})\n\
+@deftypefn {} {@var{data} =} __player_get_userdata__ (@var{player})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2697,7 +2697,7 @@
 
 DEFUN_DLD (__player_isplaying__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __player_isplaying__ (@var{player})\n\
+@deftypefn {} {} __player_isplaying__ (@var{player})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2726,7 +2726,7 @@
 
 DEFUN_DLD (__player_pause__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __player_pause__ (@var{player})\n\
+@deftypefn {} {} __player_pause__ (@var{player})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2755,9 +2755,9 @@
 
 DEFUN_DLD (__player_playblocking__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {} __player_playblocking__ (@var{player})\n\
-@deftypefnx {Loadable Function} {} __player_playblocking__ (@var{player}, @var{start})\n\
-@deftypefnx {Loadable Function} {} __player_playblocking__ (@var{player}, [@var{start}, @var{end}])\n\
+@deftypefn  {} {} __player_playblocking__ (@var{player})\n\
+@deftypefnx {} {} __player_playblocking__ (@var{player}, @var{start})\n\
+@deftypefnx {} {} __player_playblocking__ (@var{player}, [@var{start}, @var{end}])\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2812,9 +2812,9 @@
 
 DEFUN_DLD (__player_play__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {} __player_play__ (@var{player})\n\
-@deftypefnx {Loadable Function} {} __player_play__ (@var{player}, @var{start})\n\
-@deftypefnx {Loadable Function} {} __player_play__ (@var{player}, [@var{start}, @var{end}])\n\
+@deftypefn  {} {} __player_play__ (@var{player})\n\
+@deftypefnx {} {} __player_play__ (@var{player}, @var{start})\n\
+@deftypefnx {} {} __player_play__ (@var{player}, [@var{start}, @var{end}])\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2873,7 +2873,7 @@
 
 DEFUN_DLD (__player_resume__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __player_resume__ (@var{player})\n\
+@deftypefn {} {} __player_resume__ (@var{player})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2902,7 +2902,7 @@
 
 DEFUN_DLD (__player_set_fs__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __player_set_fs__ (@var{player}, @var{fs})\n\
+@deftypefn {} {} __player_set_fs__ (@var{player}, @var{fs})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2931,7 +2931,7 @@
 
 DEFUN_DLD (__player_set_tag__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __player_set_tag__ (@var{player}, @var{tag})\n\
+@deftypefn {} {} __player_set_tag__ (@var{player}, @var{tag})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2960,7 +2960,7 @@
 
 DEFUN_DLD (__player_set_userdata__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __player_set_userdata__ (@var{player}, @var{data})\n\
+@deftypefn {} {} __player_set_userdata__ (@var{player}, @var{data})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2989,7 +2989,7 @@
 
 DEFUN_DLD (__player_stop__, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} __player_stop__ (@var{player})\n\
+@deftypefn {} {} __player_stop__ (@var{player})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
--- a/libinterp/dldfcn/audioread.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/audioread.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -51,11 +51,11 @@
 
 DEFUN_DLD (audioread, args, ,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {[@var{y}, @var{fs}] =} audioread (@var{filename})\n\
-@deftypefnx {Loadable Function} {[@var{y}, @var{fs}] =} audioread (@var{filename}, @var{samples})\n\
+@deftypefn  {} {[@var{y}, @var{fs}] =} audioread (@var{filename})\n\
+@deftypefnx {} {[@var{y}, @var{fs}] =} audioread (@var{filename}, @var{samples})\n\
 \n\
-@deftypefnx {Loadable Function} {[@var{y}, @var{fs}] =} audioread (@var{filename}, @var{datatype})\n\
-@deftypefnx {Loadable Function} {[@var{y}, @var{fs}] =} audioread (@var{filename}, @var{samples}, @var{datatype})\n\
+@deftypefnx {} {[@var{y}, @var{fs}] =} audioread (@var{filename}, @var{datatype})\n\
+@deftypefnx {} {[@var{y}, @var{fs}] =} audioread (@var{filename}, @var{samples}, @var{datatype})\n\
 Read the audio file @var{filename} and return the audio data @var{y} and\n\
 sampling rate @var{fs}.\n\
 \n\
@@ -232,8 +232,8 @@
 
 DEFUN_DLD (audiowrite, args, ,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {} audiowrite (@var{filename}, @var{y}, @var{fs})\n\
-@deftypefnx {Loadable Function} {} audiowrite (@var{filename}, @var{y}, @var{fs}, @var{name}, @var{value}, @dots{})\n\
+@deftypefn  {} {} audiowrite (@var{filename}, @var{y}, @var{fs})\n\
+@deftypefnx {} {} audiowrite (@var{filename}, @var{y}, @var{fs}, @var{name}, @var{value}, @dots{})\n\
 \n\
 Write audio data from the matrix @var{y} to @var{filename} at sampling rate\n\
 @var{fs} with the file format determined by the file extension.\n\
@@ -437,7 +437,7 @@
 
 DEFUN_DLD (audioinfo, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{info} =} audioinfo (@var{filename})\n\
+@deftypefn {} {@var{info} =} audioinfo (@var{filename})\n\
 Return information about an audio file specified by @var{filename}.\n\
 @end deftypefn")
 {
--- a/libinterp/dldfcn/ccolamd.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/ccolamd.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -53,10 +53,10 @@
 
 DEFUN_DLD (ccolamd, args, nargout,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{p} =} ccolamd (@var{S})\n\
-@deftypefnx {Loadable Function} {@var{p} =} ccolamd (@var{S}, @var{knobs})\n\
-@deftypefnx {Loadable Function} {@var{p} =} ccolamd (@var{S}, @var{knobs}, @var{cmember})\n\
-@deftypefnx {Loadable Function} {[@var{p}, @var{stats}] =} ccolamd (@dots{})\n\
+@deftypefn  {} {@var{p} =} ccolamd (@var{S})\n\
+@deftypefnx {} {@var{p} =} ccolamd (@var{S}, @var{knobs})\n\
+@deftypefnx {} {@var{p} =} ccolamd (@var{S}, @var{knobs}, @var{cmember})\n\
+@deftypefnx {} {[@var{p}, @var{stats}] =} ccolamd (@dots{})\n\
 \n\
 Constrained column approximate minimum degree permutation.\n\
 \n\
@@ -340,10 +340,10 @@
 
 DEFUN_DLD (csymamd, args, nargout,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{p} =} csymamd (@var{S})\n\
-@deftypefnx {Loadable Function} {@var{p} =} csymamd (@var{S}, @var{knobs})\n\
-@deftypefnx {Loadable Function} {@var{p} =} csymamd (@var{S}, @var{knobs}, @var{cmember})\n\
-@deftypefnx {Loadable Function} {[@var{p}, @var{stats}] =} csymamd (@dots{})\n\
+@deftypefn  {} {@var{p} =} csymamd (@var{S})\n\
+@deftypefnx {} {@var{p} =} csymamd (@var{S}, @var{knobs})\n\
+@deftypefnx {} {@var{p} =} csymamd (@var{S}, @var{knobs}, @var{cmember})\n\
+@deftypefnx {} {[@var{p}, @var{stats}] =} csymamd (@dots{})\n\
 \n\
 For a symmetric positive definite matrix @var{S}, return the permutation\n\
 vector @var{p} such that @code{@var{S}(@var{p},@var{p})} tends to have a\n\
--- a/libinterp/dldfcn/chol.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/chol.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -69,12 +69,12 @@
 
 DEFUN_DLD (chol, args, nargout,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{R} =} chol (@var{A})\n\
-@deftypefnx {Loadable Function} {[@var{R}, @var{p}] =} chol (@var{A})\n\
-@deftypefnx {Loadable Function} {[@var{R}, @var{p}, @var{Q}] =} chol (@var{S})\n\
-@deftypefnx {Loadable Function} {[@var{R}, @var{p}, @var{Q}] =} chol (@var{S}, \"vector\")\n\
-@deftypefnx {Loadable Function} {[@var{L}, @dots{}] =} chol (@dots{}, \"lower\")\n\
-@deftypefnx {Loadable Function} {[@var{L}, @dots{}] =} chol (@dots{}, \"upper\")\n\
+@deftypefn  {} {@var{R} =} chol (@var{A})\n\
+@deftypefnx {} {[@var{R}, @var{p}] =} chol (@var{A})\n\
+@deftypefnx {} {[@var{R}, @var{p}, @var{Q}] =} chol (@var{S})\n\
+@deftypefnx {} {[@var{R}, @var{p}, @var{Q}] =} chol (@var{S}, \"vector\")\n\
+@deftypefnx {} {[@var{L}, @dots{}] =} chol (@dots{}, \"lower\")\n\
+@deftypefnx {} {[@var{L}, @dots{}] =} chol (@dots{}, \"upper\")\n\
 @cindex Cholesky factorization\n\
 Compute the Cholesky@tie{}factor, @var{R}, of the symmetric positive definite\n\
 matrix @var{A}.\n\
@@ -342,7 +342,7 @@
 
 DEFUN_DLD (cholinv, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} cholinv (@var{A})\n\
+@deftypefn {} {} cholinv (@var{A})\n\
 Compute the inverse of the symmetric positive definite matrix @var{A} using\n\
 the Cholesky@tie{}factorization.\n\
 @seealso{chol, chol2inv, inv}\n\
@@ -467,7 +467,7 @@
 
 DEFUN_DLD (chol2inv, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} chol2inv (@var{U})\n\
+@deftypefn {} {} chol2inv (@var{U})\n\
 Invert a symmetric, positive definite square matrix from its Cholesky\n\
 decomposition, @var{U}.\n\
 \n\
@@ -550,7 +550,7 @@
 
 DEFUN_DLD (cholupdate, args, nargout,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {[@var{R1}, @var{info}] =} cholupdate (@var{R}, @var{u}, @var{op})\n\
+@deftypefn {} {[@var{R1}, @var{info}] =} cholupdate (@var{R}, @var{u}, @var{op})\n\
 Update or downdate a Cholesky@tie{}factorization.\n\
 \n\
 Given an upper triangular matrix @var{R} and a column vector @var{u},\n\
@@ -755,8 +755,8 @@
 
 DEFUN_DLD (cholinsert, args, nargout,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{R1} =} cholinsert (@var{R}, @var{j}, @var{u})\n\
-@deftypefnx {Loadable Function} {[@var{R1}, @var{info}] =} cholinsert (@var{R}, @var{j}, @var{u})\n\
+@deftypefn  {} {@var{R1} =} cholinsert (@var{R}, @var{j}, @var{u})\n\
+@deftypefnx {} {[@var{R1}, @var{info}] =} cholinsert (@var{R}, @var{j}, @var{u})\n\
 Given a Cholesky@tie{}factorization of a real symmetric or complex Hermitian\n\
 positive definite matrix @w{@var{A} = @var{R}'*@var{R}}, @var{R}@tie{}upper\n\
 triangular, return the Cholesky@tie{}factorization of\n\
@@ -1012,7 +1012,7 @@
 
 DEFUN_DLD (choldelete, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{R1} =} choldelete (@var{R}, @var{j})\n\
+@deftypefn {} {@var{R1} =} choldelete (@var{R}, @var{j})\n\
 Given a Cholesky@tie{}factorization of a real symmetric or complex Hermitian\n\
 positive definite matrix @w{@var{A} = @var{R}'*@var{R}}, @var{R}@tie{}upper\n\
 triangular, return the Cholesky@tie{}factorization of @w{A(p,p)}, where\n\
@@ -1138,7 +1138,7 @@
 
 DEFUN_DLD (cholshift, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{R1} =} cholshift (@var{R}, @var{i}, @var{j})\n\
+@deftypefn {} {@var{R1} =} cholshift (@var{R}, @var{i}, @var{j})\n\
 Given a Cholesky@tie{}factorization of a real symmetric or complex Hermitian\n\
 positive definite matrix @w{@var{A} = @var{R}'*@var{R}}, @var{R}@tie{}upper\n\
 triangular, return the Cholesky@tie{}factorization of\n\
--- a/libinterp/dldfcn/colamd.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/colamd.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -211,10 +211,10 @@
 
 DEFUN_DLD (colamd, args, nargout,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{p} =} colamd (@var{S})\n\
-@deftypefnx {Loadable Function} {@var{p} =} colamd (@var{S}, @var{knobs})\n\
-@deftypefnx {Loadable Function} {[@var{p}, @var{stats}] =} colamd (@var{S})\n\
-@deftypefnx {Loadable Function} {[@var{p}, @var{stats}] =} colamd (@var{S}, @var{knobs})\n\
+@deftypefn  {} {@var{p} =} colamd (@var{S})\n\
+@deftypefnx {} {@var{p} =} colamd (@var{S}, @var{knobs})\n\
+@deftypefnx {} {[@var{p}, @var{stats}] =} colamd (@var{S})\n\
+@deftypefnx {} {[@var{p}, @var{stats}] =} colamd (@var{S}, @var{knobs})\n\
 \n\
 Compute the column approximate minimum degree permutation.\n\
 \n\
@@ -450,10 +450,10 @@
 
 DEFUN_DLD (symamd, args, nargout,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{p} =} symamd (@var{S})\n\
-@deftypefnx {Loadable Function} {@var{p} =} symamd (@var{S}, @var{knobs})\n\
-@deftypefnx {Loadable Function} {[@var{p}, @var{stats}] =} symamd (@var{S})\n\
-@deftypefnx {Loadable Function} {[@var{p}, @var{stats}] =} symamd (@var{S}, @var{knobs})\n\
+@deftypefn  {} {@var{p} =} symamd (@var{S})\n\
+@deftypefnx {} {@var{p} =} symamd (@var{S}, @var{knobs})\n\
+@deftypefnx {} {[@var{p}, @var{stats}] =} symamd (@var{S})\n\
+@deftypefnx {} {[@var{p}, @var{stats}] =} symamd (@var{S}, @var{knobs})\n\
 \n\
 For a symmetric positive definite matrix @var{S}, returns the permutation\n\
 vector p such that @code{@var{S}(@var{p}, @var{p})} tends to have a\n\
@@ -640,9 +640,9 @@
 
 DEFUN_DLD (etree, args, nargout,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{p} =} etree (@var{S})\n\
-@deftypefnx {Loadable Function} {@var{p} =} etree (@var{S}, @var{typ})\n\
-@deftypefnx {Loadable Function} {[@var{p}, @var{q}] =} etree (@var{S}, @var{typ})\n\
+@deftypefn  {} {@var{p} =} etree (@var{S})\n\
+@deftypefnx {} {@var{p} =} etree (@var{S}, @var{typ})\n\
+@deftypefnx {} {[@var{p}, @var{q}] =} etree (@var{S}, @var{typ})\n\
 \n\
 Return the elimination tree for the matrix @var{S}.\n\
 \n\
--- a/libinterp/dldfcn/convhulln.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/convhulln.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -71,9 +71,9 @@
 
 DEFUN_DLD (convhulln, args, nargout,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{h} =} convhulln (@var{pts})\n\
-@deftypefnx {Loadable Function} {@var{h} =} convhulln (@var{pts}, @var{options})\n\
-@deftypefnx {Loadable Function} {[@var{h}, @var{v}] =} convhulln (@dots{})\n\
+@deftypefn  {} {@var{h} =} convhulln (@var{pts})\n\
+@deftypefnx {} {@var{h} =} convhulln (@var{pts}, @var{options})\n\
+@deftypefnx {} {[@var{h}, @var{v}] =} convhulln (@dots{})\n\
 Compute the convex hull of the set of points @var{pts}.\n\
 \n\
 @var{pts} is a matrix of size [n, dim] containing n points in a space of\n\
--- a/libinterp/dldfcn/dmperm.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/dmperm.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -131,8 +131,8 @@
 
 DEFUN_DLD (dmperm, args, nargout,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{p} =} dmperm (@var{S})\n\
-@deftypefnx {Loadable Function} {[@var{p}, @var{q}, @var{r}, @var{S}] =} dmperm (@var{S})\n\
+@deftypefn  {} {@var{p} =} dmperm (@var{S})\n\
+@deftypefnx {} {[@var{p}, @var{q}, @var{r}, @var{S}] =} dmperm (@var{S})\n\
 \n\
 @cindex @nospell{Dulmage-Mendelsohn} decomposition\n\
 Perform a @nospell{Dulmage-Mendelsohn} permutation of the sparse matrix\n\
@@ -185,7 +185,7 @@
 
 DEFUN_DLD (sprank, args, nargout,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{p} =} sprank (@var{S})\n\
+@deftypefn {} {@var{p} =} sprank (@var{S})\n\
 @cindex structural rank\n\
 \n\
 Calculate the structural rank of the sparse matrix @var{S}.\n\
--- a/libinterp/dldfcn/fftw.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/fftw.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -36,12 +36,12 @@
 
 DEFUN_DLD (fftw, args, ,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {@var{method} =} fftw (\"planner\")\n\
-@deftypefnx {Loadable Function} {} fftw (\"planner\", @var{method})\n\
-@deftypefnx {Loadable Function} {@var{wisdom} =} fftw (\"dwisdom\")\n\
-@deftypefnx {Loadable Function} {} fftw (\"dwisdom\", @var{wisdom})\n\
-@deftypefnx {Loadable Function} {} fftw (\"threads\", @var{nthreads})\n\
-@deftypefnx {Loadable Function} {@var{nthreads} =} fftw (\"threads\")\n\
+@deftypefn  {} {@var{method} =} fftw (\"planner\")\n\
+@deftypefnx {} {} fftw (\"planner\", @var{method})\n\
+@deftypefnx {} {@var{wisdom} =} fftw (\"dwisdom\")\n\
+@deftypefnx {} {} fftw (\"dwisdom\", @var{wisdom})\n\
+@deftypefnx {} {} fftw (\"threads\", @var{nthreads})\n\
+@deftypefnx {} {@var{nthreads} =} fftw (\"threads\")\n\
 \n\
 Manage @sc{fftw} wisdom data.\n\
 \n\
--- a/libinterp/dldfcn/qr.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/qr.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -74,10 +74,10 @@
 
 DEFUN_DLD (qr, args, nargout,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {[@var{Q}, @var{R}, @var{P}] =} qr (@var{A})\n\
-@deftypefnx {Loadable Function} {[@var{Q}, @var{R}, @var{P}] =} qr (@var{A}, '0')\n\
-@deftypefnx {Loadable Function} {[@var{C}, @var{R}] =} qr (@var{A}, @var{B})\n\
-@deftypefnx {Loadable Function} {[@var{C}, @var{R}] =} qr (@var{A}, @var{B}, '0')\n\
+@deftypefn  {} {[@var{Q}, @var{R}, @var{P}] =} qr (@var{A})\n\
+@deftypefnx {} {[@var{Q}, @var{R}, @var{P}] =} qr (@var{A}, '0')\n\
+@deftypefnx {} {[@var{C}, @var{R}] =} qr (@var{A}, @var{B})\n\
+@deftypefnx {} {[@var{C}, @var{R}] =} qr (@var{A}, @var{B}, '0')\n\
 @cindex QR factorization\n\
 Compute the QR@tie{}factorization of @var{A}, using standard @sc{lapack}\n\
 subroutines.\n\
@@ -740,7 +740,7 @@
 
 DEFUN_DLD (qrupdate, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {[@var{Q1}, @var{R1}] =} qrupdate (@var{Q}, @var{R}, @var{u}, @var{v})\n\
+@deftypefn {} {[@var{Q1}, @var{R1}] =} qrupdate (@var{Q}, @var{R}, @var{u}, @var{v})\n\
 Given a QR@tie{}factorization of a real or complex matrix\n\
 @w{@var{A} = @var{Q}*@var{R}}, @var{Q}@tie{}unitary and\n\
 @var{R}@tie{}upper trapezoidal, return the QR@tie{}factorization of\n\
@@ -914,7 +914,7 @@
 
 DEFUN_DLD (qrinsert, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {[@var{Q1}, @var{R1}] =} qrinsert (@var{Q}, @var{R}, @var{j}, @var{x}, @var{orient})\n\
+@deftypefn {} {[@var{Q1}, @var{R1}] =} qrinsert (@var{Q}, @var{R}, @var{j}, @var{x}, @var{orient})\n\
 Given a QR@tie{}factorization of a real or complex matrix\n\
 @w{@var{A} = @var{Q}*@var{R}}, @var{Q}@tie{}unitary and\n\
 @var{R}@tie{}upper trapezoidal, return the QR@tie{}factorization of\n\
@@ -1129,7 +1129,7 @@
 
 DEFUN_DLD (qrdelete, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {[@var{Q1}, @var{R1}] =} qrdelete (@var{Q}, @var{R}, @var{j}, @var{orient})\n\
+@deftypefn {} {[@var{Q1}, @var{R1}] =} qrdelete (@var{Q}, @var{R}, @var{j}, @var{orient})\n\
 Given a QR@tie{}factorization of a real or complex matrix\n\
 @w{@var{A} = @var{Q}*@var{R}}, @var{Q}@tie{}unitary and\n\
 @var{R}@tie{}upper trapezoidal, return the QR@tie{}factorization of\n\
@@ -1388,7 +1388,7 @@
 
 DEFUN_DLD (qrshift, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {[@var{Q1}, @var{R1}] =} qrshift (@var{Q}, @var{R}, @var{i}, @var{j})\n\
+@deftypefn {} {[@var{Q1}, @var{R1}] =} qrshift (@var{Q}, @var{R}, @var{i}, @var{j})\n\
 Given a QR@tie{}factorization of a real or complex matrix\n\
 @w{@var{A} = @var{Q}*@var{R}}, @var{Q}@tie{}unitary and\n\
 @var{R}@tie{}upper trapezoidal, return the QR@tie{}factorization\n\
--- a/libinterp/dldfcn/symbfact.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/symbfact.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -41,9 +41,9 @@
 
 DEFUN_DLD (symbfact, args, nargout,
            "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {[@var{count}, @var{h}, @var{parent}, @var{post}, @var{r}] =} symbfact (@var{S})\n\
-@deftypefnx {Loadable Function} {[@dots{}] =} symbfact (@var{S}, @var{typ})\n\
-@deftypefnx {Loadable Function} {[@dots{}] =} symbfact (@var{S}, @var{typ}, @var{mode})\n\
+@deftypefn  {} {[@var{count}, @var{h}, @var{parent}, @var{post}, @var{r}] =} symbfact (@var{S})\n\
+@deftypefnx {} {[@dots{}] =} symbfact (@var{S}, @var{typ})\n\
+@deftypefnx {} {[@dots{}] =} symbfact (@var{S}, @var{typ}, @var{mode})\n\
 \n\
 Perform a symbolic factorization analysis on the sparse matrix @var{S}.\n\
 \n\
--- a/libinterp/dldfcn/symrcm.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/dldfcn/symrcm.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -413,7 +413,7 @@
 // An implementation of the Cuthill-McKee algorithm.
 DEFUN_DLD (symrcm, args, ,
            "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {@var{p} =} symrcm (@var{S})\n\
+@deftypefn {} {@var{p} =} symrcm (@var{S})\n\
 Return the symmetric reverse @nospell{Cuthill-McKee} permutation of @var{S}.\n\
 \n\
 @var{p} is a permutation vector such that\n\
--- a/libinterp/octave-value/ov-base.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-base.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -1689,9 +1689,9 @@
 
 DEFUN (sparse_auto_mutate, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} sparse_auto_mutate ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} sparse_auto_mutate (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} sparse_auto_mutate (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} sparse_auto_mutate ()\n\
+@deftypefnx {} {@var{old_val} =} sparse_auto_mutate (@var{new_val})\n\
+@deftypefnx {} {} sparse_auto_mutate (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether Octave will\n\
 automatically mutate sparse matrices to full matrices to save memory.\n\
 \n\
--- a/libinterp/octave-value/ov-bool-mat.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-bool-mat.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -558,7 +558,7 @@
 
 DEFUN (logical, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} logical (@var{x})\n\
+@deftypefn {} {} logical (@var{x})\n\
 Convert the numeric object @var{x} to logical type.\n\
 \n\
 Any nonzero values will be converted to true (1) while zero values will be\n\
--- a/libinterp/octave-value/ov-cell.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-cell.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -1232,7 +1232,7 @@
 
 DEFUN (iscell, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} iscell (@var{x})\n\
+@deftypefn {} {} iscell (@var{x})\n\
 Return true if @var{x} is a cell array object.\n\
 @seealso{ismatrix, isstruct, iscellstr, isa}\n\
 @end deftypefn")
@@ -1245,10 +1245,10 @@
 
 DEFUN (cell, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} cell (@var{n})\n\
-@deftypefnx {Built-in Function} {} cell (@var{m}, @var{n})\n\
-@deftypefnx {Built-in Function} {} cell (@var{m}, @var{n}, @var{k}, @dots{})\n\
-@deftypefnx {Built-in Function} {} cell ([@var{m} @var{n} @dots{}])\n\
+@deftypefn  {} {} cell (@var{n})\n\
+@deftypefnx {} {} cell (@var{m}, @var{n})\n\
+@deftypefnx {} {} cell (@var{m}, @var{n}, @var{k}, @dots{})\n\
+@deftypefnx {} {} cell ([@var{m} @var{n} @dots{}])\n\
 Create a new cell array object.\n\
 \n\
 If invoked with a single scalar integer argument, return a square\n\
@@ -1296,7 +1296,7 @@
 
 DEFUN (iscellstr, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} iscellstr (@var{cell})\n\
+@deftypefn {} {} iscellstr (@var{cell})\n\
 Return true if every element of the cell array @var{cell} is a character\n\
 string.\n\
 @seealso{ischar}\n\
@@ -1315,7 +1315,7 @@
 
 DEFUN (cellstr, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{cstr} =} cellstr (@var{strmat})\n\
+@deftypefn {} {@var{cstr} =} cellstr (@var{strmat})\n\
 Create a new cell array object from the elements of the string array\n\
 @var{strmat}.\n\
 \n\
@@ -1349,7 +1349,7 @@
 
 DEFUN (struct2cell, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{c} =} struct2cell (@var{s})\n\
+@deftypefn {} {@var{c} =} struct2cell (@var{s})\n\
 Create a new cell array from the objects stored in the struct object.\n\
 \n\
 If @var{f} is the number of fields in the structure, the resulting cell\n\
--- a/libinterp/octave-value/ov-class.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-class.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -1759,9 +1759,9 @@
 
 DEFUN (class, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Function File} {@var{classname} =} class (@var{obj})\n\
-@deftypefnx {Function File} {} class (@var{s}, @var{id})\n\
-@deftypefnx {Function File} {} class (@var{s}, @var{id}, @var{p}, @dots{})\n\
+@deftypefn  {} {@var{classname} =} class (@var{obj})\n\
+@deftypefnx {} {} class (@var{s}, @var{id})\n\
+@deftypefnx {} {} class (@var{s}, @var{id}, @var{p}, @dots{})\n\
 Return the class of the object @var{obj}, or create a class with\n\
 fields from structure @var{s} and name (string) @var{id}.\n\
 \n\
@@ -1840,7 +1840,7 @@
 
 DEFUN (isa, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Function File} {} isa (@var{obj}, @var{classname})\n\
+@deftypefn {} {} isa (@var{obj}, @var{classname})\n\
 Return true if @var{obj} is an object from the class @var{classname}.\n\
 \n\
 @var{classname} may also be one of the following class categories:\n\
@@ -1949,7 +1949,7 @@
 
 DEFUN (__parent_classes__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __parent_classes__ (@var{x})\n\
+@deftypefn {} {} __parent_classes__ (@var{x})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -1968,7 +1968,7 @@
 
 DEFUN (isobject, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isobject (@var{x})\n\
+@deftypefn {} {} isobject (@var{x})\n\
 Return true if @var{x} is a class object.\n\
 @seealso{class, typeinfo, isa, ismethod, isprop}\n\
 @end deftypefn")
@@ -1981,8 +1981,8 @@
 
 DEFUN (ismethod, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} ismethod (@var{obj}, @var{method})\n\
-@deftypefnx {Built-in Function} {} ismethod (@var{clsname}, @var{method})\n\
+@deftypefn  {} {} ismethod (@var{obj}, @var{method})\n\
+@deftypefnx {} {} ismethod (@var{clsname}, @var{method})\n\
 Return true if the string @var{method} is a valid method of the object\n\
 @var{obj} or of the class @var{clsname}.\n\
 @seealso{isprop, isobject}\n\
@@ -2016,8 +2016,8 @@
 
 DEFUN (__methods__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} __methods__ (@var{x})\n\
-@deftypefnx {Built-in Function} {} __methods__ (\"classname\")\n\
+@deftypefn  {} {} __methods__ (@var{x})\n\
+@deftypefnx {} {} __methods__ (\"classname\")\n\
 Internal function.\n\
 \n\
 Implements @code{methods} for Octave class objects and classnames.\n\
@@ -2071,7 +2071,7 @@
 
 DEFUN (superiorto, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} superiorto (@var{class_name}, @dots{})\n\
+@deftypefn {} {} superiorto (@var{class_name}, @dots{})\n\
 When called from a class constructor, mark the object currently\n\
 constructed as having a higher precedence than @var{class_name}.\n\
 \n\
@@ -2112,7 +2112,7 @@
 
 DEFUN (inferiorto, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} inferiorto (@var{class_name}, @dots{})\n\
+@deftypefn {} {} inferiorto (@var{class_name}, @dots{})\n\
 When called from a class constructor, mark the object currently\n\
 constructed as having a lower precedence than @var{class_name}.\n\
 \n\
--- a/libinterp/octave-value/ov-classdef.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-classdef.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -3818,7 +3818,7 @@
 
 DEFUN (__superclass_reference__, args, /* nargout */,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __superclass_reference__ ()\n\
+@deftypefn {} {} __superclass_reference__ ()\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -3827,7 +3827,7 @@
 
 DEFUN (__meta_class_query__, args, /* nargout */,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __meta_class_query__ ()\n\
+@deftypefn {} {} __meta_class_query__ ()\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -3849,7 +3849,7 @@
 
 DEFUN (metaclass, args, /* nargout */,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} metaclass (obj)\n\
+@deftypefn {} {} metaclass (obj)\n\
 Returns the meta.class object corresponding to the class of @var{obj}.\n\
 @end deftypefn")
 {
--- a/libinterp/octave-value/ov-fcn-handle.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-fcn-handle.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -1669,7 +1669,7 @@
 
 DEFUN (functions, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{s} =} functions (@var{fcn_handle})\n\
+@deftypefn {} {@var{s} =} functions (@var{fcn_handle})\n\
 Return a structure containing information about the function handle\n\
 @var{fcn_handle}.\n\
 \n\
@@ -1800,7 +1800,7 @@
 
 DEFUN (func2str, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} func2str (@var{fcn_handle})\n\
+@deftypefn {} {} func2str (@var{fcn_handle})\n\
 Return a string containing the name of the function referenced by the\n\
 function handle @var{fcn_handle}.\n\
 @seealso{str2func, functions}\n\
@@ -1836,8 +1836,8 @@
 
 DEFUN (str2func, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} str2func (@var{fcn_name})\n\
-@deftypefnx {Built-in Function} {} str2func (@var{fcn_name}, \"global\")\n\
+@deftypefn  {} {} str2func (@var{fcn_name})\n\
+@deftypefnx {} {} str2func (@var{fcn_name}, \"global\")\n\
 Return a function handle constructed from the string @var{fcn_name}.\n\
 \n\
 If the optional @qcode{\"global\"} argument is passed, locally visible\n\
@@ -1903,7 +1903,7 @@
 
 DEFUN (is_function_handle, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} is_function_handle (@var{x})\n\
+@deftypefn {} {} is_function_handle (@var{x})\n\
 Return true if @var{x} is a function handle.\n\
 @seealso{isa, typeinfo, class, functions}\n\
 @end deftypefn")
--- a/libinterp/octave-value/ov-fcn-inline.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-fcn-inline.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -649,9 +649,9 @@
 
 DEFUNX ("inline", Finline, args, ,
         "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} inline (@var{str})\n\
-@deftypefnx {Built-in Function} {} inline (@var{str}, @var{arg1}, @dots{})\n\
-@deftypefnx {Built-in Function} {} inline (@var{str}, @var{n})\n\
+@deftypefn  {} {} inline (@var{str})\n\
+@deftypefnx {} {} inline (@var{str}, @var{arg1}, @dots{})\n\
+@deftypefnx {} {} inline (@var{str}, @var{n})\n\
 Create an inline function from the character string @var{str}.\n\
 \n\
 If called with a single argument, the arguments of the generated function\n\
@@ -839,7 +839,7 @@
 
 DEFUN (formula, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} formula (@var{fun})\n\
+@deftypefn {} {} formula (@var{fun})\n\
 Return a character string representing the inline function @var{fun}.\n\
 \n\
 Note that @code{char (@var{fun})} is equivalent to\n\
@@ -874,7 +874,7 @@
 
 DEFUN (argnames, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} argnames (@var{fun})\n\
+@deftypefn {} {} argnames (@var{fun})\n\
 Return a cell array of character strings containing the names of the\n\
 arguments of the inline function @var{fun}.\n\
 @seealso{inline, formula, vectorize}\n\
@@ -917,7 +917,7 @@
 
 DEFUN (vectorize, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} vectorize (@var{fun})\n\
+@deftypefn {} {} vectorize (@var{fun})\n\
 Create a vectorized version of the inline function @var{fun} by replacing\n\
 all occurrences of @code{*}, @code{/}, etc., with @code{.*}, @code{./}, etc.\n\
 \n\
--- a/libinterp/octave-value/ov-flt-re-mat.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-flt-re-mat.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -855,7 +855,7 @@
 
 DEFUN (single, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} single (@var{x})\n\
+@deftypefn {} {} single (@var{x})\n\
 Convert @var{x} to single precision type.\n\
 @seealso{double}\n\
 @end deftypefn")
--- a/libinterp/octave-value/ov-int16.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-int16.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -74,7 +74,7 @@
 
 DEFUN (int16, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} int16 (@var{x})\n\
+@deftypefn {} {} int16 (@var{x})\n\
 Convert @var{x} to 16-bit integer type.\n\
 @seealso{int8, uint8, uint16, int32, uint32, int64, uint64}\n\
 @end deftypefn")
--- a/libinterp/octave-value/ov-int32.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-int32.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -74,7 +74,7 @@
 
 DEFUN (int32, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} int32 (@var{x})\n\
+@deftypefn {} {} int32 (@var{x})\n\
 Convert @var{x} to 32-bit integer type.\n\
 @seealso{int8, uint8, int16, uint16, uint32, int64, uint64}\n\
 @end deftypefn")
--- a/libinterp/octave-value/ov-int64.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-int64.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -74,7 +74,7 @@
 
 DEFUN (int64, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} int64 (@var{x})\n\
+@deftypefn {} {} int64 (@var{x})\n\
 Convert @var{x} to 64-bit integer type.\n\
 @seealso{int8, uint8, int16, uint16, int32, uint32, uint64}\n\
 @end deftypefn")
--- a/libinterp/octave-value/ov-int8.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-int8.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -74,7 +74,7 @@
 
 DEFUN (int8, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} int8 (@var{x})\n\
+@deftypefn {} {} int8 (@var{x})\n\
 Convert @var{x} to 8-bit integer type.\n\
 @seealso{uint8, int16, uint16, int32, uint32, int64, uint64}\n\
 @end deftypefn")
--- a/libinterp/octave-value/ov-java.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-java.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -2070,7 +2070,7 @@
 
 DEFUN (__java_init__, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __java_init__ ()\n\
+@deftypefn {} {} __java_init__ ()\n\
 Internal function used @strong{only} when debugging Java interface.\n\
 \n\
 Function will directly call initialize_java() to create an instance of a JVM.\n\
@@ -2095,7 +2095,7 @@
 
 DEFUN (__java_exit__, , ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} __java_exit__ ()\n\
+@deftypefn {} {} __java_exit__ ()\n\
 Internal function used @strong{only} when debugging Java interface.\n\
 \n\
 Function will directly call terminate_jvm() to destroy the current JVM\n\
@@ -2113,8 +2113,8 @@
 
 DEFUN (javaObject, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{jobj} =} javaObject (@var{classname})\n\
-@deftypefnx {Built-in Function} {@var{jobj} =} javaObject (@var{classname}, @var{arg1}, @dots{})\n\
+@deftypefn  {} {@var{jobj} =} javaObject (@var{classname})\n\
+@deftypefnx {} {@var{jobj} =} javaObject (@var{classname}, @var{arg1}, @dots{})\n\
 Create a Java object of class @var{classsname}, by calling the class\n\
 constructor with the arguments @var{arg1}, @dots{}\n\
 \n\
@@ -2173,8 +2173,8 @@
 
 DEFUN (javaMethod, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{ret} =} javaMethod (@var{methodname}, @var{obj})\n\
-@deftypefnx {Built-in Function} {@var{ret} =} javaMethod (@var{methodname}, @var{obj}, @var{arg1}, @dots{})\n\
+@deftypefn  {} {@var{ret} =} javaMethod (@var{methodname}, @var{obj})\n\
+@deftypefnx {} {@var{ret} =} javaMethod (@var{methodname}, @var{obj}, @var{arg1}, @dots{})\n\
 Invoke the method @var{methodname} on the Java object @var{obj} with the\n\
 arguments @var{arg1}, @dots{}.\n\
 \n\
@@ -2250,7 +2250,7 @@
 
 DEFUN (__java_get__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{val} =} __java_get__ (@var{obj}, @var{name})\n\
+@deftypefn {} {@var{val} =} __java_get__ (@var{obj}, @var{name})\n\
 Get the value of the field @var{name} of the Java object @var{obj}.\n\
 \n\
 For static fields, @var{obj} can be a string representing the fully qualified\n\
@@ -2312,7 +2312,7 @@
 
 DEFUN (__java_set__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{obj} =} __java_set__ (@var{obj}, @var{name}, @var{val})\n\
+@deftypefn {} {@var{obj} =} __java_set__ (@var{obj}, @var{name}, @var{val})\n\
 Set the value of the field @var{name} of the Java object @var{obj} to\n\
 @var{val}.\n\
 \n\
@@ -2375,7 +2375,7 @@
 
 DEFUN (java2mat, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} java2mat (@var{javaobj})\n\
+@deftypefn {} {} java2mat (@var{javaobj})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -2409,9 +2409,9 @@
 
 DEFUN (java_matrix_autoconversion, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} java_matrix_autoconversion ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} java_matrix_autoconversion (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} java_matrix_autoconversion (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} java_matrix_autoconversion ()\n\
+@deftypefnx {} {@var{old_val} =} java_matrix_autoconversion (@var{new_val})\n\
+@deftypefnx {} {} java_matrix_autoconversion (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether Java arrays are\n\
 automatically converted to Octave matrices.\n\
 \n\
@@ -2439,9 +2439,9 @@
 
 DEFUN (java_unsigned_autoconversion, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} java_unsigned_autoconversion ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} java_unsigned_autoconversion (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} java_unsigned_autoconversion (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} java_unsigned_autoconversion ()\n\
+@deftypefnx {} {@var{old_val} =} java_unsigned_autoconversion (@var{new_val})\n\
+@deftypefnx {} {} java_unsigned_autoconversion (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls how integer classes are\n\
 converted when @code{java_matrix_autoconversion} is enabled.\n\
 \n\
@@ -2464,9 +2464,9 @@
 
 DEFUN (debug_java, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} debug_java ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} debug_java (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} debug_java (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} debug_java ()\n\
+@deftypefnx {} {@var{old_val} =} debug_java (@var{new_val})\n\
+@deftypefnx {} {} debug_java (@var{new_val}, \"local\")\n\
 Query or set the internal variable that determines whether extra debugging\n\
 information regarding the initialization of the JVM and any Java exceptions\n\
 is printed.\n\
@@ -2489,7 +2489,7 @@
 // test for the presence of a Java object without having Java installed.
 DEFUN (isjava, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isjava (@var{x})\n\
+@deftypefn {} {} isjava (@var{x})\n\
 Return true if @var{x} is a Java object.\n\
 @seealso{class, typeinfo, isa, javaObject}\n\
 @end deftypefn")
--- a/libinterp/octave-value/ov-null-mat.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-null-mat.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -95,7 +95,7 @@
 
 DEFUN (isnull, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isnull (@var{x})\n\
+@deftypefn {} {} isnull (@var{x})\n\
 Return true if @var{x} is a special null matrix, string, or single quoted\n\
 string.\n\
 \n\
--- a/libinterp/octave-value/ov-oncleanup.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-oncleanup.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -176,7 +176,7 @@
 
 DEFUN (onCleanup, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {@var{obj} =} onCleanup (@var{function})\n\
+@deftypefn {} {@var{obj} =} onCleanup (@var{function})\n\
 Create a special object that executes a given function upon destruction.\n\
 \n\
 If the object is copied to multiple variables (or cell or struct array\n\
--- a/libinterp/octave-value/ov-range.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-range.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -708,9 +708,9 @@
 
 DEFUN (allow_noninteger_range_as_index, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} allow_noninteger_range_as_index ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} allow_noninteger_range_as_index (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} allow_noninteger_range_as_index (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} allow_noninteger_range_as_index ()\n\
+@deftypefnx {} {@var{old_val} =} allow_noninteger_range_as_index (@var{new_val})\n\
+@deftypefnx {} {} allow_noninteger_range_as_index (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether non-integer\n\
 ranges are allowed as indices.\n\
 \n\
--- a/libinterp/octave-value/ov-re-mat.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-re-mat.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -978,7 +978,7 @@
 
 DEFUN (double, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} double (@var{x})\n\
+@deftypefn {} {} double (@var{x})\n\
 Convert @var{x} to double precision type.\n\
 @seealso{single}\n\
 @end deftypefn")
--- a/libinterp/octave-value/ov-struct.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-struct.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -1656,9 +1656,9 @@
 
 DEFUN (struct, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{s} =} struct ()\n\
-@deftypefnx {Built-in Function} {@var{s} =} struct (@var{field1}, @var{value1}, @var{field2}, @var{value2}, @dots{})\n\
-@deftypefnx {Built-in Function} {@var{s} =} struct (@var{obj})\n\
+@deftypefn  {} {@var{s} =} struct ()\n\
+@deftypefnx {} {@var{s} =} struct (@var{field1}, @var{value1}, @var{field2}, @var{value2}, @dots{})\n\
+@deftypefnx {} {@var{s} =} struct (@var{obj})\n\
 \n\
 Create a scalar or array structure and initialize its values.\n\
 \n\
@@ -1846,7 +1846,7 @@
 
 DEFUN (isstruct, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isstruct (@var{x})\n\
+@deftypefn {} {} isstruct (@var{x})\n\
 Return true if @var{x} is a structure or a structure array.\n\
 @seealso{ismatrix, iscell, isa}\n\
 @end deftypefn")
@@ -1859,8 +1859,8 @@
 
 DEFUN (__fieldnames__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} __fieldnames__ (@var{struct})\n\
-@deftypefnx {Built-in Function} {} __fieldnames__ (@var{obj})\n\
+@deftypefn  {} {} __fieldnames__ (@var{struct})\n\
+@deftypefnx {} {} __fieldnames__ (@var{obj})\n\
 Internal function.\n\
 \n\
 Implements @code{fieldnames()} for structures and Octave objects.\n\
@@ -1886,8 +1886,8 @@
 
 DEFUN (isfield, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} isfield (@var{x}, \"@var{name}\")\n\
-@deftypefnx {Built-in Function} {} isfield (@var{x}, @var{name})\n\
+@deftypefn  {} {} isfield (@var{x}, \"@var{name}\")\n\
+@deftypefnx {} {} isfield (@var{x}, @var{name})\n\
 Return true if the @var{x} is a structure and it includes an element named\n\
 @var{name}.\n\
 \n\
@@ -1943,7 +1943,7 @@
 
 DEFUN (numfields, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} numfields (@var{s})\n\
+@deftypefn {} {} numfields (@var{s})\n\
 Return the number of fields of the structure @var{s}.\n\
 @seealso{fieldnames}\n\
 @end deftypefn")
@@ -1975,8 +1975,8 @@
 
 DEFUN (cell2struct, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} cell2struct (@var{cell}, @var{fields})\n\
-@deftypefnx {Built-in Function} {} cell2struct (@var{cell}, @var{fields}, @var{dim})\n\
+@deftypefn  {} {} cell2struct (@var{cell}, @var{fields})\n\
+@deftypefnx {} {} cell2struct (@var{cell}, @var{fields}, @var{dim})\n\
 Convert @var{cell} to a structure.\n\
 \n\
 The number of fields in @var{fields} must match the number of elements in\n\
@@ -2107,8 +2107,8 @@
 
 DEFUN (rmfield, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{sout} =} rmfield (@var{s}, \"@var{f}\")\n\
-@deftypefnx {Built-in Function} {@var{sout} =} rmfield (@var{s}, @var{f})\n\
+@deftypefn  {} {@var{sout} =} rmfield (@var{s}, \"@var{f}\")\n\
+@deftypefnx {} {@var{sout} =} rmfield (@var{s}, @var{f})\n\
 Return a @emph{copy} of the structure (array) @var{s} with the field @var{f}\n\
 removed.\n\
 \n\
@@ -2160,9 +2160,9 @@
 
 DEFUN (struct_levels_to_print, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} struct_levels_to_print ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} struct_levels_to_print (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} struct_levels_to_print (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} struct_levels_to_print ()\n\
+@deftypefnx {} {@var{old_val} =} struct_levels_to_print (@var{new_val})\n\
+@deftypefnx {} {} struct_levels_to_print (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies the number of\n\
 structure levels to display.\n\
 \n\
@@ -2178,9 +2178,9 @@
 
 DEFUN (print_struct_array_contents, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} print_struct_array_contents ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} print_struct_array_contents (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} print_struct_array_contents (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} print_struct_array_contents ()\n\
+@deftypefnx {} {@var{old_val} =} print_struct_array_contents (@var{new_val})\n\
+@deftypefnx {} {} print_struct_array_contents (@var{new_val}, \"local\")\n\
 Query or set the internal variable that specifies whether to print struct\n\
 array contents.\n\
 \n\
--- a/libinterp/octave-value/ov-typeinfo.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-typeinfo.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -611,8 +611,8 @@
 
 DEFUN (typeinfo, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} typeinfo ()\n\
-@deftypefnx {Built-in Function} {} typeinfo (@var{expr})\n\
+@deftypefn  {} {} typeinfo ()\n\
+@deftypefnx {} {} typeinfo (@var{expr})\n\
 \n\
 Return the type of the expression @var{expr}, as a string.\n\
 \n\
--- a/libinterp/octave-value/ov-uint16.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-uint16.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -74,7 +74,7 @@
 
 DEFUN (uint16, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} uint16 (@var{x})\n\
+@deftypefn {} {} uint16 (@var{x})\n\
 Convert @var{x} to unsigned 16-bit integer type.\n\
 @seealso{int8, uint8, int16, int32, uint32, int64, uint64}\n\
 @end deftypefn")
--- a/libinterp/octave-value/ov-uint32.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-uint32.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -74,7 +74,7 @@
 
 DEFUN (uint32, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} uint32 (@var{x})\n\
+@deftypefn {} {} uint32 (@var{x})\n\
 Convert @var{x} to unsigned 32-bit integer type.\n\
 @seealso{int8, uint8, int16, uint16, int32, int64, uint64}\n\
 @end deftypefn")
--- a/libinterp/octave-value/ov-uint64.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-uint64.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -74,7 +74,7 @@
 
 DEFUN (uint64, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} uint64 (@var{x})\n\
+@deftypefn {} {} uint64 (@var{x})\n\
 Convert @var{x} to unsigned 64-bit integer type.\n\
 @seealso{int8, uint8, int16, uint16, int32, uint32, int64}\n\
 @end deftypefn")
--- a/libinterp/octave-value/ov-uint8.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-uint8.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -74,7 +74,7 @@
 
 DEFUN (uint8, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} uint8 (@var{x})\n\
+@deftypefn {} {} uint8 (@var{x})\n\
 Convert @var{x} to unsigned 8-bit integer type.\n\
 @seealso{int8, int16, uint16, int32, uint32, int64, uint64}\n\
 @end deftypefn")
--- a/libinterp/octave-value/ov-usr-fcn.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov-usr-fcn.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -796,8 +796,8 @@
 
 DEFUN (nargin, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} nargin ()\n\
-@deftypefnx {Built-in Function} {} nargin (@var{fcn})\n\
+@deftypefn  {} {} nargin ()\n\
+@deftypefnx {} {} nargin (@var{fcn})\n\
 Report the number of input arguments to a function.\n\
 \n\
 Called from within a function, return the number of arguments passed to the\n\
@@ -883,8 +883,8 @@
 
 DEFUN (nargout, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} nargout ()\n\
-@deftypefnx {Built-in Function} {} nargout (@var{fcn})\n\
+@deftypefn  {} {} nargout ()\n\
+@deftypefnx {} {} nargout (@var{fcn})\n\
 Report the number of output arguments from a function.\n\
 \n\
 Called from within a function, return the number of values the caller expects\n\
@@ -1020,9 +1020,9 @@
 
 DEFUN (optimize_subsasgn_calls, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} optimize_subsasgn_calls ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} optimize_subsasgn_calls (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} optimize_subsasgn_calls (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} optimize_subsasgn_calls ()\n\
+@deftypefnx {} {@var{old_val} =} optimize_subsasgn_calls (@var{new_val})\n\
+@deftypefnx {} {} optimize_subsasgn_calls (@var{new_val}, \"local\")\n\
 Query or set the internal flag for subsasgn method call optimizations.\n\
 \n\
 If true, Octave will attempt to eliminate the redundant copying when calling\n\
@@ -1058,7 +1058,7 @@
 
 DEFUN (isargout, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isargout (@var{k})\n\
+@deftypefn {} {} isargout (@var{k})\n\
 Within a function, return a logical value indicating whether the argument\n\
 @var{k} will be assigned to a variable on output.\n\
 \n\
--- a/libinterp/octave-value/ov.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave-value/ov.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -2922,7 +2922,7 @@
 
 DEFUN (sizeof, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} sizeof (@var{val})\n\
+@deftypefn {} {} sizeof (@var{val})\n\
 Return the size of @var{val} in bytes.\n\
 @seealso{whos}\n\
 @end deftypefn")
@@ -3008,7 +3008,7 @@
 
 DEFUN (subsref, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} subsref (@var{val}, @var{idx})\n\
+@deftypefn {} {} subsref (@var{val}, @var{idx})\n\
 Perform the subscripted element selection operation according to the\n\
 subscript specified by @var{idx}.\n\
 \n\
@@ -3064,7 +3064,7 @@
 
 DEFUN (subsasgn, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} subsasgn (@var{val}, @var{idx}, @var{rhs})\n\
+@deftypefn {} {} subsasgn (@var{val}, @var{idx}, @var{rhs})\n\
 Perform the subscripted assignment operation according to the subscript\n\
 specified by @var{idx}.\n\
 \n\
@@ -3192,7 +3192,7 @@
 
 DEFUN (is_sq_string, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} is_sq_string (@var{x})\n\
+@deftypefn {} {} is_sq_string (@var{x})\n\
 Return true if @var{x} is a single-quoted character string.\n\
 @seealso{is_dq_string, ischar}\n\
 @end deftypefn")
@@ -3215,7 +3215,7 @@
 
 DEFUN (is_dq_string, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} is_dq_string (@var{x})\n\
+@deftypefn {} {} is_dq_string (@var{x})\n\
 Return true if @var{x} is a double-quoted character string.\n\
 @seealso{is_sq_string, ischar}\n\
 @end deftypefn")
@@ -3238,9 +3238,9 @@
 
 DEFUN (disable_permutation_matrix, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} disable_permutation_matrix ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} disable_permutation_matrix (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} disable_permutation_matrix (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} disable_permutation_matrix ()\n\
+@deftypefnx {} {@var{old_val} =} disable_permutation_matrix (@var{new_val})\n\
+@deftypefnx {} {} disable_permutation_matrix (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether permutation\n\
 matrices are stored in a special space-efficient format.\n\
 \n\
@@ -3268,9 +3268,9 @@
 
 DEFUN (disable_diagonal_matrix, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} disable_diagonal_matrix ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} disable_diagonal_matrix (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} disable_diagonal_matrix (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} disable_diagonal_matrix ()\n\
+@deftypefnx {} {@var{old_val} =} disable_diagonal_matrix (@var{new_val})\n\
+@deftypefnx {} {} disable_diagonal_matrix (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether diagonal\n\
 matrices are stored in a special space-efficient format.\n\
 \n\
@@ -3312,9 +3312,9 @@
 
 DEFUN (disable_range, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} disable_range ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} disable_range (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} disable_range (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} disable_range ()\n\
+@deftypefnx {} {@var{old_val} =} disable_range (@var{new_val})\n\
+@deftypefnx {} {} disable_range (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether ranges are stored\n\
 in a special space-efficient format.\n\
 \n\
--- a/libinterp/octave.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/octave.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -201,7 +201,7 @@
 
 DEFUN (__version_info__, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {retval =} __version_info__ (@var{name}, @var{version}, @var{release}, @var{date})\n\
+@deftypefn {} {retval =} __version_info__ (@var{name}, @var{version}, @var{release}, @var{date})\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
@@ -1010,7 +1010,7 @@
 
 DEFUN (isguirunning, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isguirunning ()\n\
+@deftypefn {} {} isguirunning ()\n\
 Return true if Octave is running in GUI mode and false otherwise.\n\
 @seealso{have_window_system}\n\
 @end deftypefn")
@@ -1032,7 +1032,7 @@
 
 DEFUN (argv, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} argv ()\n\
+@deftypefn {} {} argv ()\n\
 Return the command line arguments passed to Octave.\n\
 \n\
 For example, if you invoked Octave using the command\n\
@@ -1067,7 +1067,7 @@
 
 DEFUN (program_invocation_name, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} program_invocation_name ()\n\
+@deftypefn {} {} program_invocation_name ()\n\
 Return the name that was typed at the shell prompt to run Octave.\n\
 \n\
 If executing a script from the command line (e.g., @code{octave foo.m})\n\
@@ -1094,7 +1094,7 @@
 
 DEFUN (program_name, args, ,
        "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} program_name ()\n\
+@deftypefn {} {} program_name ()\n\
 Return the last component of the value returned by\n\
 @code{program_invocation_name}.\n\
 @seealso{program_invocation_name}\n\
--- a/libinterp/parse-tree/pt-arg-list.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/parse-tree/pt-arg-list.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -128,7 +128,7 @@
 
 DEFCONSTFUN (end, , ,
              "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} end\n\
+@deftypefn {} {} end\n\
 The magic index @qcode{\"end\"} refers to the last valid entry in an indexing\n\
 operation.\n\
 \n\
--- a/libinterp/parse-tree/pt-binop.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/parse-tree/pt-binop.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -269,9 +269,9 @@
 
 DEFUN (do_braindead_shortcircuit_evaluation, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} do_braindead_shortcircuit_evaluation ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} do_braindead_shortcircuit_evaluation (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} do_braindead_shortcircuit_evaluation (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} do_braindead_shortcircuit_evaluation ()\n\
+@deftypefnx {} {@var{old_val} =} do_braindead_shortcircuit_evaluation (@var{new_val})\n\
+@deftypefnx {} {} do_braindead_shortcircuit_evaluation (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether Octave will\n\
 do short-circuit evaluation of @samp{|} and @samp{&} operators inside the\n\
 conditions of if or while statements.\n\
--- a/libinterp/parse-tree/pt-eval.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/parse-tree/pt-eval.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -1193,9 +1193,9 @@
 
 DEFUN (max_recursion_depth, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} max_recursion_depth ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} max_recursion_depth (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} max_recursion_depth (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} max_recursion_depth ()\n\
+@deftypefnx {} {@var{old_val} =} max_recursion_depth (@var{new_val})\n\
+@deftypefnx {} {} max_recursion_depth (@var{new_val}, \"local\")\n\
 Query or set the internal limit on the number of times a function may\n\
 be called recursively.\n\
 \n\
@@ -1224,9 +1224,9 @@
 
 DEFUN (silent_functions, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} silent_functions ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} silent_functions (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} silent_functions (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} silent_functions ()\n\
+@deftypefnx {} {@var{old_val} =} silent_functions (@var{new_val})\n\
+@deftypefnx {} {} silent_functions (@var{new_val}, \"local\")\n\
 Query or set the internal variable that controls whether internal\n\
 output from a function is suppressed.\n\
 \n\
--- a/libinterp/parse-tree/pt-mat.cc	Sat Dec 12 07:31:00 2015 -0800
+++ b/libinterp/parse-tree/pt-mat.cc	Sat Dec 12 07:40:03 2015 -0800
@@ -1346,9 +1346,9 @@
 
 DEFUN (string_fill_char, args, nargout,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {@var{val} =} string_fill_char ()\n\
-@deftypefnx {Built-in Function} {@var{old_val} =} string_fill_char (@var{new_val})\n\
-@deftypefnx {Built-in Function} {} string_fill_char (@var{new_val}, \"local\")\n\
+@deftypefn  {} {@var{val} =} string_fill_char ()\n\
+@deftypefnx {} {@var{old_val} =} string_fill_char (@var{new_val})\n\
+@deftypefnx {} {} string_fill_char (@var{new_val}, \"local\")\n\
 Query or set the internal variable used to pad all rows of a character\n\
 matrix to the same length.\n\
 \n\