[gnumeric] change prefix for function refs, fixes [#656545]



commit 128055fd28ac67c712c90d05481e6310c5d6f336
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Mon Aug 15 12:04:57 2011 -0600

    change prefix for function refs, fixes [#656545]
    
    2011-08-15  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* make-func-list.pl: change prefix for function refs, fixes [#656545]
    
    2011-08-15  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* func.defs: update
    	* functions.xml: update

 doc/C/ChangeLog       |    5 +
 doc/C/func.defs       |   13 +-
 doc/C/functions.xml   | 3828 +++++++++++++++++++++++++------------------------
 doc/ChangeLog         |    4 +
 doc/make-func-list.pl |    4 +-
 5 files changed, 1953 insertions(+), 1901 deletions(-)
---
diff --git a/doc/C/ChangeLog b/doc/C/ChangeLog
index c46afc2..9cd67d4 100644
--- a/doc/C/ChangeLog
+++ b/doc/C/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-15  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* func.defs: update
+	* functions.xml: update
+
 2011-07-31  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* figures/menu-insert-fw.png: new
diff --git a/doc/C/func.defs b/doc/C/func.defs
index 813e287..9155f09 100644
--- a/doc/C/func.defs
+++ b/doc/C/func.defs
@@ -959,7 +959,7 @@ The natural logarithm is not uniquely defined on complex numbers. You may need t
 @SHORTDESC=Modified Bessel function of the first kind of order @{Î} at @{x}
 @SYNTAX=BESSELI(X,Î)
 @ARGUMENTDESCRIPTION= {X}: number
- {Î}: order (any number)
+ {Î}: order (any non-negative number)
 @NOTE=If @{x} or @{Î} are not numeric, #VALUE! is returned. If @{Î} < 0, #NUM! is returned.
 @EXCEL=This function is Excel compatible if only integer orders @{Î} are used.
 @SEEALSO=BESSELJ,BESSELK,BESSELY
@@ -979,7 +979,7 @@ The natural logarithm is not uniquely defined on complex numbers. You may need t
 @SHORTDESC=Modified Bessel function of the second kind of order @{Î} at @{x}
 @SYNTAX=BESSELK(X,Î)
 @ARGUMENTDESCRIPTION= {X}: number
- {Î}: order (any number)
+ {Î}: order (any non-negative number)
 @NOTE=If @{x} or @{Î} are not numeric, #VALUE! is returned. If @{Î} < 0, #NUM! is returned.
 @EXCEL=This function is Excel compatible if only integer orders @{Î} are used.
 @SEEALSO=BESSELI,BESSELJ,BESSELY
@@ -1381,6 +1381,14 @@ The depreciation coefficient used is:
 @SEEALSO=AMORDEGRC
 
 @CATEGORY=Finance
+ FUNCTION=ATL_LAST
+ SHORTDESC=sample real-time data source
+ SYNTAX=ATL_LAST(tag)
+ ARGUMENTDESCRIPTION=@{tag}: tag to watch
+ DESCRIPTION=ATL_LAST is a sample implementation of a real time data source.  It takes a string tag and monitors the named pipe ~/atl for changes to the value of that tag.
+ NOTE=This is not intended to be generally enabled and is OFF by default.
+
+ CATEGORY=Finance
 @FUNCTION=COUPDAYBS
 @SHORTDESC=number of days from coupon period to settlement
 @SYNTAX=COUPDAYBS(settlement,maturity,frequency,basis,eom)
@@ -3698,6 +3706,7 @@ If @{d} is less than zero, @{x} is rounded away from 0 to the left of the decima
 @ARGUMENTDESCRIPTION= {range}: cell area
 @{criteria}: condition for a cell to be summed
 @{actual_range}: cell area, defaults to @{range}
+ NOTE=If the @{actual_range} has a size that differs from the size of @{range}, @{actual_range} is resized (retaining the top-left corner) to match the size of @{range}.
 @EXCEL=This function is Excel compatible.
 @SEEALSO=SUM,COUNTIF
 
diff --git a/doc/C/functions.xml b/doc/C/functions.xml
index 95acc18..ed8697c 100644
--- a/doc/C/functions.xml
+++ b/doc/C/functions.xml
@@ -9,7 +9,7 @@
   </para>
   <sect1 id="CATEGORY_Bitwise_Operations">
     <title>Bitwise Operations</title>
-    <refentry id="gnumeric-BITAND">
+    <refentry id="gnumeric-function-BITAND">
       <refmeta>
         <refentrytitle>
           <function>BITAND</function>
@@ -37,12 +37,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BITOR"><function>BITOR</function></link>,
-        <link linkend="gnumeric-BITXOR"><function>BITXOR</function></link>.
+        <para><link linkend="gnumeric-function-BITOR"><function>BITOR</function></link>,
+        <link linkend="gnumeric-function-BITXOR"><function>BITXOR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BITLSHIFT">
+    <refentry id="gnumeric-function-BITLSHIFT">
       <refmeta>
         <refentrytitle>
           <function>BITLSHIFT</function>
@@ -74,11 +74,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BITRSHIFT"><function>BITRSHIFT</function></link>.
+        <para><link linkend="gnumeric-function-BITRSHIFT"><function>BITRSHIFT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BITOR">
+    <refentry id="gnumeric-function-BITOR">
       <refmeta>
         <refentrytitle>
           <function>BITOR</function>
@@ -106,12 +106,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BITXOR"><function>BITXOR</function></link>,
-        <link linkend="gnumeric-BITAND"><function>BITAND</function></link>.
+        <para><link linkend="gnumeric-function-BITXOR"><function>BITXOR</function></link>,
+        <link linkend="gnumeric-function-BITAND"><function>BITAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BITRSHIFT">
+    <refentry id="gnumeric-function-BITRSHIFT">
       <refmeta>
         <refentrytitle>
           <function>BITRSHIFT</function>
@@ -143,11 +143,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BITLSHIFT"><function>BITLSHIFT</function></link>.
+        <para><link linkend="gnumeric-function-BITLSHIFT"><function>BITLSHIFT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BITXOR">
+    <refentry id="gnumeric-function-BITXOR">
       <refmeta>
         <refentrytitle>
           <function>BITXOR</function>
@@ -175,15 +175,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BITOR"><function>BITOR</function></link>,
-        <link linkend="gnumeric-BITAND"><function>BITAND</function></link>.
+        <para><link linkend="gnumeric-function-BITOR"><function>BITOR</function></link>,
+        <link linkend="gnumeric-function-BITAND"><function>BITAND</function></link>.
       </para>
       </refsect1>
     </refentry>
   </sect1>
   <sect1 id="CATEGORY_Complex">
     <title>Complex</title>
-    <refentry id="gnumeric-COMPLEX">
+    <refentry id="gnumeric-function-COMPLEX">
       <refmeta>
         <refentrytitle>
           <function>COMPLEX</function>
@@ -215,7 +215,7 @@
         <para>This function is Excel compatible.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMABS">
+    <refentry id="gnumeric-function-IMABS">
       <refmeta>
         <refentrytitle>
           <function>IMABS</function>
@@ -246,12 +246,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMAGINARY"><function>IMAGINARY</function></link>,
-        <link linkend="gnumeric-IMREAL"><function>IMREAL</function></link>.
+        <para><link linkend="gnumeric-function-IMAGINARY"><function>IMAGINARY</function></link>,
+        <link linkend="gnumeric-function-IMREAL"><function>IMREAL</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMAGINARY">
+    <refentry id="gnumeric-function-IMAGINARY">
       <refmeta>
         <refentrytitle>
           <function>IMAGINARY</function>
@@ -282,11 +282,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMREAL"><function>IMREAL</function></link>.
+        <para><link linkend="gnumeric-function-IMREAL"><function>IMREAL</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMARCCOS">
+    <refentry id="gnumeric-function-IMARCCOS">
       <refmeta>
         <refentrytitle>
           <function>IMARCCOS</function>
@@ -317,12 +317,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMARCSIN"><function>IMARCSIN</function></link>,
-        <link linkend="gnumeric-IMARCTAN"><function>IMARCTAN</function></link>.
+        <para><link linkend="gnumeric-function-IMARCSIN"><function>IMARCSIN</function></link>,
+        <link linkend="gnumeric-function-IMARCTAN"><function>IMARCTAN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMARCCOSH">
+    <refentry id="gnumeric-function-IMARCCOSH">
       <refmeta>
         <refentrytitle>
           <function>IMARCCOSH</function>
@@ -353,12 +353,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMARCSINH"><function>IMARCSINH</function></link>,
-        <link linkend="gnumeric-IMARCTANH"><function>IMARCTANH</function></link>.
+        <para><link linkend="gnumeric-function-IMARCSINH"><function>IMARCSINH</function></link>,
+        <link linkend="gnumeric-function-IMARCTANH"><function>IMARCTANH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMARCCOT">
+    <refentry id="gnumeric-function-IMARCCOT">
       <refmeta>
         <refentrytitle>
           <function>IMARCCOT</function>
@@ -385,12 +385,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMARCSEC"><function>IMARCSEC</function></link>,
-        <link linkend="gnumeric-IMARCCSC"><function>IMARCCSC</function></link>.
+        <para><link linkend="gnumeric-function-IMARCSEC"><function>IMARCSEC</function></link>,
+        <link linkend="gnumeric-function-IMARCCSC"><function>IMARCCSC</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMARCCOTH">
+    <refentry id="gnumeric-function-IMARCCOTH">
       <refmeta>
         <refentrytitle>
           <function>IMARCCOTH</function>
@@ -417,12 +417,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMARCSECH"><function>IMARCSECH</function></link>,
-        <link linkend="gnumeric-IMARCCSCH"><function>IMARCCSCH</function></link>.
+        <para><link linkend="gnumeric-function-IMARCSECH"><function>IMARCSECH</function></link>,
+        <link linkend="gnumeric-function-IMARCCSCH"><function>IMARCCSCH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMARCCSC">
+    <refentry id="gnumeric-function-IMARCCSC">
       <refmeta>
         <refentrytitle>
           <function>IMARCCSC</function>
@@ -449,12 +449,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMARCSEC"><function>IMARCSEC</function></link>,
-        <link linkend="gnumeric-IMARCCOT"><function>IMARCCOT</function></link>.
+        <para><link linkend="gnumeric-function-IMARCSEC"><function>IMARCSEC</function></link>,
+        <link linkend="gnumeric-function-IMARCCOT"><function>IMARCCOT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMARCCSCH">
+    <refentry id="gnumeric-function-IMARCCSCH">
       <refmeta>
         <refentrytitle>
           <function>IMARCCSCH</function>
@@ -481,12 +481,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMARCSECH"><function>IMARCSECH</function></link>,
-        <link linkend="gnumeric-IMARCCOTH"><function>IMARCCOTH</function></link>.
+        <para><link linkend="gnumeric-function-IMARCSECH"><function>IMARCSECH</function></link>,
+        <link linkend="gnumeric-function-IMARCCOTH"><function>IMARCCOTH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMARCSEC">
+    <refentry id="gnumeric-function-IMARCSEC">
       <refmeta>
         <refentrytitle>
           <function>IMARCSEC</function>
@@ -513,12 +513,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMARCCSC"><function>IMARCCSC</function></link>,
-        <link linkend="gnumeric-IMARCCOT"><function>IMARCCOT</function></link>.
+        <para><link linkend="gnumeric-function-IMARCCSC"><function>IMARCCSC</function></link>,
+        <link linkend="gnumeric-function-IMARCCOT"><function>IMARCCOT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMARCSECH">
+    <refentry id="gnumeric-function-IMARCSECH">
       <refmeta>
         <refentrytitle>
           <function>IMARCSECH</function>
@@ -545,12 +545,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMARCCSCH"><function>IMARCCSCH</function></link>,
-        <link linkend="gnumeric-IMARCCOTH"><function>IMARCCOTH</function></link>.
+        <para><link linkend="gnumeric-function-IMARCCSCH"><function>IMARCCSCH</function></link>,
+        <link linkend="gnumeric-function-IMARCCOTH"><function>IMARCCOTH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMARCSIN">
+    <refentry id="gnumeric-function-IMARCSIN">
       <refmeta>
         <refentrytitle>
           <function>IMARCSIN</function>
@@ -581,12 +581,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMARCCOS"><function>IMARCCOS</function></link>,
-        <link linkend="gnumeric-IMARCTAN"><function>IMARCTAN</function></link>.
+        <para><link linkend="gnumeric-function-IMARCCOS"><function>IMARCCOS</function></link>,
+        <link linkend="gnumeric-function-IMARCTAN"><function>IMARCTAN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMARCSINH">
+    <refentry id="gnumeric-function-IMARCSINH">
       <refmeta>
         <refentrytitle>
           <function>IMARCSINH</function>
@@ -617,12 +617,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMARCCOSH"><function>IMARCCOSH</function></link>,
-        <link linkend="gnumeric-IMARCTANH"><function>IMARCTANH</function></link>.
+        <para><link linkend="gnumeric-function-IMARCCOSH"><function>IMARCCOSH</function></link>,
+        <link linkend="gnumeric-function-IMARCTANH"><function>IMARCTANH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMARCTAN">
+    <refentry id="gnumeric-function-IMARCTAN">
       <refmeta>
         <refentrytitle>
           <function>IMARCTAN</function>
@@ -653,12 +653,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMARCSIN"><function>IMARCSIN</function></link>,
-        <link linkend="gnumeric-IMARCCOS"><function>IMARCCOS</function></link>.
+        <para><link linkend="gnumeric-function-IMARCSIN"><function>IMARCSIN</function></link>,
+        <link linkend="gnumeric-function-IMARCCOS"><function>IMARCCOS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMARCTANH">
+    <refentry id="gnumeric-function-IMARCTANH">
       <refmeta>
         <refentrytitle>
           <function>IMARCTANH</function>
@@ -689,12 +689,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMARCSINH"><function>IMARCSINH</function></link>,
-        <link linkend="gnumeric-IMARCCOSH"><function>IMARCCOSH</function></link>.
+        <para><link linkend="gnumeric-function-IMARCSINH"><function>IMARCSINH</function></link>,
+        <link linkend="gnumeric-function-IMARCCOSH"><function>IMARCCOSH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMARGUMENT">
+    <refentry id="gnumeric-function-IMARGUMENT">
       <refmeta>
         <refentrytitle>
           <function>IMARGUMENT</function>
@@ -728,7 +728,7 @@
         <para>This function is Excel compatible.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMCONJUGATE">
+    <refentry id="gnumeric-function-IMCONJUGATE">
       <refmeta>
         <refentrytitle>
           <function>IMCONJUGATE</function>
@@ -759,12 +759,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMAGINARY"><function>IMAGINARY</function></link>,
-        <link linkend="gnumeric-IMREAL"><function>IMREAL</function></link>.
+        <para><link linkend="gnumeric-function-IMAGINARY"><function>IMAGINARY</function></link>,
+        <link linkend="gnumeric-function-IMREAL"><function>IMREAL</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMCOS">
+    <refentry id="gnumeric-function-IMCOS">
       <refmeta>
         <refentrytitle>
           <function>IMCOS</function>
@@ -795,12 +795,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMSIN"><function>IMSIN</function></link>,
-        <link linkend="gnumeric-IMTAN"><function>IMTAN</function></link>.
+        <para><link linkend="gnumeric-function-IMSIN"><function>IMSIN</function></link>,
+        <link linkend="gnumeric-function-IMTAN"><function>IMTAN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMCOSH">
+    <refentry id="gnumeric-function-IMCOSH">
       <refmeta>
         <refentrytitle>
           <function>IMCOSH</function>
@@ -827,12 +827,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMSINH"><function>IMSINH</function></link>,
-        <link linkend="gnumeric-IMTANH"><function>IMTANH</function></link>.
+        <para><link linkend="gnumeric-function-IMSINH"><function>IMSINH</function></link>,
+        <link linkend="gnumeric-function-IMTANH"><function>IMTANH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMCOT">
+    <refentry id="gnumeric-function-IMCOT">
       <refmeta>
         <refentrytitle>
           <function>IMCOT</function>
@@ -863,12 +863,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMSEC"><function>IMSEC</function></link>,
-        <link linkend="gnumeric-IMCSC"><function>IMCSC</function></link>.
+        <para><link linkend="gnumeric-function-IMSEC"><function>IMSEC</function></link>,
+        <link linkend="gnumeric-function-IMCSC"><function>IMCSC</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMCOTH">
+    <refentry id="gnumeric-function-IMCOTH">
       <refmeta>
         <refentrytitle>
           <function>IMCOTH</function>
@@ -895,12 +895,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMSECH"><function>IMSECH</function></link>,
-        <link linkend="gnumeric-IMCSCH"><function>IMCSCH</function></link>.
+        <para><link linkend="gnumeric-function-IMSECH"><function>IMSECH</function></link>,
+        <link linkend="gnumeric-function-IMCSCH"><function>IMCSCH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMCSC">
+    <refentry id="gnumeric-function-IMCSC">
       <refmeta>
         <refentrytitle>
           <function>IMCSC</function>
@@ -931,12 +931,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMSEC"><function>IMSEC</function></link>,
-        <link linkend="gnumeric-IMCOT"><function>IMCOT</function></link>.
+        <para><link linkend="gnumeric-function-IMSEC"><function>IMSEC</function></link>,
+        <link linkend="gnumeric-function-IMCOT"><function>IMCOT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMCSCH">
+    <refentry id="gnumeric-function-IMCSCH">
       <refmeta>
         <refentrytitle>
           <function>IMCSCH</function>
@@ -963,12 +963,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMSECH"><function>IMSECH</function></link>,
-        <link linkend="gnumeric-IMCOTH"><function>IMCOTH</function></link>.
+        <para><link linkend="gnumeric-function-IMSECH"><function>IMSECH</function></link>,
+        <link linkend="gnumeric-function-IMCOTH"><function>IMCOTH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMDIV">
+    <refentry id="gnumeric-function-IMDIV">
       <refmeta>
         <refentrytitle>
           <function>IMDIV</function>
@@ -1000,11 +1000,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMPRODUCT"><function>IMPRODUCT</function></link>.
+        <para><link linkend="gnumeric-function-IMPRODUCT"><function>IMPRODUCT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMEXP">
+    <refentry id="gnumeric-function-IMEXP">
       <refmeta>
         <refentrytitle>
           <function>IMEXP</function>
@@ -1035,11 +1035,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMLN"><function>IMLN</function></link>.
+        <para><link linkend="gnumeric-function-IMLN"><function>IMLN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMINV">
+    <refentry id="gnumeric-function-IMINV">
       <refmeta>
         <refentrytitle>
           <function>IMINV</function>
@@ -1065,7 +1065,7 @@
         <para>If <parameter>z</parameter> is not a valid complex number, #VALUE! is returned.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMLN">
+    <refentry id="gnumeric-function-IMLN">
       <refmeta>
         <refentrytitle>
           <function>IMLN</function>
@@ -1101,13 +1101,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMEXP"><function>IMEXP</function></link>,
-        <link linkend="gnumeric-IMLOG2"><function>IMLOG2</function></link>,
-        <link linkend="gnumeric-IMLOG10"><function>IMLOG10</function></link>.
+        <para><link linkend="gnumeric-function-IMEXP"><function>IMEXP</function></link>,
+        <link linkend="gnumeric-function-IMLOG2"><function>IMLOG2</function></link>,
+        <link linkend="gnumeric-function-IMLOG10"><function>IMLOG10</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMLOG10">
+    <refentry id="gnumeric-function-IMLOG10">
       <refmeta>
         <refentrytitle>
           <function>IMLOG10</function>
@@ -1138,12 +1138,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMLN"><function>IMLN</function></link>,
-        <link linkend="gnumeric-IMLOG2"><function>IMLOG2</function></link>.
+        <para><link linkend="gnumeric-function-IMLN"><function>IMLN</function></link>,
+        <link linkend="gnumeric-function-IMLOG2"><function>IMLOG2</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMLOG2">
+    <refentry id="gnumeric-function-IMLOG2">
       <refmeta>
         <refentrytitle>
           <function>IMLOG2</function>
@@ -1174,12 +1174,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMLN"><function>IMLN</function></link>,
-        <link linkend="gnumeric-IMLOG10"><function>IMLOG10</function></link>.
+        <para><link linkend="gnumeric-function-IMLN"><function>IMLN</function></link>,
+        <link linkend="gnumeric-function-IMLOG10"><function>IMLOG10</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMNEG">
+    <refentry id="gnumeric-function-IMNEG">
       <refmeta>
         <refentrytitle>
           <function>IMNEG</function>
@@ -1205,7 +1205,7 @@
         <para>If <parameter>z</parameter> is not a valid complex number, #VALUE! is returned.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMPOWER">
+    <refentry id="gnumeric-function-IMPOWER">
       <refmeta>
         <refentrytitle>
           <function>IMPOWER</function>
@@ -1237,11 +1237,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMSQRT"><function>IMSQRT</function></link>.
+        <para><link linkend="gnumeric-function-IMSQRT"><function>IMSQRT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMPRODUCT">
+    <refentry id="gnumeric-function-IMPRODUCT">
       <refmeta>
         <refentrytitle>
           <function>IMPRODUCT</function>
@@ -1273,11 +1273,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMDIV"><function>IMDIV</function></link>.
+        <para><link linkend="gnumeric-function-IMDIV"><function>IMDIV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMREAL">
+    <refentry id="gnumeric-function-IMREAL">
       <refmeta>
         <refentrytitle>
           <function>IMREAL</function>
@@ -1308,11 +1308,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMAGINARY"><function>IMAGINARY</function></link>.
+        <para><link linkend="gnumeric-function-IMAGINARY"><function>IMAGINARY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMSEC">
+    <refentry id="gnumeric-function-IMSEC">
       <refmeta>
         <refentrytitle>
           <function>IMSEC</function>
@@ -1343,12 +1343,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMCSC"><function>IMCSC</function></link>,
-        <link linkend="gnumeric-IMCOT"><function>IMCOT</function></link>.
+        <para><link linkend="gnumeric-function-IMCSC"><function>IMCSC</function></link>,
+        <link linkend="gnumeric-function-IMCOT"><function>IMCOT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMSECH">
+    <refentry id="gnumeric-function-IMSECH">
       <refmeta>
         <refentrytitle>
           <function>IMSECH</function>
@@ -1375,12 +1375,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMCSCH"><function>IMCSCH</function></link>,
-        <link linkend="gnumeric-IMCOTH"><function>IMCOTH</function></link>.
+        <para><link linkend="gnumeric-function-IMCSCH"><function>IMCSCH</function></link>,
+        <link linkend="gnumeric-function-IMCOTH"><function>IMCOTH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMSIN">
+    <refentry id="gnumeric-function-IMSIN">
       <refmeta>
         <refentrytitle>
           <function>IMSIN</function>
@@ -1411,12 +1411,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMCOS"><function>IMCOS</function></link>,
-        <link linkend="gnumeric-IMTAN"><function>IMTAN</function></link>.
+        <para><link linkend="gnumeric-function-IMCOS"><function>IMCOS</function></link>,
+        <link linkend="gnumeric-function-IMTAN"><function>IMTAN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMSINH">
+    <refentry id="gnumeric-function-IMSINH">
       <refmeta>
         <refentrytitle>
           <function>IMSINH</function>
@@ -1443,12 +1443,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMCOSH"><function>IMCOSH</function></link>,
-        <link linkend="gnumeric-IMTANH"><function>IMTANH</function></link>.
+        <para><link linkend="gnumeric-function-IMCOSH"><function>IMCOSH</function></link>,
+        <link linkend="gnumeric-function-IMTANH"><function>IMTANH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMSQRT">
+    <refentry id="gnumeric-function-IMSQRT">
       <refmeta>
         <refentrytitle>
           <function>IMSQRT</function>
@@ -1479,11 +1479,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMPOWER"><function>IMPOWER</function></link>.
+        <para><link linkend="gnumeric-function-IMPOWER"><function>IMPOWER</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMSUB">
+    <refentry id="gnumeric-function-IMSUB">
       <refmeta>
         <refentrytitle>
           <function>IMSUB</function>
@@ -1515,11 +1515,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMSUM"><function>IMSUM</function></link>.
+        <para><link linkend="gnumeric-function-IMSUM"><function>IMSUM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMSUM">
+    <refentry id="gnumeric-function-IMSUM">
       <refmeta>
         <refentrytitle>
           <function>IMSUM</function>
@@ -1551,11 +1551,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMSUB"><function>IMSUB</function></link>.
+        <para><link linkend="gnumeric-function-IMSUB"><function>IMSUB</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMTAN">
+    <refentry id="gnumeric-function-IMTAN">
       <refmeta>
         <refentrytitle>
           <function>IMTAN</function>
@@ -1586,12 +1586,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMSIN"><function>IMSIN</function></link>,
-        <link linkend="gnumeric-IMCOS"><function>IMCOS</function></link>.
+        <para><link linkend="gnumeric-function-IMSIN"><function>IMSIN</function></link>,
+        <link linkend="gnumeric-function-IMCOS"><function>IMCOS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IMTANH">
+    <refentry id="gnumeric-function-IMTANH">
       <refmeta>
         <refentrytitle>
           <function>IMTANH</function>
@@ -1618,15 +1618,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IMSINH"><function>IMSINH</function></link>,
-        <link linkend="gnumeric-IMCOSH"><function>IMCOSH</function></link>.
+        <para><link linkend="gnumeric-function-IMSINH"><function>IMSINH</function></link>,
+        <link linkend="gnumeric-function-IMCOSH"><function>IMCOSH</function></link>.
       </para>
       </refsect1>
     </refentry>
   </sect1>
   <sect1 id="CATEGORY_Database">
     <title>Database</title>
-    <refentry id="gnumeric-DAVERAGE">
+    <refentry id="gnumeric-function-DAVERAGE">
       <refmeta>
         <refentrytitle>
           <function>DAVERAGE</function>
@@ -1657,11 +1657,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DCOUNT"><function>DCOUNT</function></link>.
+        <para><link linkend="gnumeric-function-DCOUNT"><function>DCOUNT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DCOUNT">
+    <refentry id="gnumeric-function-DCOUNT">
       <refmeta>
         <refentrytitle>
           <function>DCOUNT</function>
@@ -1692,12 +1692,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DAVERAGE"><function>DAVERAGE</function></link>,
-        <link linkend="gnumeric-DCOUNTA"><function>DCOUNTA</function></link>.
+        <para><link linkend="gnumeric-function-DAVERAGE"><function>DAVERAGE</function></link>,
+        <link linkend="gnumeric-function-DCOUNTA"><function>DCOUNTA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DCOUNTA">
+    <refentry id="gnumeric-function-DCOUNTA">
       <refmeta>
         <refentrytitle>
           <function>DCOUNTA</function>
@@ -1728,11 +1728,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DCOUNT"><function>DCOUNT</function></link>.
+        <para><link linkend="gnumeric-function-DCOUNT"><function>DCOUNT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DGET">
+    <refentry id="gnumeric-function-DGET">
       <refmeta>
         <refentrytitle>
           <function>DGET</function>
@@ -1767,11 +1767,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DCOUNT"><function>DCOUNT</function></link>.
+        <para><link linkend="gnumeric-function-DCOUNT"><function>DCOUNT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DMAX">
+    <refentry id="gnumeric-function-DMAX">
       <refmeta>
         <refentrytitle>
           <function>DMAX</function>
@@ -1802,11 +1802,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DMIN"><function>DMIN</function></link>.
+        <para><link linkend="gnumeric-function-DMIN"><function>DMIN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DMIN">
+    <refentry id="gnumeric-function-DMIN">
       <refmeta>
         <refentrytitle>
           <function>DMIN</function>
@@ -1837,11 +1837,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DCOUNT"><function>DCOUNT</function></link>.
+        <para><link linkend="gnumeric-function-DCOUNT"><function>DCOUNT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DPRODUCT">
+    <refentry id="gnumeric-function-DPRODUCT">
       <refmeta>
         <refentrytitle>
           <function>DPRODUCT</function>
@@ -1872,11 +1872,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DSUM"><function>DSUM</function></link>.
+        <para><link linkend="gnumeric-function-DSUM"><function>DSUM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DSTDEV">
+    <refentry id="gnumeric-function-DSTDEV">
       <refmeta>
         <refentrytitle>
           <function>DSTDEV</function>
@@ -1907,11 +1907,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DSTDEVP"><function>DSTDEVP</function></link>.
+        <para><link linkend="gnumeric-function-DSTDEVP"><function>DSTDEVP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DSTDEVP">
+    <refentry id="gnumeric-function-DSTDEVP">
       <refmeta>
         <refentrytitle>
           <function>DSTDEVP</function>
@@ -1942,11 +1942,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DSTDEV"><function>DSTDEV</function></link>.
+        <para><link linkend="gnumeric-function-DSTDEV"><function>DSTDEV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DSUM">
+    <refentry id="gnumeric-function-DSUM">
       <refmeta>
         <refentrytitle>
           <function>DSUM</function>
@@ -1977,11 +1977,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DPRODUCT"><function>DPRODUCT</function></link>.
+        <para><link linkend="gnumeric-function-DPRODUCT"><function>DPRODUCT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DVAR">
+    <refentry id="gnumeric-function-DVAR">
       <refmeta>
         <refentrytitle>
           <function>DVAR</function>
@@ -2012,11 +2012,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DVARP"><function>DVARP</function></link>.
+        <para><link linkend="gnumeric-function-DVARP"><function>DVARP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DVARP">
+    <refentry id="gnumeric-function-DVARP">
       <refmeta>
         <refentrytitle>
           <function>DVARP</function>
@@ -2047,11 +2047,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DVAR"><function>DVAR</function></link>.
+        <para><link linkend="gnumeric-function-DVAR"><function>DVAR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-GETPIVOTDATA">
+    <refentry id="gnumeric-function-GETPIVOTDATA">
       <refmeta>
         <refentrytitle>
           <function>GETPIVOTDATA</function>
@@ -2081,7 +2081,7 @@
   </sect1>
   <sect1 id="CATEGORY_DateTime">
     <title>Date/Time</title>
-    <refentry id="gnumeric-ASCENSIONTHURSDAY">
+    <refentry id="gnumeric-function-ASCENSIONTHURSDAY">
       <refmeta>
         <refentrytitle>
           <function>ASCENSIONTHURSDAY</function>
@@ -2108,11 +2108,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EASTERSUNDAY"><function>EASTERSUNDAY</function></link>.
+        <para><link linkend="gnumeric-function-EASTERSUNDAY"><function>EASTERSUNDAY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ASHWEDNESDAY">
+    <refentry id="gnumeric-function-ASHWEDNESDAY">
       <refmeta>
         <refentrytitle>
           <function>ASHWEDNESDAY</function>
@@ -2139,11 +2139,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EASTERSUNDAY"><function>EASTERSUNDAY</function></link>.
+        <para><link linkend="gnumeric-function-EASTERSUNDAY"><function>EASTERSUNDAY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DATE">
+    <refentry id="gnumeric-function-DATE">
       <refmeta>
         <refentrytitle>
           <function>DATE</function>
@@ -2180,14 +2180,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TODAY"><function>TODAY</function></link>,
-        <link linkend="gnumeric-YEAR"><function>YEAR</function></link>,
-        <link linkend="gnumeric-MONTH"><function>MONTH</function></link>,
-        <link linkend="gnumeric-DAY"><function>DAY</function></link>.
+        <para><link linkend="gnumeric-function-TODAY"><function>TODAY</function></link>,
+        <link linkend="gnumeric-function-YEAR"><function>YEAR</function></link>,
+        <link linkend="gnumeric-function-MONTH"><function>MONTH</function></link>,
+        <link linkend="gnumeric-function-DAY"><function>DAY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DATE2HDATE">
+    <refentry id="gnumeric-function-DATE2HDATE">
       <refmeta>
         <refentrytitle>
           <function>DATE2HDATE</function>
@@ -2210,12 +2210,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-HDATE"><function>HDATE</function></link>,
-        <link linkend="gnumeric-DATE2HDATE_HEB"><function>DATE2HDATE_HEB</function></link>.
+        <para><link linkend="gnumeric-function-HDATE"><function>HDATE</function></link>,
+        <link linkend="gnumeric-function-DATE2HDATE_HEB"><function>DATE2HDATE_HEB</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DATE2HDATE_HEB">
+    <refentry id="gnumeric-function-DATE2HDATE_HEB">
       <refmeta>
         <refentrytitle>
           <function>DATE2HDATE_HEB</function>
@@ -2238,12 +2238,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DATE2HDATE"><function>DATE2HDATE</function></link>,
-        <link linkend="gnumeric-HDATE_HEB"><function>HDATE_HEB</function></link>.
+        <para><link linkend="gnumeric-function-DATE2HDATE"><function>DATE2HDATE</function></link>,
+        <link linkend="gnumeric-function-HDATE_HEB"><function>HDATE_HEB</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DATE2JULIAN">
+    <refentry id="gnumeric-function-DATE2JULIAN">
       <refmeta>
         <refentrytitle>
           <function>DATE2JULIAN</function>
@@ -2266,11 +2266,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-HDATE_JULIAN"><function>HDATE_JULIAN</function></link>.
+        <para><link linkend="gnumeric-function-HDATE_JULIAN"><function>HDATE_JULIAN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DATE2UNIX">
+    <refentry id="gnumeric-function-DATE2UNIX">
       <refmeta>
         <refentrytitle>
           <function>DATE2UNIX</function>
@@ -2297,12 +2297,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-UNIX2DATE"><function>UNIX2DATE</function></link>,
-        <link linkend="gnumeric-DATE"><function>DATE</function></link>.
+        <para><link linkend="gnumeric-function-UNIX2DATE"><function>UNIX2DATE</function></link>,
+        <link linkend="gnumeric-function-DATE"><function>DATE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DATEDIF">
+    <refentry id="gnumeric-function-DATEDIF">
       <refmeta>
         <refentrytitle>
           <function>DATEDIF</function>
@@ -2339,11 +2339,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DAYS360"><function>DAYS360</function></link>.
+        <para><link linkend="gnumeric-function-DAYS360"><function>DAYS360</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DATEVALUE">
+    <refentry id="gnumeric-function-DATEVALUE">
       <refmeta>
         <refentrytitle>
           <function>DATEVALUE</function>
@@ -2374,12 +2374,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TIMEVALUE"><function>TIMEVALUE</function></link>,
-        <link linkend="gnumeric-DATE"><function>DATE</function></link>.
+        <para><link linkend="gnumeric-function-TIMEVALUE"><function>TIMEVALUE</function></link>,
+        <link linkend="gnumeric-function-DATE"><function>DATE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DAY">
+    <refentry id="gnumeric-function-DAY">
       <refmeta>
         <refentrytitle>
           <function>DAY</function>
@@ -2410,13 +2410,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DATE"><function>DATE</function></link>,
-        <link linkend="gnumeric-YEAR"><function>YEAR</function></link>,
-        <link linkend="gnumeric-MONTH"><function>MONTH</function></link>.
+        <para><link linkend="gnumeric-function-DATE"><function>DATE</function></link>,
+        <link linkend="gnumeric-function-YEAR"><function>YEAR</function></link>,
+        <link linkend="gnumeric-function-MONTH"><function>MONTH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DAYS">
+    <refentry id="gnumeric-function-DAYS">
       <refmeta>
         <refentrytitle>
           <function>DAYS</function>
@@ -2448,11 +2448,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DATEDIF"><function>DATEDIF</function></link>.
+        <para><link linkend="gnumeric-function-DATEDIF"><function>DATEDIF</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DAYS360">
+    <refentry id="gnumeric-function-DAYS360">
       <refmeta>
         <refentrytitle>
           <function>DAYS360</function>
@@ -2489,11 +2489,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DATEDIF"><function>DATEDIF</function></link>.
+        <para><link linkend="gnumeric-function-DATEDIF"><function>DATEDIF</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-EASTERSUNDAY">
+    <refentry id="gnumeric-function-EASTERSUNDAY">
       <refmeta>
         <refentrytitle>
           <function>EASTERSUNDAY</function>
@@ -2524,11 +2524,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ASHWEDNESDAY"><function>ASHWEDNESDAY</function></link>.
+        <para><link linkend="gnumeric-function-ASHWEDNESDAY"><function>ASHWEDNESDAY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-EDATE">
+    <refentry id="gnumeric-function-EDATE">
       <refmeta>
         <refentrytitle>
           <function>EDATE</function>
@@ -2560,11 +2560,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DATE"><function>DATE</function></link>.
+        <para><link linkend="gnumeric-function-DATE"><function>DATE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-EOMONTH">
+    <refentry id="gnumeric-function-EOMONTH">
       <refmeta>
         <refentrytitle>
           <function>EOMONTH</function>
@@ -2596,11 +2596,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EDATE"><function>EDATE</function></link>.
+        <para><link linkend="gnumeric-function-EDATE"><function>EDATE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-GOODFRIDAY">
+    <refentry id="gnumeric-function-GOODFRIDAY">
       <refmeta>
         <refentrytitle>
           <function>GOODFRIDAY</function>
@@ -2627,11 +2627,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EASTERSUNDAY"><function>EASTERSUNDAY</function></link>.
+        <para><link linkend="gnumeric-function-EASTERSUNDAY"><function>EASTERSUNDAY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-HDATE">
+    <refentry id="gnumeric-function-HDATE">
       <refmeta>
         <refentrytitle>
           <function>HDATE</function>
@@ -2656,12 +2656,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-HDATE_HEB"><function>HDATE_HEB</function></link>,
-        <link linkend="gnumeric-DATE"><function>DATE</function></link>.
+        <para><link linkend="gnumeric-function-HDATE_HEB"><function>HDATE_HEB</function></link>,
+        <link linkend="gnumeric-function-DATE"><function>DATE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-HDATE_DAY">
+    <refentry id="gnumeric-function-HDATE_DAY">
       <refmeta>
         <refentrytitle>
           <function>HDATE_DAY</function>
@@ -2686,11 +2686,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-HDATE_JULIAN"><function>HDATE_JULIAN</function></link>.
+        <para><link linkend="gnumeric-function-HDATE_JULIAN"><function>HDATE_JULIAN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-HDATE_HEB">
+    <refentry id="gnumeric-function-HDATE_HEB">
       <refmeta>
         <refentrytitle>
           <function>HDATE_HEB</function>
@@ -2715,12 +2715,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-HDATE"><function>HDATE</function></link>,
-        <link linkend="gnumeric-DATE"><function>DATE</function></link>.
+        <para><link linkend="gnumeric-function-HDATE"><function>HDATE</function></link>,
+        <link linkend="gnumeric-function-DATE"><function>DATE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-HDATE_JULIAN">
+    <refentry id="gnumeric-function-HDATE_JULIAN">
       <refmeta>
         <refentrytitle>
           <function>HDATE_JULIAN</function>
@@ -2745,11 +2745,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-HDATE"><function>HDATE</function></link>.
+        <para><link linkend="gnumeric-function-HDATE"><function>HDATE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-HDATE_MONTH">
+    <refentry id="gnumeric-function-HDATE_MONTH">
       <refmeta>
         <refentrytitle>
           <function>HDATE_MONTH</function>
@@ -2774,11 +2774,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-HDATE_JULIAN"><function>HDATE_JULIAN</function></link>.
+        <para><link linkend="gnumeric-function-HDATE_JULIAN"><function>HDATE_JULIAN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-HDATE_YEAR">
+    <refentry id="gnumeric-function-HDATE_YEAR">
       <refmeta>
         <refentrytitle>
           <function>HDATE_YEAR</function>
@@ -2803,11 +2803,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-HDATE_JULIAN"><function>HDATE_JULIAN</function></link>.
+        <para><link linkend="gnumeric-function-HDATE_JULIAN"><function>HDATE_JULIAN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-HOUR">
+    <refentry id="gnumeric-function-HOUR">
       <refmeta>
         <refentrytitle>
           <function>HOUR</function>
@@ -2838,13 +2838,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TIME"><function>TIME</function></link>,
-        <link linkend="gnumeric-MINUTE"><function>MINUTE</function></link>,
-        <link linkend="gnumeric-SECOND"><function>SECOND</function></link>.
+        <para><link linkend="gnumeric-function-TIME"><function>TIME</function></link>,
+        <link linkend="gnumeric-function-MINUTE"><function>MINUTE</function></link>,
+        <link linkend="gnumeric-function-SECOND"><function>SECOND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ISOWEEKNUM">
+    <refentry id="gnumeric-function-ISOWEEKNUM">
       <refmeta>
         <refentrytitle>
           <function>ISOWEEKNUM</function>
@@ -2875,12 +2875,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ISOYEAR"><function>ISOYEAR</function></link>,
-        <link linkend="gnumeric-WEEKNUM"><function>WEEKNUM</function></link>.
+        <para><link linkend="gnumeric-function-ISOYEAR"><function>ISOYEAR</function></link>,
+        <link linkend="gnumeric-function-WEEKNUM"><function>WEEKNUM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ISOYEAR">
+    <refentry id="gnumeric-function-ISOYEAR">
       <refmeta>
         <refentrytitle>
           <function>ISOYEAR</function>
@@ -2911,12 +2911,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ISOWEEKNUM"><function>ISOWEEKNUM</function></link>,
-        <link linkend="gnumeric-YEAR"><function>YEAR</function></link>.
+        <para><link linkend="gnumeric-function-ISOWEEKNUM"><function>ISOWEEKNUM</function></link>,
+        <link linkend="gnumeric-function-YEAR"><function>YEAR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MINUTE">
+    <refentry id="gnumeric-function-MINUTE">
       <refmeta>
         <refentrytitle>
           <function>MINUTE</function>
@@ -2947,13 +2947,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TIME"><function>TIME</function></link>,
-        <link linkend="gnumeric-HOUR"><function>HOUR</function></link>,
-        <link linkend="gnumeric-SECOND"><function>SECOND</function></link>.
+        <para><link linkend="gnumeric-function-TIME"><function>TIME</function></link>,
+        <link linkend="gnumeric-function-HOUR"><function>HOUR</function></link>,
+        <link linkend="gnumeric-function-SECOND"><function>SECOND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MONTH">
+    <refentry id="gnumeric-function-MONTH">
       <refmeta>
         <refentrytitle>
           <function>MONTH</function>
@@ -2984,13 +2984,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DATE"><function>DATE</function></link>,
-        <link linkend="gnumeric-YEAR"><function>YEAR</function></link>,
-        <link linkend="gnumeric-DAY"><function>DAY</function></link>.
+        <para><link linkend="gnumeric-function-DATE"><function>DATE</function></link>,
+        <link linkend="gnumeric-function-YEAR"><function>YEAR</function></link>,
+        <link linkend="gnumeric-function-DAY"><function>DAY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NETWORKDAYS">
+    <refentry id="gnumeric-function-NETWORKDAYS">
       <refmeta>
         <refentrytitle>
           <function>NETWORKDAYS</function>
@@ -3032,11 +3032,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-WORKDAY"><function>WORKDAY</function></link>.
+        <para><link linkend="gnumeric-function-WORKDAY"><function>WORKDAY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NOW">
+    <refentry id="gnumeric-function-NOW">
       <refmeta>
         <refentrytitle>
           <function>NOW</function>
@@ -3063,11 +3063,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DATE"><function>DATE</function></link>.
+        <para><link linkend="gnumeric-function-DATE"><function>DATE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PENTECOSTSUNDAY">
+    <refentry id="gnumeric-function-PENTECOSTSUNDAY">
       <refmeta>
         <refentrytitle>
           <function>PENTECOSTSUNDAY</function>
@@ -3094,11 +3094,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EASTERSUNDAY"><function>EASTERSUNDAY</function></link>.
+        <para><link linkend="gnumeric-function-EASTERSUNDAY"><function>EASTERSUNDAY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SECOND">
+    <refentry id="gnumeric-function-SECOND">
       <refmeta>
         <refentrytitle>
           <function>SECOND</function>
@@ -3129,13 +3129,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TIME"><function>TIME</function></link>,
-        <link linkend="gnumeric-HOUR"><function>HOUR</function></link>,
-        <link linkend="gnumeric-MINUTE"><function>MINUTE</function></link>.
+        <para><link linkend="gnumeric-function-TIME"><function>TIME</function></link>,
+        <link linkend="gnumeric-function-HOUR"><function>HOUR</function></link>,
+        <link linkend="gnumeric-function-MINUTE"><function>MINUTE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TIME">
+    <refentry id="gnumeric-function-TIME">
       <refmeta>
         <refentrytitle>
           <function>TIME</function>
@@ -3168,13 +3168,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-HOUR"><function>HOUR</function></link>,
-        <link linkend="gnumeric-MINUTE"><function>MINUTE</function></link>,
-        <link linkend="gnumeric-SECOND"><function>SECOND</function></link>.
+        <para><link linkend="gnumeric-function-HOUR"><function>HOUR</function></link>,
+        <link linkend="gnumeric-function-MINUTE"><function>MINUTE</function></link>,
+        <link linkend="gnumeric-function-SECOND"><function>SECOND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TIMEVALUE">
+    <refentry id="gnumeric-function-TIMEVALUE">
       <refmeta>
         <refentrytitle>
           <function>TIMEVALUE</function>
@@ -3205,12 +3205,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DATEVALUE"><function>DATEVALUE</function></link>,
-        <link linkend="gnumeric-TIME"><function>TIME</function></link>.
+        <para><link linkend="gnumeric-function-DATEVALUE"><function>DATEVALUE</function></link>,
+        <link linkend="gnumeric-function-TIME"><function>TIME</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TODAY">
+    <refentry id="gnumeric-function-TODAY">
       <refmeta>
         <refentrytitle>
           <function>TODAY</function>
@@ -3237,11 +3237,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DATE"><function>DATE</function></link>.
+        <para><link linkend="gnumeric-function-DATE"><function>DATE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-UNIX2DATE">
+    <refentry id="gnumeric-function-UNIX2DATE">
       <refmeta>
         <refentrytitle>
           <function>UNIX2DATE</function>
@@ -3268,12 +3268,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DATE2UNIX"><function>DATE2UNIX</function></link>,
-        <link linkend="gnumeric-DATE"><function>DATE</function></link>.
+        <para><link linkend="gnumeric-function-DATE2UNIX"><function>DATE2UNIX</function></link>,
+        <link linkend="gnumeric-function-DATE"><function>DATE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-WEEKDAY">
+    <refentry id="gnumeric-function-WEEKDAY">
       <refmeta>
         <refentrytitle>
           <function>WEEKDAY</function>
@@ -3309,12 +3309,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DATE"><function>DATE</function></link>,
-        <link linkend="gnumeric-ISOWEEKNUM"><function>ISOWEEKNUM</function></link>.
+        <para><link linkend="gnumeric-function-DATE"><function>DATE</function></link>,
+        <link linkend="gnumeric-function-ISOWEEKNUM"><function>ISOWEEKNUM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-WEEKNUM">
+    <refentry id="gnumeric-function-WEEKNUM">
       <refmeta>
         <refentrytitle>
           <function>WEEKNUM</function>
@@ -3346,11 +3346,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ISOWEEKNUM"><function>ISOWEEKNUM</function></link>.
+        <para><link linkend="gnumeric-function-ISOWEEKNUM"><function>ISOWEEKNUM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-WORKDAY">
+    <refentry id="gnumeric-function-WORKDAY">
       <refmeta>
         <refentrytitle>
           <function>WORKDAY</function>
@@ -3392,11 +3392,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-NETWORKDAYS"><function>NETWORKDAYS</function></link>.
+        <para><link linkend="gnumeric-function-NETWORKDAYS"><function>NETWORKDAYS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-YEAR">
+    <refentry id="gnumeric-function-YEAR">
       <refmeta>
         <refentrytitle>
           <function>YEAR</function>
@@ -3427,13 +3427,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DATE"><function>DATE</function></link>,
-        <link linkend="gnumeric-MONTH"><function>MONTH</function></link>,
-        <link linkend="gnumeric-DAY"><function>DAY</function></link>.
+        <para><link linkend="gnumeric-function-DATE"><function>DATE</function></link>,
+        <link linkend="gnumeric-function-MONTH"><function>MONTH</function></link>,
+        <link linkend="gnumeric-function-DAY"><function>DAY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-YEARFRAC">
+    <refentry id="gnumeric-function-YEARFRAC">
       <refmeta>
         <refentrytitle>
           <function>YEARFRAC</function>
@@ -3466,14 +3466,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DATE"><function>DATE</function></link>.
+        <para><link linkend="gnumeric-function-DATE"><function>DATE</function></link>.
       </para>
       </refsect1>
     </refentry>
   </sect1>
   <sect1 id="CATEGORY_Engineering">
     <title>Engineering</title>
-    <refentry id="gnumeric-BASE">
+    <refentry id="gnumeric-function-BASE">
       <refmeta>
         <refentrytitle>
           <function>BASE</function>
@@ -3506,11 +3506,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DECIMAL"><function>DECIMAL</function></link>.
+        <para><link linkend="gnumeric-function-DECIMAL"><function>DECIMAL</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BESSELI">
+    <refentry id="gnumeric-function-BESSELI">
       <refmeta>
         <refentrytitle>
           <function>BESSELI</function>
@@ -3530,7 +3530,7 @@
       <refsect1>
         <title>Arguments</title>
         <para><parameter>X</parameter>: number</para>
-        <para><parameter>Î</parameter>: order (any number)</para>
+        <para><parameter>Î</parameter>: order (any non-negative number)</para>
       </refsect1>
       <refsect1>
         <title>Note</title>
@@ -3542,13 +3542,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BESSELJ"><function>BESSELJ</function></link>,
-        <link linkend="gnumeric-BESSELK"><function>BESSELK</function></link>,
-        <link linkend="gnumeric-BESSELY"><function>BESSELY</function></link>.
+        <para><link linkend="gnumeric-function-BESSELJ"><function>BESSELJ</function></link>,
+        <link linkend="gnumeric-function-BESSELK"><function>BESSELK</function></link>,
+        <link linkend="gnumeric-function-BESSELY"><function>BESSELY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BESSELJ">
+    <refentry id="gnumeric-function-BESSELJ">
       <refmeta>
         <refentrytitle>
           <function>BESSELJ</function>
@@ -3580,13 +3580,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BESSELI"><function>BESSELI</function></link>,
-        <link linkend="gnumeric-BESSELK"><function>BESSELK</function></link>,
-        <link linkend="gnumeric-BESSELY"><function>BESSELY</function></link>.
+        <para><link linkend="gnumeric-function-BESSELI"><function>BESSELI</function></link>,
+        <link linkend="gnumeric-function-BESSELK"><function>BESSELK</function></link>,
+        <link linkend="gnumeric-function-BESSELY"><function>BESSELY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BESSELK">
+    <refentry id="gnumeric-function-BESSELK">
       <refmeta>
         <refentrytitle>
           <function>BESSELK</function>
@@ -3606,7 +3606,7 @@
       <refsect1>
         <title>Arguments</title>
         <para><parameter>X</parameter>: number</para>
-        <para><parameter>Î</parameter>: order (any number)</para>
+        <para><parameter>Î</parameter>: order (any non-negative number)</para>
       </refsect1>
       <refsect1>
         <title>Note</title>
@@ -3618,13 +3618,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BESSELI"><function>BESSELI</function></link>,
-        <link linkend="gnumeric-BESSELJ"><function>BESSELJ</function></link>,
-        <link linkend="gnumeric-BESSELY"><function>BESSELY</function></link>.
+        <para><link linkend="gnumeric-function-BESSELI"><function>BESSELI</function></link>,
+        <link linkend="gnumeric-function-BESSELJ"><function>BESSELJ</function></link>,
+        <link linkend="gnumeric-function-BESSELY"><function>BESSELY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BESSELY">
+    <refentry id="gnumeric-function-BESSELY">
       <refmeta>
         <refentrytitle>
           <function>BESSELY</function>
@@ -3656,13 +3656,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BESSELI"><function>BESSELI</function></link>,
-        <link linkend="gnumeric-BESSELJ"><function>BESSELJ</function></link>,
-        <link linkend="gnumeric-BESSELK"><function>BESSELK</function></link>.
+        <para><link linkend="gnumeric-function-BESSELI"><function>BESSELI</function></link>,
+        <link linkend="gnumeric-function-BESSELJ"><function>BESSELJ</function></link>,
+        <link linkend="gnumeric-function-BESSELK"><function>BESSELK</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BIN2DEC">
+    <refentry id="gnumeric-function-BIN2DEC">
       <refmeta>
         <refentrytitle>
           <function>BIN2DEC</function>
@@ -3689,13 +3689,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DEC2BIN"><function>DEC2BIN</function></link>,
-        <link linkend="gnumeric-BIN2OCT"><function>BIN2OCT</function></link>,
-        <link linkend="gnumeric-BIN2HEX"><function>BIN2HEX</function></link>.
+        <para><link linkend="gnumeric-function-DEC2BIN"><function>DEC2BIN</function></link>,
+        <link linkend="gnumeric-function-BIN2OCT"><function>BIN2OCT</function></link>,
+        <link linkend="gnumeric-function-BIN2HEX"><function>BIN2HEX</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BIN2HEX">
+    <refentry id="gnumeric-function-BIN2HEX">
       <refmeta>
         <refentrytitle>
           <function>BIN2HEX</function>
@@ -3727,13 +3727,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-HEX2BIN"><function>HEX2BIN</function></link>,
-        <link linkend="gnumeric-BIN2OCT"><function>BIN2OCT</function></link>,
-        <link linkend="gnumeric-BIN2DEC"><function>BIN2DEC</function></link>.
+        <para><link linkend="gnumeric-function-HEX2BIN"><function>HEX2BIN</function></link>,
+        <link linkend="gnumeric-function-BIN2OCT"><function>BIN2OCT</function></link>,
+        <link linkend="gnumeric-function-BIN2DEC"><function>BIN2DEC</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BIN2OCT">
+    <refentry id="gnumeric-function-BIN2OCT">
       <refmeta>
         <refentrytitle>
           <function>BIN2OCT</function>
@@ -3765,13 +3765,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OCT2BIN"><function>OCT2BIN</function></link>,
-        <link linkend="gnumeric-BIN2DEC"><function>BIN2DEC</function></link>,
-        <link linkend="gnumeric-BIN2HEX"><function>BIN2HEX</function></link>.
+        <para><link linkend="gnumeric-function-OCT2BIN"><function>OCT2BIN</function></link>,
+        <link linkend="gnumeric-function-BIN2DEC"><function>BIN2DEC</function></link>,
+        <link linkend="gnumeric-function-BIN2HEX"><function>BIN2HEX</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CONVERT">
+    <refentry id="gnumeric-function-CONVERT">
       <refmeta>
         <refentrytitle>
           <function>CONVERT</function>
@@ -3904,7 +3904,7 @@
         <para>This function is OpenFormula compatible.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DEC2BIN">
+    <refentry id="gnumeric-function-DEC2BIN">
       <refmeta>
         <refentrytitle>
           <function>DEC2BIN</function>
@@ -3945,13 +3945,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BIN2DEC"><function>BIN2DEC</function></link>,
-        <link linkend="gnumeric-DEC2OCT"><function>DEC2OCT</function></link>,
-        <link linkend="gnumeric-DEC2HEX"><function>DEC2HEX</function></link>.
+        <para><link linkend="gnumeric-function-BIN2DEC"><function>BIN2DEC</function></link>,
+        <link linkend="gnumeric-function-DEC2OCT"><function>DEC2OCT</function></link>,
+        <link linkend="gnumeric-function-DEC2HEX"><function>DEC2HEX</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DEC2HEX">
+    <refentry id="gnumeric-function-DEC2HEX">
       <refmeta>
         <refentrytitle>
           <function>DEC2HEX</function>
@@ -3983,13 +3983,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-HEX2DEC"><function>HEX2DEC</function></link>,
-        <link linkend="gnumeric-DEC2BIN"><function>DEC2BIN</function></link>,
-        <link linkend="gnumeric-DEC2OCT"><function>DEC2OCT</function></link>.
+        <para><link linkend="gnumeric-function-HEX2DEC"><function>HEX2DEC</function></link>,
+        <link linkend="gnumeric-function-DEC2BIN"><function>DEC2BIN</function></link>,
+        <link linkend="gnumeric-function-DEC2OCT"><function>DEC2OCT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DEC2OCT">
+    <refentry id="gnumeric-function-DEC2OCT">
       <refmeta>
         <refentrytitle>
           <function>DEC2OCT</function>
@@ -4021,13 +4021,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OCT2DEC"><function>OCT2DEC</function></link>,
-        <link linkend="gnumeric-DEC2BIN"><function>DEC2BIN</function></link>,
-        <link linkend="gnumeric-DEC2HEX"><function>DEC2HEX</function></link>.
+        <para><link linkend="gnumeric-function-OCT2DEC"><function>OCT2DEC</function></link>,
+        <link linkend="gnumeric-function-DEC2BIN"><function>DEC2BIN</function></link>,
+        <link linkend="gnumeric-function-DEC2HEX"><function>DEC2HEX</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DECIMAL">
+    <refentry id="gnumeric-function-DECIMAL">
       <refmeta>
         <refentrytitle>
           <function>DECIMAL</function>
@@ -4055,11 +4055,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BASE"><function>BASE</function></link>.
+        <para><link linkend="gnumeric-function-BASE"><function>BASE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DELTA">
+    <refentry id="gnumeric-function-DELTA">
       <refmeta>
         <refentrytitle>
           <function>DELTA</function>
@@ -4095,12 +4095,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EXACT"><function>EXACT</function></link>,
-        <link linkend="gnumeric-GESTEP"><function>GESTEP</function></link>.
+        <para><link linkend="gnumeric-function-EXACT"><function>EXACT</function></link>,
+        <link linkend="gnumeric-function-GESTEP"><function>GESTEP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ERF">
+    <refentry id="gnumeric-function-ERF">
       <refmeta>
         <refentrytitle>
           <function>ERF</function>
@@ -4132,11 +4132,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ERFC"><function>ERFC</function></link>.
+        <para><link linkend="gnumeric-function-ERFC"><function>ERFC</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ERFC">
+    <refentry id="gnumeric-function-ERFC">
       <refmeta>
         <refentrytitle>
           <function>ERFC</function>
@@ -4163,11 +4163,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ERF"><function>ERF</function></link>.
+        <para><link linkend="gnumeric-function-ERF"><function>ERF</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-GESTEP">
+    <refentry id="gnumeric-function-GESTEP">
       <refmeta>
         <refentrytitle>
           <function>GESTEP</function>
@@ -4203,11 +4203,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DELTA"><function>DELTA</function></link>.
+        <para><link linkend="gnumeric-function-DELTA"><function>DELTA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-HEX2BIN">
+    <refentry id="gnumeric-function-HEX2BIN">
       <refmeta>
         <refentrytitle>
           <function>HEX2BIN</function>
@@ -4239,13 +4239,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BIN2HEX"><function>BIN2HEX</function></link>,
-        <link linkend="gnumeric-HEX2OCT"><function>HEX2OCT</function></link>,
-        <link linkend="gnumeric-HEX2DEC"><function>HEX2DEC</function></link>.
+        <para><link linkend="gnumeric-function-BIN2HEX"><function>BIN2HEX</function></link>,
+        <link linkend="gnumeric-function-HEX2OCT"><function>HEX2OCT</function></link>,
+        <link linkend="gnumeric-function-HEX2DEC"><function>HEX2DEC</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-HEX2DEC">
+    <refentry id="gnumeric-function-HEX2DEC">
       <refmeta>
         <refentrytitle>
           <function>HEX2DEC</function>
@@ -4272,13 +4272,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DEC2HEX"><function>DEC2HEX</function></link>,
-        <link linkend="gnumeric-HEX2BIN"><function>HEX2BIN</function></link>,
-        <link linkend="gnumeric-HEX2OCT"><function>HEX2OCT</function></link>.
+        <para><link linkend="gnumeric-function-DEC2HEX"><function>DEC2HEX</function></link>,
+        <link linkend="gnumeric-function-HEX2BIN"><function>HEX2BIN</function></link>,
+        <link linkend="gnumeric-function-HEX2OCT"><function>HEX2OCT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-HEX2OCT">
+    <refentry id="gnumeric-function-HEX2OCT">
       <refmeta>
         <refentrytitle>
           <function>HEX2OCT</function>
@@ -4310,13 +4310,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OCT2HEX"><function>OCT2HEX</function></link>,
-        <link linkend="gnumeric-HEX2BIN"><function>HEX2BIN</function></link>,
-        <link linkend="gnumeric-HEX2DEC"><function>HEX2DEC</function></link>.
+        <para><link linkend="gnumeric-function-OCT2HEX"><function>OCT2HEX</function></link>,
+        <link linkend="gnumeric-function-HEX2BIN"><function>HEX2BIN</function></link>,
+        <link linkend="gnumeric-function-HEX2DEC"><function>HEX2DEC</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-INVSUMINV">
+    <refentry id="gnumeric-function-INVSUMINV">
       <refmeta>
         <refentrytitle>
           <function>INVSUMINV</function>
@@ -4349,11 +4349,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-HARMEAN"><function>HARMEAN</function></link>.
+        <para><link linkend="gnumeric-function-HARMEAN"><function>HARMEAN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OCT2BIN">
+    <refentry id="gnumeric-function-OCT2BIN">
       <refmeta>
         <refentrytitle>
           <function>OCT2BIN</function>
@@ -4385,13 +4385,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BIN2OCT"><function>BIN2OCT</function></link>,
-        <link linkend="gnumeric-OCT2DEC"><function>OCT2DEC</function></link>,
-        <link linkend="gnumeric-OCT2HEX"><function>OCT2HEX</function></link>.
+        <para><link linkend="gnumeric-function-BIN2OCT"><function>BIN2OCT</function></link>,
+        <link linkend="gnumeric-function-OCT2DEC"><function>OCT2DEC</function></link>,
+        <link linkend="gnumeric-function-OCT2HEX"><function>OCT2HEX</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OCT2DEC">
+    <refentry id="gnumeric-function-OCT2DEC">
       <refmeta>
         <refentrytitle>
           <function>OCT2DEC</function>
@@ -4418,13 +4418,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DEC2OCT"><function>DEC2OCT</function></link>,
-        <link linkend="gnumeric-OCT2BIN"><function>OCT2BIN</function></link>,
-        <link linkend="gnumeric-OCT2HEX"><function>OCT2HEX</function></link>.
+        <para><link linkend="gnumeric-function-DEC2OCT"><function>DEC2OCT</function></link>,
+        <link linkend="gnumeric-function-OCT2BIN"><function>OCT2BIN</function></link>,
+        <link linkend="gnumeric-function-OCT2HEX"><function>OCT2HEX</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OCT2HEX">
+    <refentry id="gnumeric-function-OCT2HEX">
       <refmeta>
         <refentrytitle>
           <function>OCT2HEX</function>
@@ -4456,16 +4456,16 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-HEX2OCT"><function>HEX2OCT</function></link>,
-        <link linkend="gnumeric-OCT2BIN"><function>OCT2BIN</function></link>,
-        <link linkend="gnumeric-OCT2DEC"><function>OCT2DEC</function></link>.
+        <para><link linkend="gnumeric-function-HEX2OCT"><function>HEX2OCT</function></link>,
+        <link linkend="gnumeric-function-OCT2BIN"><function>OCT2BIN</function></link>,
+        <link linkend="gnumeric-function-OCT2DEC"><function>OCT2DEC</function></link>.
       </para>
       </refsect1>
     </refentry>
   </sect1>
   <sect1 id="CATEGORY_Erlang">
     <title>Erlang</title>
-    <refentry id="gnumeric-DIMCIRC">
+    <refentry id="gnumeric-function-DIMCIRC">
       <refmeta>
         <refentrytitle>
           <function>DIMCIRC</function>
@@ -4493,13 +4493,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OFFCAP"><function>OFFCAP</function></link>,
-        <link linkend="gnumeric-OFFTRAF"><function>OFFTRAF</function></link>,
-        <link linkend="gnumeric-PROBBLOCK"><function>PROBBLOCK</function></link>.
+        <para><link linkend="gnumeric-function-OFFCAP"><function>OFFCAP</function></link>,
+        <link linkend="gnumeric-function-OFFTRAF"><function>OFFTRAF</function></link>,
+        <link linkend="gnumeric-function-PROBBLOCK"><function>PROBBLOCK</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OFFCAP">
+    <refentry id="gnumeric-function-OFFCAP">
       <refmeta>
         <refentrytitle>
           <function>OFFCAP</function>
@@ -4527,13 +4527,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DIMCIRC"><function>DIMCIRC</function></link>,
-        <link linkend="gnumeric-OFFTRAF"><function>OFFTRAF</function></link>,
-        <link linkend="gnumeric-PROBBLOCK"><function>PROBBLOCK</function></link>.
+        <para><link linkend="gnumeric-function-DIMCIRC"><function>DIMCIRC</function></link>,
+        <link linkend="gnumeric-function-OFFTRAF"><function>OFFTRAF</function></link>,
+        <link linkend="gnumeric-function-PROBBLOCK"><function>PROBBLOCK</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OFFTRAF">
+    <refentry id="gnumeric-function-OFFTRAF">
       <refmeta>
         <refentrytitle>
           <function>OFFTRAF</function>
@@ -4565,13 +4565,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PROBBLOCK"><function>PROBBLOCK</function></link>,
-        <link linkend="gnumeric-DIMCIRC"><function>DIMCIRC</function></link>,
-        <link linkend="gnumeric-OFFCAP"><function>OFFCAP</function></link>.
+        <para><link linkend="gnumeric-function-PROBBLOCK"><function>PROBBLOCK</function></link>,
+        <link linkend="gnumeric-function-DIMCIRC"><function>DIMCIRC</function></link>,
+        <link linkend="gnumeric-function-OFFCAP"><function>OFFCAP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PROBBLOCK">
+    <refentry id="gnumeric-function-PROBBLOCK">
       <refmeta>
         <refentrytitle>
           <function>PROBBLOCK</function>
@@ -4603,16 +4603,16 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OFFTRAF"><function>OFFTRAF</function></link>,
-        <link linkend="gnumeric-DIMCIRC"><function>DIMCIRC</function></link>,
-        <link linkend="gnumeric-OFFCAP"><function>OFFCAP</function></link>.
+        <para><link linkend="gnumeric-function-OFFTRAF"><function>OFFTRAF</function></link>,
+        <link linkend="gnumeric-function-DIMCIRC"><function>DIMCIRC</function></link>,
+        <link linkend="gnumeric-function-OFFCAP"><function>OFFCAP</function></link>.
       </para>
       </refsect1>
     </refentry>
   </sect1>
   <sect1 id="CATEGORY_Finance">
     <title>Finance</title>
-    <refentry id="gnumeric-ACCRINT">
+    <refentry id="gnumeric-function-ACCRINT">
       <refmeta>
         <refentrytitle>
           <function>ACCRINT</function>
@@ -4652,11 +4652,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ACCRINTM"><function>ACCRINTM</function></link>.
+        <para><link linkend="gnumeric-function-ACCRINTM"><function>ACCRINTM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ACCRINTM">
+    <refentry id="gnumeric-function-ACCRINTM">
       <refmeta>
         <refentrytitle>
           <function>ACCRINTM</function>
@@ -4691,11 +4691,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ACCRINT"><function>ACCRINT</function></link>.
+        <para><link linkend="gnumeric-function-ACCRINT"><function>ACCRINT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-AMORDEGRC">
+    <refentry id="gnumeric-function-AMORDEGRC">
       <refmeta>
         <refentrytitle>
           <function>AMORDEGRC</function>
@@ -4737,11 +4737,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AMORLINC"><function>AMORLINC</function></link>.
+        <para><link linkend="gnumeric-function-AMORLINC"><function>AMORLINC</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-AMORLINC">
+    <refentry id="gnumeric-function-AMORLINC">
       <refmeta>
         <refentrytitle>
           <function>AMORLINC</function>
@@ -4778,11 +4778,41 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AMORDEGRC"><function>AMORDEGRC</function></link>.
+        <para><link linkend="gnumeric-function-AMORDEGRC"><function>AMORDEGRC</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COUPDAYBS">
+    <refentry id="gnumeric-function-ATL_LAST">
+      <refmeta>
+        <refentrytitle>
+          <function>ATL_LAST</function>
+        </refentrytitle>
+      </refmeta>
+      <refnamediv>
+        <refname>
+          <function>ATL_LAST</function>
+        </refname>
+        <refpurpose>
+        sample real-time data source
+      </refpurpose>
+      </refnamediv>
+      <refsynopsisdiv>
+        <synopsis><function>ATL_LAST</function>(<parameter>tag</parameter>)</synopsis>
+      </refsynopsisdiv>
+      <refsect1>
+        <title>Arguments</title>
+        <para><parameter>tag</parameter>: tag to watch</para>
+      </refsect1>
+      <refsect1>
+        <title>Description</title>
+        <para><function>ATL_LAST</function> is a sample implementation of a real time data source.  It takes a string tag and monitors the named pipe ~/atl for changes to the value of that tag.</para>
+      </refsect1>
+      <refsect1>
+        <title>Note</title>
+        <para>This is not intended to be generally enabled and is OFF by default.</para>
+      </refsect1>
+    </refentry>
+    <refentry id="gnumeric-function-COUPDAYBS">
       <refmeta>
         <refentrytitle>
           <function>COUPDAYBS</function>
@@ -4817,11 +4847,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COUPDAYS"><function>COUPDAYS</function></link>.
+        <para><link linkend="gnumeric-function-COUPDAYS"><function>COUPDAYS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COUPDAYS">
+    <refentry id="gnumeric-function-COUPDAYS">
       <refmeta>
         <refentrytitle>
           <function>COUPDAYS</function>
@@ -4856,12 +4886,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COUPDAYBS"><function>COUPDAYBS</function></link>,
-        <link linkend="gnumeric-COUPDAYSNC"><function>COUPDAYSNC</function></link>.
+        <para><link linkend="gnumeric-function-COUPDAYBS"><function>COUPDAYBS</function></link>,
+        <link linkend="gnumeric-function-COUPDAYSNC"><function>COUPDAYSNC</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COUPDAYSNC">
+    <refentry id="gnumeric-function-COUPDAYSNC">
       <refmeta>
         <refentrytitle>
           <function>COUPDAYSNC</function>
@@ -4896,12 +4926,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COUPDAYS"><function>COUPDAYS</function></link>,
-        <link linkend="gnumeric-COUPDAYBS"><function>COUPDAYBS</function></link>.
+        <para><link linkend="gnumeric-function-COUPDAYS"><function>COUPDAYS</function></link>,
+        <link linkend="gnumeric-function-COUPDAYBS"><function>COUPDAYBS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COUPNCD">
+    <refentry id="gnumeric-function-COUPNCD">
       <refmeta>
         <refentrytitle>
           <function>COUPNCD</function>
@@ -4936,13 +4966,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COUPPCD"><function>COUPPCD</function></link>,
-        <link linkend="gnumeric-COUPDAYS"><function>COUPDAYS</function></link>,
-        <link linkend="gnumeric-COUPDAYBS"><function>COUPDAYBS</function></link>.
+        <para><link linkend="gnumeric-function-COUPPCD"><function>COUPPCD</function></link>,
+        <link linkend="gnumeric-function-COUPDAYS"><function>COUPDAYS</function></link>,
+        <link linkend="gnumeric-function-COUPDAYBS"><function>COUPDAYBS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COUPNUM">
+    <refentry id="gnumeric-function-COUPNUM">
       <refmeta>
         <refentrytitle>
           <function>COUPNUM</function>
@@ -4977,12 +5007,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COUPNCD"><function>COUPNCD</function></link>,
-        <link linkend="gnumeric-COUPPCD"><function>COUPPCD</function></link>.
+        <para><link linkend="gnumeric-function-COUPNCD"><function>COUPNCD</function></link>,
+        <link linkend="gnumeric-function-COUPPCD"><function>COUPPCD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COUPPCD">
+    <refentry id="gnumeric-function-COUPPCD">
       <refmeta>
         <refentrytitle>
           <function>COUPPCD</function>
@@ -5017,13 +5047,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COUPNCD"><function>COUPNCD</function></link>,
-        <link linkend="gnumeric-COUPDAYS"><function>COUPDAYS</function></link>,
-        <link linkend="gnumeric-COUPDAYBS"><function>COUPDAYBS</function></link>.
+        <para><link linkend="gnumeric-function-COUPNCD"><function>COUPNCD</function></link>,
+        <link linkend="gnumeric-function-COUPDAYS"><function>COUPDAYS</function></link>,
+        <link linkend="gnumeric-function-COUPDAYBS"><function>COUPDAYBS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CUM_BIV_NORM_DIST">
+    <refentry id="gnumeric-function-CUM_BIV_NORM_DIST">
       <refmeta>
         <refentrytitle>
           <function>CUM_BIV_NORM_DIST</function>
@@ -5051,7 +5081,7 @@
         <para><function>CUM_BIV_NORM_DIST</function> calculates the probability that two standard normal distributed random variables with correlation <parameter>rho</parameter> are respectively each less than <parameter>a</parameter> and <parameter>b</parameter>.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CUMIPMT">
+    <refentry id="gnumeric-function-CUMIPMT">
       <refmeta>
         <refentrytitle>
           <function>CUMIPMT</function>
@@ -5087,11 +5117,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IPMT"><function>IPMT</function></link>.
+        <para><link linkend="gnumeric-function-IPMT"><function>IPMT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CUMPRINC">
+    <refentry id="gnumeric-function-CUMPRINC">
       <refmeta>
         <refentrytitle>
           <function>CUMPRINC</function>
@@ -5127,11 +5157,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PPMT"><function>PPMT</function></link>.
+        <para><link linkend="gnumeric-function-PPMT"><function>PPMT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DB">
+    <refentry id="gnumeric-function-DB">
       <refmeta>
         <refentrytitle>
           <function>DB</function>
@@ -5162,13 +5192,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DDB"><function>DDB</function></link>,
-        <link linkend="gnumeric-SLN"><function>SLN</function></link>,
-        <link linkend="gnumeric-SYD"><function>SYD</function></link>.
+        <para><link linkend="gnumeric-function-DDB"><function>DDB</function></link>,
+        <link linkend="gnumeric-function-SLN"><function>SLN</function></link>,
+        <link linkend="gnumeric-function-SYD"><function>SYD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DDB">
+    <refentry id="gnumeric-function-DDB">
       <refmeta>
         <refentrytitle>
           <function>DDB</function>
@@ -5199,13 +5229,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DB"><function>DB</function></link>,
-        <link linkend="gnumeric-SLN"><function>SLN</function></link>,
-        <link linkend="gnumeric-SYD"><function>SYD</function></link>.
+        <para><link linkend="gnumeric-function-DB"><function>DB</function></link>,
+        <link linkend="gnumeric-function-SLN"><function>SLN</function></link>,
+        <link linkend="gnumeric-function-SYD"><function>SYD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DISC">
+    <refentry id="gnumeric-function-DISC">
       <refmeta>
         <refentrytitle>
           <function>DISC</function>
@@ -5240,11 +5270,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PRICEMAT"><function>PRICEMAT</function></link>.
+        <para><link linkend="gnumeric-function-PRICEMAT"><function>PRICEMAT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DOLLARDE">
+    <refentry id="gnumeric-function-DOLLARDE">
       <refmeta>
         <refentrytitle>
           <function>DOLLARDE</function>
@@ -5272,11 +5302,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DOLLARFR"><function>DOLLARFR</function></link>.
+        <para><link linkend="gnumeric-function-DOLLARFR"><function>DOLLARFR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DOLLARFR">
+    <refentry id="gnumeric-function-DOLLARFR">
       <refmeta>
         <refentrytitle>
           <function>DOLLARFR</function>
@@ -5304,11 +5334,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DOLLARDE"><function>DOLLARDE</function></link>.
+        <para><link linkend="gnumeric-function-DOLLARDE"><function>DOLLARDE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DURATION">
+    <refentry id="gnumeric-function-DURATION">
       <refmeta>
         <refentrytitle>
           <function>DURATION</function>
@@ -5344,11 +5374,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MDURATION"><function>MDURATION</function></link>.
+        <para><link linkend="gnumeric-function-MDURATION"><function>MDURATION</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-EFFECT">
+    <refentry id="gnumeric-function-EFFECT">
       <refmeta>
         <refentrytitle>
           <function>EFFECT</function>
@@ -5376,11 +5406,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-NOMINAL"><function>NOMINAL</function></link>.
+        <para><link linkend="gnumeric-function-NOMINAL"><function>NOMINAL</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-EURO">
+    <refentry id="gnumeric-function-EURO">
       <refmeta>
         <refentrytitle>
           <function>EURO</function>
@@ -5411,11 +5441,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EUROCONVERT"><function>EUROCONVERT</function></link>.
+        <para><link linkend="gnumeric-function-EUROCONVERT"><function>EUROCONVERT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-EUROCONVERT">
+    <refentry id="gnumeric-function-EUROCONVERT">
       <refmeta>
         <refentrytitle>
           <function>EUROCONVERT</function>
@@ -5450,11 +5480,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EURO"><function>EURO</function></link>.
+        <para><link linkend="gnumeric-function-EURO"><function>EURO</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FV">
+    <refentry id="gnumeric-function-FV">
       <refmeta>
         <refentrytitle>
           <function>FV</function>
@@ -5489,11 +5519,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PV"><function>PV</function></link>.
+        <para><link linkend="gnumeric-function-PV"><function>PV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FVSCHEDULE">
+    <refentry id="gnumeric-function-FVSCHEDULE">
       <refmeta>
         <refentrytitle>
           <function>FVSCHEDULE</function>
@@ -5521,11 +5551,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-FV"><function>FV</function></link>.
+        <para><link linkend="gnumeric-function-FV"><function>FV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-G_DURATION">
+    <refentry id="gnumeric-function-G_DURATION">
       <refmeta>
         <refentrytitle>
           <function>G_DURATION</function>
@@ -5558,12 +5588,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-FV"><function>FV</function></link>,
-        <link linkend="gnumeric-PV"><function>PV</function></link>.
+        <para><link linkend="gnumeric-function-FV"><function>FV</function></link>,
+        <link linkend="gnumeric-function-PV"><function>PV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-INTRATE">
+    <refentry id="gnumeric-function-INTRATE">
       <refmeta>
         <refentrytitle>
           <function>INTRATE</function>
@@ -5598,11 +5628,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RECEIVED"><function>RECEIVED</function></link>.
+        <para><link linkend="gnumeric-function-RECEIVED"><function>RECEIVED</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IPMT">
+    <refentry id="gnumeric-function-IPMT">
       <refmeta>
         <refentrytitle>
           <function>IPMT</function>
@@ -5638,11 +5668,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PPMT"><function>PPMT</function></link>.
+        <para><link linkend="gnumeric-function-PPMT"><function>PPMT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IRR">
+    <refentry id="gnumeric-function-IRR">
       <refmeta>
         <refentrytitle>
           <function>IRR</function>
@@ -5674,11 +5704,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-XIRR"><function>XIRR</function></link>.
+        <para><link linkend="gnumeric-function-XIRR"><function>XIRR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ISPMT">
+    <refentry id="gnumeric-function-ISPMT">
       <refmeta>
         <refentrytitle>
           <function>ISPMT</function>
@@ -5708,11 +5738,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PV"><function>PV</function></link>.
+        <para><link linkend="gnumeric-function-PV"><function>PV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MDURATION">
+    <refentry id="gnumeric-function-MDURATION">
       <refmeta>
         <refentrytitle>
           <function>MDURATION</function>
@@ -5748,11 +5778,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DURATION"><function>DURATION</function></link>.
+        <para><link linkend="gnumeric-function-DURATION"><function>DURATION</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MIRR">
+    <refentry id="gnumeric-function-MIRR">
       <refmeta>
         <refentrytitle>
           <function>MIRR</function>
@@ -5781,12 +5811,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IRR"><function>IRR</function></link>,
-        <link linkend="gnumeric-XIRR"><function>XIRR</function></link>.
+        <para><link linkend="gnumeric-function-IRR"><function>IRR</function></link>,
+        <link linkend="gnumeric-function-XIRR"><function>XIRR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NOMINAL">
+    <refentry id="gnumeric-function-NOMINAL">
       <refmeta>
         <refentrytitle>
           <function>NOMINAL</function>
@@ -5814,11 +5844,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EFFECT"><function>EFFECT</function></link>.
+        <para><link linkend="gnumeric-function-EFFECT"><function>EFFECT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NPER">
+    <refentry id="gnumeric-function-NPER">
       <refmeta>
         <refentrytitle>
           <function>NPER</function>
@@ -5853,12 +5883,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PV"><function>PV</function></link>,
-        <link linkend="gnumeric-FV"><function>FV</function></link>.
+        <para><link linkend="gnumeric-function-PV"><function>PV</function></link>,
+        <link linkend="gnumeric-function-FV"><function>FV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NPV">
+    <refentry id="gnumeric-function-NPV">
       <refmeta>
         <refentrytitle>
           <function>NPV</function>
@@ -5887,11 +5917,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PV"><function>PV</function></link>.
+        <para><link linkend="gnumeric-function-PV"><function>PV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ODDFPRICE">
+    <refentry id="gnumeric-function-ODDFPRICE">
       <refmeta>
         <refentrytitle>
           <function>ODDFPRICE</function>
@@ -5930,12 +5960,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ODDLPRICE"><function>ODDLPRICE</function></link>,
-        <link linkend="gnumeric-ODDFYIELD"><function>ODDFYIELD</function></link>.
+        <para><link linkend="gnumeric-function-ODDLPRICE"><function>ODDLPRICE</function></link>,
+        <link linkend="gnumeric-function-ODDFYIELD"><function>ODDFYIELD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ODDFYIELD">
+    <refentry id="gnumeric-function-ODDFYIELD">
       <refmeta>
         <refentrytitle>
           <function>ODDFYIELD</function>
@@ -5974,12 +6004,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ODDFPRICE"><function>ODDFPRICE</function></link>,
-        <link linkend="gnumeric-ODDLYIELD"><function>ODDLYIELD</function></link>.
+        <para><link linkend="gnumeric-function-ODDFPRICE"><function>ODDFPRICE</function></link>,
+        <link linkend="gnumeric-function-ODDLYIELD"><function>ODDLYIELD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ODDLPRICE">
+    <refentry id="gnumeric-function-ODDLPRICE">
       <refmeta>
         <refentrytitle>
           <function>ODDLPRICE</function>
@@ -6017,12 +6047,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-YIELD"><function>YIELD</function></link>,
-        <link linkend="gnumeric-DURATION"><function>DURATION</function></link>.
+        <para><link linkend="gnumeric-function-YIELD"><function>YIELD</function></link>,
+        <link linkend="gnumeric-function-DURATION"><function>DURATION</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ODDLYIELD">
+    <refentry id="gnumeric-function-ODDLYIELD">
       <refmeta>
         <refentrytitle>
           <function>ODDLYIELD</function>
@@ -6060,12 +6090,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-YIELD"><function>YIELD</function></link>,
-        <link linkend="gnumeric-DURATION"><function>DURATION</function></link>.
+        <para><link linkend="gnumeric-function-YIELD"><function>YIELD</function></link>,
+        <link linkend="gnumeric-function-DURATION"><function>DURATION</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_2_ASSET_CORRELATION">
+    <refentry id="gnumeric-function-OPT_2_ASSET_CORRELATION">
       <refmeta>
         <refentrytitle>
           <function>OPT_2_ASSET_CORRELATION</function>
@@ -6103,15 +6133,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_AMER_EXCHANGE">
+    <refentry id="gnumeric-function-OPT_AMER_EXCHANGE">
       <refmeta>
         <refentrytitle>
           <function>OPT_AMER_EXCHANGE</function>
@@ -6148,16 +6178,16 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_EURO_EXCHANGE"><function>OPT_EURO_EXCHANGE</function></link>,
-        <link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_EURO_EXCHANGE"><function>OPT_EURO_EXCHANGE</function></link>,
+        <link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_BAW_AMER">
+    <refentry id="gnumeric-function-OPT_BAW_AMER">
       <refmeta>
         <refentrytitle>
           <function>OPT_BAW_AMER</function>
@@ -6186,15 +6216,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_BINOMIAL">
+    <refentry id="gnumeric-function-OPT_BINOMIAL">
       <refmeta>
         <refentrytitle>
           <function>OPT_BINOMIAL</function>
@@ -6229,15 +6259,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_BJER_STENS">
+    <refentry id="gnumeric-function-OPT_BJER_STENS">
       <refmeta>
         <refentrytitle>
           <function>OPT_BJER_STENS</function>
@@ -6266,15 +6296,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_BS">
+    <refentry id="gnumeric-function-OPT_BS">
       <refmeta>
         <refentrytitle>
           <function>OPT_BS</function>
@@ -6311,15 +6341,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_VEGA"><function>OPT_BS_VEGA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_VEGA"><function>OPT_BS_VEGA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_BS_CARRYCOST">
+    <refentry id="gnumeric-function-OPT_BS_CARRYCOST">
       <refmeta>
         <refentrytitle>
           <function>OPT_BS_CARRYCOST</function>
@@ -6356,15 +6386,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_BS_DELTA">
+    <refentry id="gnumeric-function-OPT_BS_DELTA">
       <refmeta>
         <refentrytitle>
           <function>OPT_BS_DELTA</function>
@@ -6401,15 +6431,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_VEGA"><function>OPT_BS_VEGA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_VEGA"><function>OPT_BS_VEGA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_BS_GAMMA">
+    <refentry id="gnumeric-function-OPT_BS_GAMMA">
       <refmeta>
         <refentrytitle>
           <function>OPT_BS_GAMMA</function>
@@ -6445,15 +6475,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_VEGA"><function>OPT_BS_VEGA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_VEGA"><function>OPT_BS_VEGA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_BS_RHO">
+    <refentry id="gnumeric-function-OPT_BS_RHO">
       <refmeta>
         <refentrytitle>
           <function>OPT_BS_RHO</function>
@@ -6490,15 +6520,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_VEGA"><function>OPT_BS_VEGA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_VEGA"><function>OPT_BS_VEGA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_BS_THETA">
+    <refentry id="gnumeric-function-OPT_BS_THETA">
       <refmeta>
         <refentrytitle>
           <function>OPT_BS_THETA</function>
@@ -6535,15 +6565,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_VEGA"><function>OPT_BS_VEGA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_VEGA"><function>OPT_BS_VEGA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_BS_VEGA">
+    <refentry id="gnumeric-function-OPT_BS_VEGA">
       <refmeta>
         <refentrytitle>
           <function>OPT_BS_VEGA</function>
@@ -6579,15 +6609,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_COMPLEX_CHOOSER">
+    <refentry id="gnumeric-function-OPT_COMPLEX_CHOOSER">
       <refmeta>
         <refentrytitle>
           <function>OPT_COMPLEX_CHOOSER</function>
@@ -6618,15 +6648,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_EURO_EXCHANGE">
+    <refentry id="gnumeric-function-OPT_EURO_EXCHANGE">
       <refmeta>
         <refentrytitle>
           <function>OPT_EURO_EXCHANGE</function>
@@ -6663,16 +6693,16 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_AMER_EXCHANGE"><function>OPT_AMER_EXCHANGE</function></link>,
-        <link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_AMER_EXCHANGE"><function>OPT_AMER_EXCHANGE</function></link>,
+        <link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_EXEC">
+    <refentry id="gnumeric-function-OPT_EXEC">
       <refmeta>
         <refentrytitle>
           <function>OPT_EXEC</function>
@@ -6706,15 +6736,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_EXTENDIBLE_WRITER">
+    <refentry id="gnumeric-function-OPT_EXTENDIBLE_WRITER">
       <refmeta>
         <refentrytitle>
           <function>OPT_EXTENDIBLE_WRITER</function>
@@ -6749,15 +6779,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_FIXED_STRK_LKBK">
+    <refentry id="gnumeric-function-OPT_FIXED_STRK_LKBK">
       <refmeta>
         <refentrytitle>
           <function>OPT_FIXED_STRK_LKBK</function>
@@ -6792,15 +6822,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_FLOAT_STRK_LKBK">
+    <refentry id="gnumeric-function-OPT_FLOAT_STRK_LKBK">
       <refmeta>
         <refentrytitle>
           <function>OPT_FLOAT_STRK_LKBK</function>
@@ -6834,15 +6864,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_FORWARD_START">
+    <refentry id="gnumeric-function-OPT_FORWARD_START">
       <refmeta>
         <refentrytitle>
           <function>OPT_FORWARD_START</function>
@@ -6872,15 +6902,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_FRENCH">
+    <refentry id="gnumeric-function-OPT_FRENCH">
       <refmeta>
         <refentrytitle>
           <function>OPT_FRENCH</function>
@@ -6914,15 +6944,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_GARMAN_KOHLHAGEN">
+    <refentry id="gnumeric-function-OPT_GARMAN_KOHLHAGEN">
       <refmeta>
         <refentrytitle>
           <function>OPT_GARMAN_KOHLHAGEN</function>
@@ -6955,15 +6985,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_JUMP_DIFF">
+    <refentry id="gnumeric-function-OPT_JUMP_DIFF">
       <refmeta>
         <refentrytitle>
           <function>OPT_JUMP_DIFF</function>
@@ -6997,15 +7027,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_MILTERSEN_SCHWARTZ">
+    <refentry id="gnumeric-function-OPT_MILTERSEN_SCHWARTZ">
       <refmeta>
         <refentrytitle>
           <function>OPT_MILTERSEN_SCHWARTZ</function>
@@ -7041,15 +7071,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_ON_OPTIONS">
+    <refentry id="gnumeric-function-OPT_ON_OPTIONS">
       <refmeta>
         <refentrytitle>
           <function>OPT_ON_OPTIONS</function>
@@ -7084,15 +7114,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_RGW">
+    <refentry id="gnumeric-function-OPT_RGW">
       <refmeta>
         <refentrytitle>
           <function>OPT_RGW</function>
@@ -7121,15 +7151,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_SIMPLE_CHOOSER">
+    <refentry id="gnumeric-function-OPT_SIMPLE_CHOOSER">
       <refmeta>
         <refentrytitle>
           <function>OPT_SIMPLE_CHOOSER</function>
@@ -7158,15 +7188,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_SPREAD_APPROX">
+    <refentry id="gnumeric-function-OPT_SPREAD_APPROX">
       <refmeta>
         <refentrytitle>
           <function>OPT_SPREAD_APPROX</function>
@@ -7197,15 +7227,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OPT_TIME_SWITCH">
+    <refentry id="gnumeric-function-OPT_TIME_SWITCH">
       <refmeta>
         <refentrytitle>
           <function>OPT_TIME_SWITCH</function>
@@ -7241,15 +7271,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OPT_BS"><function>OPT_BS</function></link>,
-        <link linkend="gnumeric-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
-        <link linkend="gnumeric-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
-        <link linkend="gnumeric-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
-        <link linkend="gnumeric-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-OPT_BS"><function>OPT_BS</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_DELTA"><function>OPT_BS_DELTA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_RHO"><function>OPT_BS_RHO</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_THETA"><function>OPT_BS_THETA</function></link>,
+        <link linkend="gnumeric-function-OPT_BS_GAMMA"><function>OPT_BS_GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PMT">
+    <refentry id="gnumeric-function-PMT">
       <refmeta>
         <refentrytitle>
           <function>PMT</function>
@@ -7284,14 +7314,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PV"><function>PV</function></link>,
-        <link linkend="gnumeric-FV"><function>FV</function></link>,
-        <link linkend="gnumeric-RATE"><function>RATE</function></link>,
-        <link linkend="gnumeric-ISPMT"><function>ISPMT</function></link>.
+        <para><link linkend="gnumeric-function-PV"><function>PV</function></link>,
+        <link linkend="gnumeric-function-FV"><function>FV</function></link>,
+        <link linkend="gnumeric-function-RATE"><function>RATE</function></link>,
+        <link linkend="gnumeric-function-ISPMT"><function>ISPMT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PPMT">
+    <refentry id="gnumeric-function-PPMT">
       <refmeta>
         <refentrytitle>
           <function>PPMT</function>
@@ -7327,11 +7357,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IPMT"><function>IPMT</function></link>.
+        <para><link linkend="gnumeric-function-IPMT"><function>IPMT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PRICE">
+    <refentry id="gnumeric-function-PRICE">
       <refmeta>
         <refentrytitle>
           <function>PRICE</function>
@@ -7368,12 +7398,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-YIELD"><function>YIELD</function></link>,
-        <link linkend="gnumeric-DURATION"><function>DURATION</function></link>.
+        <para><link linkend="gnumeric-function-YIELD"><function>YIELD</function></link>,
+        <link linkend="gnumeric-function-DURATION"><function>DURATION</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PRICEDISC">
+    <refentry id="gnumeric-function-PRICEDISC">
       <refmeta>
         <refentrytitle>
           <function>PRICEDISC</function>
@@ -7408,11 +7438,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PRICEMAT"><function>PRICEMAT</function></link>.
+        <para><link linkend="gnumeric-function-PRICEMAT"><function>PRICEMAT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PRICEMAT">
+    <refentry id="gnumeric-function-PRICEMAT">
       <refmeta>
         <refentrytitle>
           <function>PRICEMAT</function>
@@ -7448,11 +7478,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PRICEDISC"><function>PRICEDISC</function></link>.
+        <para><link linkend="gnumeric-function-PRICEDISC"><function>PRICEDISC</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PV">
+    <refentry id="gnumeric-function-PV">
       <refmeta>
         <refentrytitle>
           <function>PV</function>
@@ -7487,11 +7517,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-FV"><function>FV</function></link>.
+        <para><link linkend="gnumeric-function-FV"><function>FV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RATE">
+    <refentry id="gnumeric-function-RATE">
       <refmeta>
         <refentrytitle>
           <function>RATE</function>
@@ -7527,12 +7557,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PV"><function>PV</function></link>,
-        <link linkend="gnumeric-FV"><function>FV</function></link>.
+        <para><link linkend="gnumeric-function-PV"><function>PV</function></link>,
+        <link linkend="gnumeric-function-FV"><function>FV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RECEIVED">
+    <refentry id="gnumeric-function-RECEIVED">
       <refmeta>
         <refentrytitle>
           <function>RECEIVED</function>
@@ -7567,11 +7597,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-INTRATE"><function>INTRATE</function></link>.
+        <para><link linkend="gnumeric-function-INTRATE"><function>INTRATE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RRI">
+    <refentry id="gnumeric-function-RRI">
       <refmeta>
         <refentrytitle>
           <function>RRI</function>
@@ -7608,13 +7638,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PV"><function>PV</function></link>,
-        <link linkend="gnumeric-FV"><function>FV</function></link>,
-        <link linkend="gnumeric-RATE"><function>RATE</function></link>.
+        <para><link linkend="gnumeric-function-PV"><function>PV</function></link>,
+        <link linkend="gnumeric-function-FV"><function>FV</function></link>,
+        <link linkend="gnumeric-function-RATE"><function>RATE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SLN">
+    <refentry id="gnumeric-function-SLN">
       <refmeta>
         <refentrytitle>
           <function>SLN</function>
@@ -7643,13 +7673,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DB"><function>DB</function></link>,
-        <link linkend="gnumeric-DDB"><function>DDB</function></link>,
-        <link linkend="gnumeric-SYD"><function>SYD</function></link>.
+        <para><link linkend="gnumeric-function-DB"><function>DB</function></link>,
+        <link linkend="gnumeric-function-DDB"><function>DDB</function></link>,
+        <link linkend="gnumeric-function-SYD"><function>SYD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SYD">
+    <refentry id="gnumeric-function-SYD">
       <refmeta>
         <refentrytitle>
           <function>SYD</function>
@@ -7679,13 +7709,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DB"><function>DB</function></link>,
-        <link linkend="gnumeric-DDB"><function>DDB</function></link>,
-        <link linkend="gnumeric-SLN"><function>SLN</function></link>.
+        <para><link linkend="gnumeric-function-DB"><function>DB</function></link>,
+        <link linkend="gnumeric-function-DDB"><function>DDB</function></link>,
+        <link linkend="gnumeric-function-SLN"><function>SLN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TBILLEQ">
+    <refentry id="gnumeric-function-TBILLEQ">
       <refmeta>
         <refentrytitle>
           <function>TBILLEQ</function>
@@ -7714,12 +7744,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TBILLPRICE"><function>TBILLPRICE</function></link>,
-        <link linkend="gnumeric-TBILLYIELD"><function>TBILLYIELD</function></link>.
+        <para><link linkend="gnumeric-function-TBILLPRICE"><function>TBILLPRICE</function></link>,
+        <link linkend="gnumeric-function-TBILLYIELD"><function>TBILLYIELD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TBILLPRICE">
+    <refentry id="gnumeric-function-TBILLPRICE">
       <refmeta>
         <refentrytitle>
           <function>TBILLPRICE</function>
@@ -7748,12 +7778,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TBILLEQ"><function>TBILLEQ</function></link>,
-        <link linkend="gnumeric-TBILLYIELD"><function>TBILLYIELD</function></link>.
+        <para><link linkend="gnumeric-function-TBILLEQ"><function>TBILLEQ</function></link>,
+        <link linkend="gnumeric-function-TBILLYIELD"><function>TBILLYIELD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TBILLYIELD">
+    <refentry id="gnumeric-function-TBILLYIELD">
       <refmeta>
         <refentrytitle>
           <function>TBILLYIELD</function>
@@ -7782,12 +7812,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TBILLEQ"><function>TBILLEQ</function></link>,
-        <link linkend="gnumeric-TBILLPRICE"><function>TBILLPRICE</function></link>.
+        <para><link linkend="gnumeric-function-TBILLEQ"><function>TBILLEQ</function></link>,
+        <link linkend="gnumeric-function-TBILLPRICE"><function>TBILLPRICE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-VDB">
+    <refentry id="gnumeric-function-VDB">
       <refmeta>
         <refentrytitle>
           <function>VDB</function>
@@ -7824,12 +7854,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DB"><function>DB</function></link>,
-        <link linkend="gnumeric-DDB"><function>DDB</function></link>.
+        <para><link linkend="gnumeric-function-DB"><function>DB</function></link>,
+        <link linkend="gnumeric-function-DDB"><function>DDB</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-XIRR">
+    <refentry id="gnumeric-function-XIRR">
       <refmeta>
         <refentrytitle>
           <function>XIRR</function>
@@ -7862,11 +7892,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IRR"><function>IRR</function></link>.
+        <para><link linkend="gnumeric-function-IRR"><function>IRR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-XNPV">
+    <refentry id="gnumeric-function-XNPV">
       <refmeta>
         <refentrytitle>
           <function>XNPV</function>
@@ -7899,11 +7929,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-NPV"><function>NPV</function></link>.
+        <para><link linkend="gnumeric-function-NPV"><function>NPV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-YIELD">
+    <refentry id="gnumeric-function-YIELD">
       <refmeta>
         <refentrytitle>
           <function>YIELD</function>
@@ -7940,12 +7970,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PRICE"><function>PRICE</function></link>,
-        <link linkend="gnumeric-DURATION"><function>DURATION</function></link>.
+        <para><link linkend="gnumeric-function-PRICE"><function>PRICE</function></link>,
+        <link linkend="gnumeric-function-DURATION"><function>DURATION</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-YIELDDISC">
+    <refentry id="gnumeric-function-YIELDDISC">
       <refmeta>
         <refentrytitle>
           <function>YIELDDISC</function>
@@ -7980,12 +8010,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PRICE"><function>PRICE</function></link>,
-        <link linkend="gnumeric-DURATION"><function>DURATION</function></link>.
+        <para><link linkend="gnumeric-function-PRICE"><function>PRICE</function></link>,
+        <link linkend="gnumeric-function-DURATION"><function>DURATION</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-YIELDMAT">
+    <refentry id="gnumeric-function-YIELDMAT">
       <refmeta>
         <refentrytitle>
           <function>YIELDMAT</function>
@@ -8021,15 +8051,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-YIELDDISC"><function>YIELDDISC</function></link>,
-        <link linkend="gnumeric-YIELD"><function>YIELD</function></link>.
+        <para><link linkend="gnumeric-function-YIELDDISC"><function>YIELDDISC</function></link>,
+        <link linkend="gnumeric-function-YIELD"><function>YIELD</function></link>.
       </para>
       </refsect1>
     </refentry>
   </sect1>
   <sect1 id="CATEGORY_Gnumeric">
     <title>Gnumeric</title>
-    <refentry id="gnumeric-GNUMERIC_VERSION">
+    <refentry id="gnumeric-function-GNUMERIC_VERSION">
       <refmeta>
         <refentrytitle>
           <function>GNUMERIC_VERSION</function>
@@ -8054,7 +8084,7 @@
   </sect1>
   <sect1 id="CATEGORY_Information">
     <title>Information</title>
-    <refentry id="gnumeric-CELL">
+    <refentry id="gnumeric-function-CELL">
       <refmeta>
         <refentrytitle>
           <function>CELL</function>
@@ -8111,11 +8141,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-INDIRECT"><function>INDIRECT</function></link>.
+        <para><link linkend="gnumeric-function-INDIRECT"><function>INDIRECT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COUNTBLANK">
+    <refentry id="gnumeric-function-COUNTBLANK">
       <refmeta>
         <refentrytitle>
           <function>COUNTBLANK</function>
@@ -8142,11 +8172,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COUNT"><function>COUNT</function></link>.
+        <para><link linkend="gnumeric-function-COUNT"><function>COUNT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ERROR">
+    <refentry id="gnumeric-function-ERROR">
       <refmeta>
         <refentrytitle>
           <function>ERROR</function>
@@ -8169,11 +8199,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ISERROR"><function>ISERROR</function></link>.
+        <para><link linkend="gnumeric-function-ISERROR"><function>ISERROR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ERROR.TYPE">
+    <refentry id="gnumeric-function-ERROR.TYPE">
       <refmeta>
         <refentrytitle>
           <function>ERROR.TYPE</function>
@@ -8211,11 +8241,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ISERROR"><function>ISERROR</function></link>.
+        <para><link linkend="gnumeric-function-ISERROR"><function>ISERROR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-EXPRESSION">
+    <refentry id="gnumeric-function-EXPRESSION">
       <refmeta>
         <refentrytitle>
           <function>EXPRESSION</function>
@@ -8242,11 +8272,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TEXT"><function>TEXT</function></link>.
+        <para><link linkend="gnumeric-function-TEXT"><function>TEXT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-GET.FORMULA">
+    <refentry id="gnumeric-function-GET.FORMULA">
       <refmeta>
         <refentrytitle>
           <function>GET.FORMULA</function>
@@ -8273,12 +8303,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EXPRESSION"><function>EXPRESSION</function></link>,
-        <link linkend="gnumeric-ISFORMULA"><function>ISFORMULA</function></link>.
+        <para><link linkend="gnumeric-function-EXPRESSION"><function>EXPRESSION</function></link>,
+        <link linkend="gnumeric-function-ISFORMULA"><function>ISFORMULA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-GET.LINK">
+    <refentry id="gnumeric-function-GET.LINK">
       <refmeta>
         <refentrytitle>
           <function>GET.LINK</function>
@@ -8305,11 +8335,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-HYPERLINK"><function>HYPERLINK</function></link>.
+        <para><link linkend="gnumeric-function-HYPERLINK"><function>HYPERLINK</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-GETENV">
+    <refentry id="gnumeric-function-GETENV">
       <refmeta>
         <refentrytitle>
           <function>GETENV</function>
@@ -8335,7 +8365,7 @@
         <para>If a variable called <parameter>name</parameter> does not exist, #N/A! will be returned. Variable names are case sensitive.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-INFO">
+    <refentry id="gnumeric-function-INFO">
       <refmeta>
         <refentrytitle>
           <function>INFO</function>
@@ -8374,11 +8404,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CELL"><function>CELL</function></link>.
+        <para><link linkend="gnumeric-function-CELL"><function>CELL</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ISBLANK">
+    <refentry id="gnumeric-function-ISBLANK">
       <refmeta>
         <refentrytitle>
           <function>ISBLANK</function>
@@ -8408,7 +8438,7 @@
         <para>This function is Excel compatible.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ISERR">
+    <refentry id="gnumeric-function-ISERR">
       <refmeta>
         <refentrytitle>
           <function>ISERR</function>
@@ -8435,11 +8465,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ISERROR"><function>ISERROR</function></link>.
+        <para><link linkend="gnumeric-function-ISERROR"><function>ISERROR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ISERROR">
+    <refentry id="gnumeric-function-ISERROR">
       <refmeta>
         <refentrytitle>
           <function>ISERROR</function>
@@ -8466,12 +8496,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ISERR"><function>ISERR</function></link>,
-        <link linkend="gnumeric-ISNA"><function>ISNA</function></link>.
+        <para><link linkend="gnumeric-function-ISERR"><function>ISERR</function></link>,
+        <link linkend="gnumeric-function-ISNA"><function>ISNA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ISEVEN">
+    <refentry id="gnumeric-function-ISEVEN">
       <refmeta>
         <refentrytitle>
           <function>ISEVEN</function>
@@ -8498,11 +8528,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ISODD"><function>ISODD</function></link>.
+        <para><link linkend="gnumeric-function-ISODD"><function>ISODD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ISFORMULA">
+    <refentry id="gnumeric-function-ISFORMULA">
       <refmeta>
         <refentrytitle>
           <function>ISFORMULA</function>
@@ -8529,11 +8559,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-GET.FORMULA"><function>GET.FORMULA</function></link>.
+        <para><link linkend="gnumeric-function-GET.FORMULA"><function>GET.FORMULA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ISLOGICAL">
+    <refentry id="gnumeric-function-ISLOGICAL">
       <refmeta>
         <refentrytitle>
           <function>ISLOGICAL</function>
@@ -8563,7 +8593,7 @@
         <para>This function is Excel compatible.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ISNA">
+    <refentry id="gnumeric-function-ISNA">
       <refmeta>
         <refentrytitle>
           <function>ISNA</function>
@@ -8590,11 +8620,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-NA"><function>NA</function></link>.
+        <para><link linkend="gnumeric-function-NA"><function>NA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ISNONTEXT">
+    <refentry id="gnumeric-function-ISNONTEXT">
       <refmeta>
         <refentrytitle>
           <function>ISNONTEXT</function>
@@ -8621,11 +8651,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ISTEXT"><function>ISTEXT</function></link>.
+        <para><link linkend="gnumeric-function-ISTEXT"><function>ISTEXT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ISNUMBER">
+    <refentry id="gnumeric-function-ISNUMBER">
       <refmeta>
         <refentrytitle>
           <function>ISNUMBER</function>
@@ -8655,7 +8685,7 @@
         <para>This function is Excel compatible.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ISODD">
+    <refentry id="gnumeric-function-ISODD">
       <refmeta>
         <refentrytitle>
           <function>ISODD</function>
@@ -8682,11 +8712,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ISEVEN"><function>ISEVEN</function></link>.
+        <para><link linkend="gnumeric-function-ISEVEN"><function>ISEVEN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ISREF">
+    <refentry id="gnumeric-function-ISREF">
       <refmeta>
         <refentrytitle>
           <function>ISREF</function>
@@ -8716,7 +8746,7 @@
         <para>This function is Excel compatible.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ISTEXT">
+    <refentry id="gnumeric-function-ISTEXT">
       <refmeta>
         <refentrytitle>
           <function>ISTEXT</function>
@@ -8743,11 +8773,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ISNONTEXT"><function>ISNONTEXT</function></link>.
+        <para><link linkend="gnumeric-function-ISNONTEXT"><function>ISNONTEXT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-N">
+    <refentry id="gnumeric-function-N">
       <refmeta>
         <refentrytitle>
           <function>N</function>
@@ -8776,7 +8806,7 @@
         <para>This function is Excel compatible.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NA">
+    <refentry id="gnumeric-function-NA">
       <refmeta>
         <refentrytitle>
           <function>NA</function>
@@ -8799,11 +8829,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ISNA"><function>ISNA</function></link>.
+        <para><link linkend="gnumeric-function-ISNA"><function>ISNA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TYPE">
+    <refentry id="gnumeric-function-TYPE">
       <refmeta>
         <refentrytitle>
           <function>TYPE</function>
@@ -8841,7 +8871,7 @@
   </sect1>
   <sect1 id="CATEGORY_Logic">
     <title>Logic</title>
-    <refentry id="gnumeric-AND">
+    <refentry id="gnumeric-function-AND">
       <refmeta>
         <refentrytitle>
           <function>AND</function>
@@ -8877,13 +8907,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OR"><function>OR</function></link>,
-        <link linkend="gnumeric-NOT"><function>NOT</function></link>,
-        <link linkend="gnumeric-IF"><function>IF</function></link>.
+        <para><link linkend="gnumeric-function-OR"><function>OR</function></link>,
+        <link linkend="gnumeric-function-NOT"><function>NOT</function></link>,
+        <link linkend="gnumeric-function-IF"><function>IF</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FALSE">
+    <refentry id="gnumeric-function-FALSE">
       <refmeta>
         <refentrytitle>
           <function>FALSE</function>
@@ -8910,12 +8940,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TRUE"><function>TRUE</function></link>,
-        <link linkend="gnumeric-IF"><function>IF</function></link>.
+        <para><link linkend="gnumeric-function-TRUE"><function>TRUE</function></link>,
+        <link linkend="gnumeric-function-IF"><function>IF</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IF">
+    <refentry id="gnumeric-function-IF">
       <refmeta>
         <refentrytitle>
           <function>IF</function>
@@ -8944,15 +8974,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AND"><function>AND</function></link>,
-        <link linkend="gnumeric-OR"><function>OR</function></link>,
-        <link linkend="gnumeric-XOR"><function>XOR</function></link>,
-        <link linkend="gnumeric-NOT"><function>NOT</function></link>,
-        <link linkend="gnumeric-IFERROR"><function>IFERROR</function></link>.
+        <para><link linkend="gnumeric-function-AND"><function>AND</function></link>,
+        <link linkend="gnumeric-function-OR"><function>OR</function></link>,
+        <link linkend="gnumeric-function-XOR"><function>XOR</function></link>,
+        <link linkend="gnumeric-function-NOT"><function>NOT</function></link>,
+        <link linkend="gnumeric-function-IFERROR"><function>IFERROR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IFERROR">
+    <refentry id="gnumeric-function-IFERROR">
       <refmeta>
         <refentrytitle>
           <function>IFERROR</function>
@@ -8980,12 +9010,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IF"><function>IF</function></link>,
-        <link linkend="gnumeric-ISERROR"><function>ISERROR</function></link>.
+        <para><link linkend="gnumeric-function-IF"><function>IF</function></link>,
+        <link linkend="gnumeric-function-ISERROR"><function>ISERROR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-IFNA">
+    <refentry id="gnumeric-function-IFNA">
       <refmeta>
         <refentrytitle>
           <function>IFNA</function>
@@ -9013,12 +9043,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IF"><function>IF</function></link>,
-        <link linkend="gnumeric-ISERROR"><function>ISERROR</function></link>.
+        <para><link linkend="gnumeric-function-IF"><function>IF</function></link>,
+        <link linkend="gnumeric-function-ISERROR"><function>ISERROR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NOT">
+    <refentry id="gnumeric-function-NOT">
       <refmeta>
         <refentrytitle>
           <function>NOT</function>
@@ -9053,13 +9083,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AND"><function>AND</function></link>,
-        <link linkend="gnumeric-OR"><function>OR</function></link>,
-        <link linkend="gnumeric-IF"><function>IF</function></link>.
+        <para><link linkend="gnumeric-function-AND"><function>AND</function></link>,
+        <link linkend="gnumeric-function-OR"><function>OR</function></link>,
+        <link linkend="gnumeric-function-IF"><function>IF</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OR">
+    <refentry id="gnumeric-function-OR">
       <refmeta>
         <refentrytitle>
           <function>OR</function>
@@ -9095,14 +9125,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AND"><function>AND</function></link>,
-        <link linkend="gnumeric-XOR"><function>XOR</function></link>,
-        <link linkend="gnumeric-NOT"><function>NOT</function></link>,
-        <link linkend="gnumeric-IF"><function>IF</function></link>.
+        <para><link linkend="gnumeric-function-AND"><function>AND</function></link>,
+        <link linkend="gnumeric-function-XOR"><function>XOR</function></link>,
+        <link linkend="gnumeric-function-NOT"><function>NOT</function></link>,
+        <link linkend="gnumeric-function-IF"><function>IF</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TRUE">
+    <refentry id="gnumeric-function-TRUE">
       <refmeta>
         <refentrytitle>
           <function>TRUE</function>
@@ -9129,12 +9159,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-FALSE"><function>FALSE</function></link>,
-        <link linkend="gnumeric-IF"><function>IF</function></link>.
+        <para><link linkend="gnumeric-function-FALSE"><function>FALSE</function></link>,
+        <link linkend="gnumeric-function-IF"><function>IF</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-XOR">
+    <refentry id="gnumeric-function-XOR">
       <refmeta>
         <refentrytitle>
           <function>XOR</function>
@@ -9166,17 +9196,17 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-OR"><function>OR</function></link>,
-        <link linkend="gnumeric-AND"><function>AND</function></link>,
-        <link linkend="gnumeric-NOT"><function>NOT</function></link>,
-        <link linkend="gnumeric-IF"><function>IF</function></link>.
+        <para><link linkend="gnumeric-function-OR"><function>OR</function></link>,
+        <link linkend="gnumeric-function-AND"><function>AND</function></link>,
+        <link linkend="gnumeric-function-NOT"><function>NOT</function></link>,
+        <link linkend="gnumeric-function-IF"><function>IF</function></link>.
       </para>
       </refsect1>
     </refentry>
   </sect1>
   <sect1 id="CATEGORY_Lookup">
     <title>Lookup</title>
-    <refentry id="gnumeric-ADDRESS">
+    <refentry id="gnumeric-function-ADDRESS">
       <refmeta>
         <refentrytitle>
           <function>ADDRESS</function>
@@ -9207,11 +9237,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COLUMNNUMBER"><function>COLUMNNUMBER</function></link>.
+        <para><link linkend="gnumeric-function-COLUMNNUMBER"><function>COLUMNNUMBER</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-AREAS">
+    <refentry id="gnumeric-function-AREAS">
       <refmeta>
         <refentrytitle>
           <function>AREAS</function>
@@ -9234,14 +9264,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ADDRESS"><function>ADDRESS</function></link>,
-        <link linkend="gnumeric-INDEX"><function>INDEX</function></link>,
-        <link linkend="gnumeric-INDIRECT"><function>INDIRECT</function></link>,
-        <link linkend="gnumeric-OFFSET"><function>OFFSET</function></link>.
+        <para><link linkend="gnumeric-function-ADDRESS"><function>ADDRESS</function></link>,
+        <link linkend="gnumeric-function-INDEX"><function>INDEX</function></link>,
+        <link linkend="gnumeric-function-INDIRECT"><function>INDIRECT</function></link>,
+        <link linkend="gnumeric-function-OFFSET"><function>OFFSET</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ARRAY">
+    <refentry id="gnumeric-function-ARRAY">
       <refmeta>
         <refentrytitle>
           <function>ARRAY</function>
@@ -9264,11 +9294,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TRANSPOSE"><function>TRANSPOSE</function></link>.
+        <para><link linkend="gnumeric-function-TRANSPOSE"><function>TRANSPOSE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CHOOSE">
+    <refentry id="gnumeric-function-CHOOSE">
       <refmeta>
         <refentrytitle>
           <function>CHOOSE</function>
@@ -9301,11 +9331,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-IF"><function>IF</function></link>.
+        <para><link linkend="gnumeric-function-IF"><function>IF</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COLUMN">
+    <refentry id="gnumeric-function-COLUMN">
       <refmeta>
         <refentrytitle>
           <function>COLUMN</function>
@@ -9336,13 +9366,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COLUMNS"><function>COLUMNS</function></link>,
-        <link linkend="gnumeric-ROW"><function>ROW</function></link>,
-        <link linkend="gnumeric-ROWS"><function>ROWS</function></link>.
+        <para><link linkend="gnumeric-function-COLUMNS"><function>COLUMNS</function></link>,
+        <link linkend="gnumeric-function-ROW"><function>ROW</function></link>,
+        <link linkend="gnumeric-function-ROWS"><function>ROWS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COLUMNNUMBER">
+    <refentry id="gnumeric-function-COLUMNNUMBER">
       <refmeta>
         <refentrytitle>
           <function>COLUMNNUMBER</function>
@@ -9369,11 +9399,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ADDRESS"><function>ADDRESS</function></link>.
+        <para><link linkend="gnumeric-function-ADDRESS"><function>ADDRESS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COLUMNS">
+    <refentry id="gnumeric-function-COLUMNS">
       <refmeta>
         <refentrytitle>
           <function>COLUMNS</function>
@@ -9400,13 +9430,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COLUMN"><function>COLUMN</function></link>,
-        <link linkend="gnumeric-ROW"><function>ROW</function></link>,
-        <link linkend="gnumeric-ROWS"><function>ROWS</function></link>.
+        <para><link linkend="gnumeric-function-COLUMN"><function>COLUMN</function></link>,
+        <link linkend="gnumeric-function-ROW"><function>ROW</function></link>,
+        <link linkend="gnumeric-function-ROWS"><function>ROWS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-HLOOKUP">
+    <refentry id="gnumeric-function-HLOOKUP">
       <refmeta>
         <refentrytitle>
           <function>HLOOKUP</function>
@@ -9441,11 +9471,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-VLOOKUP"><function>VLOOKUP</function></link>.
+        <para><link linkend="gnumeric-function-VLOOKUP"><function>VLOOKUP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-HYPERLINK">
+    <refentry id="gnumeric-function-HYPERLINK">
       <refmeta>
         <refentrytitle>
           <function>HYPERLINK</function>
@@ -9472,7 +9502,7 @@
         <para><function>HYPERLINK</function> function currently returns its 2nd argument, or if that is omitted the 1st argument.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-INDEX">
+    <refentry id="gnumeric-function-INDEX">
       <refmeta>
         <refentrytitle>
           <function>INDEX</function>
@@ -9505,7 +9535,7 @@
         <para>If the reference falls outside the range of <parameter>array</parameter>, <function>INDEX</function> returns #REF!</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-INDIRECT">
+    <refentry id="gnumeric-function-INDIRECT">
       <refmeta>
         <refentrytitle>
           <function>INDIRECT</function>
@@ -9533,13 +9563,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AREAS"><function>AREAS</function></link>,
-        <link linkend="gnumeric-INDEX"><function>INDEX</function></link>,
-        <link linkend="gnumeric-CELL"><function>CELL</function></link>.
+        <para><link linkend="gnumeric-function-AREAS"><function>AREAS</function></link>,
+        <link linkend="gnumeric-function-INDEX"><function>INDEX</function></link>,
+        <link linkend="gnumeric-function-CELL"><function>CELL</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LOOKUP">
+    <refentry id="gnumeric-function-LOOKUP">
       <refmeta>
         <refentrytitle>
           <function>LOOKUP</function>
@@ -9572,12 +9602,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-VLOOKUP"><function>VLOOKUP</function></link>,
-        <link linkend="gnumeric-HLOOKUP"><function>HLOOKUP</function></link>.
+        <para><link linkend="gnumeric-function-VLOOKUP"><function>VLOOKUP</function></link>,
+        <link linkend="gnumeric-function-HLOOKUP"><function>HLOOKUP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MATCH">
+    <refentry id="gnumeric-function-MATCH">
       <refmeta>
         <refentrytitle>
           <function>MATCH</function>
@@ -9610,11 +9640,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LOOKUP"><function>LOOKUP</function></link>.
+        <para><link linkend="gnumeric-function-LOOKUP"><function>LOOKUP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-OFFSET">
+    <refentry id="gnumeric-function-OFFSET">
       <refmeta>
         <refentrytitle>
           <function>OFFSET</function>
@@ -9649,16 +9679,16 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COLUMN"><function>COLUMN</function></link>,
-        <link linkend="gnumeric-COLUMNS"><function>COLUMNS</function></link>,
-        <link linkend="gnumeric-ROWS"><function>ROWS</function></link>,
-        <link linkend="gnumeric-INDEX"><function>INDEX</function></link>,
-        <link linkend="gnumeric-INDIRECT"><function>INDIRECT</function></link>,
-        <link linkend="gnumeric-ADDRESS"><function>ADDRESS</function></link>.
+        <para><link linkend="gnumeric-function-COLUMN"><function>COLUMN</function></link>,
+        <link linkend="gnumeric-function-COLUMNS"><function>COLUMNS</function></link>,
+        <link linkend="gnumeric-function-ROWS"><function>ROWS</function></link>,
+        <link linkend="gnumeric-function-INDEX"><function>INDEX</function></link>,
+        <link linkend="gnumeric-function-INDIRECT"><function>INDIRECT</function></link>,
+        <link linkend="gnumeric-function-ADDRESS"><function>ADDRESS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ROW">
+    <refentry id="gnumeric-function-ROW">
       <refmeta>
         <refentrytitle>
           <function>ROW</function>
@@ -9689,13 +9719,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COLUMN"><function>COLUMN</function></link>,
-        <link linkend="gnumeric-COLUMNS"><function>COLUMNS</function></link>,
-        <link linkend="gnumeric-ROWS"><function>ROWS</function></link>.
+        <para><link linkend="gnumeric-function-COLUMN"><function>COLUMN</function></link>,
+        <link linkend="gnumeric-function-COLUMNS"><function>COLUMNS</function></link>,
+        <link linkend="gnumeric-function-ROWS"><function>ROWS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ROWS">
+    <refentry id="gnumeric-function-ROWS">
       <refmeta>
         <refentrytitle>
           <function>ROWS</function>
@@ -9722,13 +9752,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COLUMN"><function>COLUMN</function></link>,
-        <link linkend="gnumeric-COLUMNS"><function>COLUMNS</function></link>,
-        <link linkend="gnumeric-ROW"><function>ROW</function></link>.
+        <para><link linkend="gnumeric-function-COLUMN"><function>COLUMN</function></link>,
+        <link linkend="gnumeric-function-COLUMNS"><function>COLUMNS</function></link>,
+        <link linkend="gnumeric-function-ROW"><function>ROW</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SHEET">
+    <refentry id="gnumeric-function-SHEET">
       <refmeta>
         <refentrytitle>
           <function>SHEET</function>
@@ -9755,13 +9785,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SHEETS"><function>SHEETS</function></link>,
-        <link linkend="gnumeric-ROW"><function>ROW</function></link>,
-        <link linkend="gnumeric-COLUMNNUMBER"><function>COLUMNNUMBER</function></link>.
+        <para><link linkend="gnumeric-function-SHEETS"><function>SHEETS</function></link>,
+        <link linkend="gnumeric-function-ROW"><function>ROW</function></link>,
+        <link linkend="gnumeric-function-COLUMNNUMBER"><function>COLUMNNUMBER</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SHEETS">
+    <refentry id="gnumeric-function-SHEETS">
       <refmeta>
         <refentrytitle>
           <function>SHEETS</function>
@@ -9788,12 +9818,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COLUMNS"><function>COLUMNS</function></link>,
-        <link linkend="gnumeric-ROWS"><function>ROWS</function></link>.
+        <para><link linkend="gnumeric-function-COLUMNS"><function>COLUMNS</function></link>,
+        <link linkend="gnumeric-function-ROWS"><function>ROWS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SORT">
+    <refentry id="gnumeric-function-SORT">
       <refmeta>
         <refentrytitle>
           <function>SORT</function>
@@ -9821,11 +9851,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ARRAY"><function>ARRAY</function></link>.
+        <para><link linkend="gnumeric-function-ARRAY"><function>ARRAY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TRANSPOSE">
+    <refentry id="gnumeric-function-TRANSPOSE">
       <refmeta>
         <refentrytitle>
           <function>TRANSPOSE</function>
@@ -9848,11 +9878,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MMULT"><function>MMULT</function></link>.
+        <para><link linkend="gnumeric-function-MMULT"><function>MMULT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-VLOOKUP">
+    <refentry id="gnumeric-function-VLOOKUP">
       <refmeta>
         <refentrytitle>
           <function>VLOOKUP</function>
@@ -9887,14 +9917,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-HLOOKUP"><function>HLOOKUP</function></link>.
+        <para><link linkend="gnumeric-function-HLOOKUP"><function>HLOOKUP</function></link>.
       </para>
       </refsect1>
     </refentry>
   </sect1>
   <sect1 id="CATEGORY_Mathematics">
     <title>Mathematics</title>
-    <refentry id="gnumeric-ABS">
+    <refentry id="gnumeric-function-ABS">
       <refmeta>
         <refentrytitle>
           <function>ABS</function>
@@ -9925,15 +9955,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CEIL"><function>CEIL</function></link>,
-        <link linkend="gnumeric-CEILING"><function>CEILING</function></link>,
-        <link linkend="gnumeric-FLOOR"><function>FLOOR</function></link>,
-        <link linkend="gnumeric-INT"><function>INT</function></link>,
-        <link linkend="gnumeric-MOD"><function>MOD</function></link>.
+        <para><link linkend="gnumeric-function-CEIL"><function>CEIL</function></link>,
+        <link linkend="gnumeric-function-CEILING"><function>CEILING</function></link>,
+        <link linkend="gnumeric-function-FLOOR"><function>FLOOR</function></link>,
+        <link linkend="gnumeric-function-INT"><function>INT</function></link>,
+        <link linkend="gnumeric-function-MOD"><function>MOD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ACOS">
+    <refentry id="gnumeric-function-ACOS">
       <refmeta>
         <refentrytitle>
           <function>ACOS</function>
@@ -9960,14 +9990,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COS"><function>COS</function></link>,
-        <link linkend="gnumeric-SIN"><function>SIN</function></link>,
-        <link linkend="gnumeric-DEGREES"><function>DEGREES</function></link>,
-        <link linkend="gnumeric-RADIANS"><function>RADIANS</function></link>.
+        <para><link linkend="gnumeric-function-COS"><function>COS</function></link>,
+        <link linkend="gnumeric-function-SIN"><function>SIN</function></link>,
+        <link linkend="gnumeric-function-DEGREES"><function>DEGREES</function></link>,
+        <link linkend="gnumeric-function-RADIANS"><function>RADIANS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ACOSH">
+    <refentry id="gnumeric-function-ACOSH">
       <refmeta>
         <refentrytitle>
           <function>ACOSH</function>
@@ -9994,12 +10024,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ACOS"><function>ACOS</function></link>,
-        <link linkend="gnumeric-ASINH"><function>ASINH</function></link>.
+        <para><link linkend="gnumeric-function-ACOS"><function>ACOS</function></link>,
+        <link linkend="gnumeric-function-ASINH"><function>ASINH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ACOT">
+    <refentry id="gnumeric-function-ACOT">
       <refmeta>
         <refentrytitle>
           <function>ACOT</function>
@@ -10022,12 +10052,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COT"><function>COT</function></link>,
-        <link linkend="gnumeric-TAN"><function>TAN</function></link>.
+        <para><link linkend="gnumeric-function-COT"><function>COT</function></link>,
+        <link linkend="gnumeric-function-TAN"><function>TAN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ACOTH">
+    <refentry id="gnumeric-function-ACOTH">
       <refmeta>
         <refentrytitle>
           <function>ACOTH</function>
@@ -10050,12 +10080,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COTH"><function>COTH</function></link>,
-        <link linkend="gnumeric-TANH"><function>TANH</function></link>.
+        <para><link linkend="gnumeric-function-COTH"><function>COTH</function></link>,
+        <link linkend="gnumeric-function-TANH"><function>TANH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ARABIC">
+    <refentry id="gnumeric-function-ARABIC">
       <refmeta>
         <refentrytitle>
           <function>ARABIC</function>
@@ -10086,11 +10116,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ROMAN"><function>ROMAN</function></link>.
+        <para><link linkend="gnumeric-function-ROMAN"><function>ROMAN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ASIN">
+    <refentry id="gnumeric-function-ASIN">
       <refmeta>
         <refentrytitle>
           <function>ASIN</function>
@@ -10125,15 +10155,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SIN"><function>SIN</function></link>,
-        <link linkend="gnumeric-COS"><function>COS</function></link>,
-        <link linkend="gnumeric-ASINH"><function>ASINH</function></link>,
-        <link linkend="gnumeric-DEGREES"><function>DEGREES</function></link>,
-        <link linkend="gnumeric-RADIANS"><function>RADIANS</function></link>.
+        <para><link linkend="gnumeric-function-SIN"><function>SIN</function></link>,
+        <link linkend="gnumeric-function-COS"><function>COS</function></link>,
+        <link linkend="gnumeric-function-ASINH"><function>ASINH</function></link>,
+        <link linkend="gnumeric-function-DEGREES"><function>DEGREES</function></link>,
+        <link linkend="gnumeric-function-RADIANS"><function>RADIANS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ASINH">
+    <refentry id="gnumeric-function-ASINH">
       <refmeta>
         <refentrytitle>
           <function>ASINH</function>
@@ -10164,14 +10194,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ASIN"><function>ASIN</function></link>,
-        <link linkend="gnumeric-ACOSH"><function>ACOSH</function></link>,
-        <link linkend="gnumeric-SIN"><function>SIN</function></link>,
-        <link linkend="gnumeric-COS"><function>COS</function></link>.
+        <para><link linkend="gnumeric-function-ASIN"><function>ASIN</function></link>,
+        <link linkend="gnumeric-function-ACOSH"><function>ACOSH</function></link>,
+        <link linkend="gnumeric-function-SIN"><function>SIN</function></link>,
+        <link linkend="gnumeric-function-COS"><function>COS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ATAN">
+    <refentry id="gnumeric-function-ATAN">
       <refmeta>
         <refentrytitle>
           <function>ATAN</function>
@@ -10206,15 +10236,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TAN"><function>TAN</function></link>,
-        <link linkend="gnumeric-COS"><function>COS</function></link>,
-        <link linkend="gnumeric-SIN"><function>SIN</function></link>,
-        <link linkend="gnumeric-DEGREES"><function>DEGREES</function></link>,
-        <link linkend="gnumeric-RADIANS"><function>RADIANS</function></link>.
+        <para><link linkend="gnumeric-function-TAN"><function>TAN</function></link>,
+        <link linkend="gnumeric-function-COS"><function>COS</function></link>,
+        <link linkend="gnumeric-function-SIN"><function>SIN</function></link>,
+        <link linkend="gnumeric-function-DEGREES"><function>DEGREES</function></link>,
+        <link linkend="gnumeric-function-RADIANS"><function>RADIANS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ATAN2">
+    <refentry id="gnumeric-function-ATAN2">
       <refmeta>
         <refentrytitle>
           <function>ATAN2</function>
@@ -10254,14 +10284,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ATAN"><function>ATAN</function></link>,
-        <link linkend="gnumeric-ATANH"><function>ATANH</function></link>,
-        <link linkend="gnumeric-COS"><function>COS</function></link>,
-        <link linkend="gnumeric-SIN"><function>SIN</function></link>.
+        <para><link linkend="gnumeric-function-ATAN"><function>ATAN</function></link>,
+        <link linkend="gnumeric-function-ATANH"><function>ATANH</function></link>,
+        <link linkend="gnumeric-function-COS"><function>COS</function></link>,
+        <link linkend="gnumeric-function-SIN"><function>SIN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ATANH">
+    <refentry id="gnumeric-function-ATANH">
       <refmeta>
         <refentrytitle>
           <function>ATANH</function>
@@ -10296,13 +10326,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ATAN"><function>ATAN</function></link>,
-        <link linkend="gnumeric-COS"><function>COS</function></link>,
-        <link linkend="gnumeric-SIN"><function>SIN</function></link>.
+        <para><link linkend="gnumeric-function-ATAN"><function>ATAN</function></link>,
+        <link linkend="gnumeric-function-COS"><function>COS</function></link>,
+        <link linkend="gnumeric-function-SIN"><function>SIN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-AVERAGEIF">
+    <refentry id="gnumeric-function-AVERAGEIF">
       <refmeta>
         <refentrytitle>
           <function>AVERAGEIF</function>
@@ -10331,12 +10361,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SUMIF"><function>SUMIF</function></link>,
-        <link linkend="gnumeric-COUNTIF"><function>COUNTIF</function></link>.
+        <para><link linkend="gnumeric-function-SUMIF"><function>SUMIF</function></link>,
+        <link linkend="gnumeric-function-COUNTIF"><function>COUNTIF</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BETA">
+    <refentry id="gnumeric-function-BETA">
       <refmeta>
         <refentrytitle>
           <function>BETA</function>
@@ -10368,12 +10398,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BETALN"><function>BETALN</function></link>,
-        <link linkend="gnumeric-GAMMALN"><function>GAMMALN</function></link>.
+        <para><link linkend="gnumeric-function-BETALN"><function>BETALN</function></link>,
+        <link linkend="gnumeric-function-GAMMALN"><function>GAMMALN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BETALN">
+    <refentry id="gnumeric-function-BETALN">
       <refmeta>
         <refentrytitle>
           <function>BETALN</function>
@@ -10405,12 +10435,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BETA"><function>BETA</function></link>,
-        <link linkend="gnumeric-GAMMALN"><function>GAMMALN</function></link>.
+        <para><link linkend="gnumeric-function-BETA"><function>BETA</function></link>,
+        <link linkend="gnumeric-function-GAMMALN"><function>GAMMALN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CEIL">
+    <refentry id="gnumeric-function-CEIL">
       <refmeta>
         <refentrytitle>
           <function>CEIL</function>
@@ -10441,15 +10471,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CEILING"><function>CEILING</function></link>,
-        <link linkend="gnumeric-FLOOR"><function>FLOOR</function></link>,
-        <link linkend="gnumeric-ABS"><function>ABS</function></link>,
-        <link linkend="gnumeric-INT"><function>INT</function></link>,
-        <link linkend="gnumeric-MOD"><function>MOD</function></link>.
+        <para><link linkend="gnumeric-function-CEILING"><function>CEILING</function></link>,
+        <link linkend="gnumeric-function-FLOOR"><function>FLOOR</function></link>,
+        <link linkend="gnumeric-function-ABS"><function>ABS</function></link>,
+        <link linkend="gnumeric-function-INT"><function>INT</function></link>,
+        <link linkend="gnumeric-function-MOD"><function>MOD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CEILING">
+    <refentry id="gnumeric-function-CEILING">
       <refmeta>
         <refentrytitle>
           <function>CEILING</function>
@@ -10489,15 +10519,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CEIL"><function>CEIL</function></link>,
-        <link linkend="gnumeric-FLOOR"><function>FLOOR</function></link>,
-        <link linkend="gnumeric-ABS"><function>ABS</function></link>,
-        <link linkend="gnumeric-INT"><function>INT</function></link>,
-        <link linkend="gnumeric-MOD"><function>MOD</function></link>.
+        <para><link linkend="gnumeric-function-CEIL"><function>CEIL</function></link>,
+        <link linkend="gnumeric-function-FLOOR"><function>FLOOR</function></link>,
+        <link linkend="gnumeric-function-ABS"><function>ABS</function></link>,
+        <link linkend="gnumeric-function-INT"><function>INT</function></link>,
+        <link linkend="gnumeric-function-MOD"><function>MOD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CHOLESKY">
+    <refentry id="gnumeric-function-CHOLESKY">
       <refmeta>
         <refentrytitle>
           <function>CHOLESKY</function>
@@ -10524,13 +10554,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MINVERSE"><function>MINVERSE</function></link>,
-        <link linkend="gnumeric-MMULT"><function>MMULT</function></link>,
-        <link linkend="gnumeric-MDETERM"><function>MDETERM</function></link>.
+        <para><link linkend="gnumeric-function-MINVERSE"><function>MINVERSE</function></link>,
+        <link linkend="gnumeric-function-MMULT"><function>MMULT</function></link>,
+        <link linkend="gnumeric-function-MDETERM"><function>MDETERM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COMBIN">
+    <refentry id="gnumeric-function-COMBIN">
       <refmeta>
         <refentrytitle>
           <function>COMBIN</function>
@@ -10569,7 +10599,7 @@
         <para>This function is OpenFormula compatible.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COMBINA">
+    <refentry id="gnumeric-function-COMBINA">
       <refmeta>
         <refentrytitle>
           <function>COMBINA</function>
@@ -10597,11 +10627,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COMBIN"><function>COMBIN</function></link>.
+        <para><link linkend="gnumeric-function-COMBIN"><function>COMBIN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COS">
+    <refentry id="gnumeric-function-COS">
       <refmeta>
         <refentrytitle>
           <function>COS</function>
@@ -10628,17 +10658,17 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SIN"><function>SIN</function></link>,
-        <link linkend="gnumeric-TAN"><function>TAN</function></link>,
-        <link linkend="gnumeric-SINH"><function>SINH</function></link>,
-        <link linkend="gnumeric-COSH"><function>COSH</function></link>,
-        <link linkend="gnumeric-TANH"><function>TANH</function></link>,
-        <link linkend="gnumeric-RADIANS"><function>RADIANS</function></link>,
-        <link linkend="gnumeric-DEGREES"><function>DEGREES</function></link>.
+        <para><link linkend="gnumeric-function-SIN"><function>SIN</function></link>,
+        <link linkend="gnumeric-function-TAN"><function>TAN</function></link>,
+        <link linkend="gnumeric-function-SINH"><function>SINH</function></link>,
+        <link linkend="gnumeric-function-COSH"><function>COSH</function></link>,
+        <link linkend="gnumeric-function-TANH"><function>TANH</function></link>,
+        <link linkend="gnumeric-function-RADIANS"><function>RADIANS</function></link>,
+        <link linkend="gnumeric-function-DEGREES"><function>DEGREES</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COSH">
+    <refentry id="gnumeric-function-COSH">
       <refmeta>
         <refentrytitle>
           <function>COSH</function>
@@ -10665,15 +10695,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SIN"><function>SIN</function></link>,
-        <link linkend="gnumeric-TAN"><function>TAN</function></link>,
-        <link linkend="gnumeric-SINH"><function>SINH</function></link>,
-        <link linkend="gnumeric-COSH"><function>COSH</function></link>,
-        <link linkend="gnumeric-TANH"><function>TANH</function></link>.
+        <para><link linkend="gnumeric-function-SIN"><function>SIN</function></link>,
+        <link linkend="gnumeric-function-TAN"><function>TAN</function></link>,
+        <link linkend="gnumeric-function-SINH"><function>SINH</function></link>,
+        <link linkend="gnumeric-function-COSH"><function>COSH</function></link>,
+        <link linkend="gnumeric-function-TANH"><function>TANH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COT">
+    <refentry id="gnumeric-function-COT">
       <refmeta>
         <refentrytitle>
           <function>COT</function>
@@ -10696,12 +10726,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TAN"><function>TAN</function></link>,
-        <link linkend="gnumeric-ACOT"><function>ACOT</function></link>.
+        <para><link linkend="gnumeric-function-TAN"><function>TAN</function></link>,
+        <link linkend="gnumeric-function-ACOT"><function>ACOT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COTH">
+    <refentry id="gnumeric-function-COTH">
       <refmeta>
         <refentrytitle>
           <function>COTH</function>
@@ -10724,12 +10754,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TANH"><function>TANH</function></link>,
-        <link linkend="gnumeric-ACOTH"><function>ACOTH</function></link>.
+        <para><link linkend="gnumeric-function-TANH"><function>TANH</function></link>,
+        <link linkend="gnumeric-function-ACOTH"><function>ACOTH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COUNTIF">
+    <refentry id="gnumeric-function-COUNTIF">
       <refmeta>
         <refentrytitle>
           <function>COUNTIF</function>
@@ -10757,12 +10787,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COUNT"><function>COUNT</function></link>,
-        <link linkend="gnumeric-SUMIF"><function>SUMIF</function></link>.
+        <para><link linkend="gnumeric-function-COUNT"><function>COUNT</function></link>,
+        <link linkend="gnumeric-function-SUMIF"><function>SUMIF</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CSC">
+    <refentry id="gnumeric-function-CSC">
       <refmeta>
         <refentrytitle>
           <function>CSC</function>
@@ -10793,19 +10823,19 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SIN"><function>SIN</function></link>,
-        <link linkend="gnumeric-COS"><function>COS</function></link>,
-        <link linkend="gnumeric-TAN"><function>TAN</function></link>,
-        <link linkend="gnumeric-SEC"><function>SEC</function></link>,
-        <link linkend="gnumeric-SINH"><function>SINH</function></link>,
-        <link linkend="gnumeric-COSH"><function>COSH</function></link>,
-        <link linkend="gnumeric-TANH"><function>TANH</function></link>,
-        <link linkend="gnumeric-RADIANS"><function>RADIANS</function></link>,
-        <link linkend="gnumeric-DEGREES"><function>DEGREES</function></link>.
+        <para><link linkend="gnumeric-function-SIN"><function>SIN</function></link>,
+        <link linkend="gnumeric-function-COS"><function>COS</function></link>,
+        <link linkend="gnumeric-function-TAN"><function>TAN</function></link>,
+        <link linkend="gnumeric-function-SEC"><function>SEC</function></link>,
+        <link linkend="gnumeric-function-SINH"><function>SINH</function></link>,
+        <link linkend="gnumeric-function-COSH"><function>COSH</function></link>,
+        <link linkend="gnumeric-function-TANH"><function>TANH</function></link>,
+        <link linkend="gnumeric-function-RADIANS"><function>RADIANS</function></link>,
+        <link linkend="gnumeric-function-DEGREES"><function>DEGREES</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CSCH">
+    <refentry id="gnumeric-function-CSCH">
       <refmeta>
         <refentrytitle>
           <function>CSCH</function>
@@ -10836,18 +10866,18 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SIN"><function>SIN</function></link>,
-        <link linkend="gnumeric-COS"><function>COS</function></link>,
-        <link linkend="gnumeric-TAN"><function>TAN</function></link>,
-        <link linkend="gnumeric-CSC"><function>CSC</function></link>,
-        <link linkend="gnumeric-SEC"><function>SEC</function></link>,
-        <link linkend="gnumeric-SINH"><function>SINH</function></link>,
-        <link linkend="gnumeric-COSH"><function>COSH</function></link>,
-        <link linkend="gnumeric-TANH"><function>TANH</function></link>.
+        <para><link linkend="gnumeric-function-SIN"><function>SIN</function></link>,
+        <link linkend="gnumeric-function-COS"><function>COS</function></link>,
+        <link linkend="gnumeric-function-TAN"><function>TAN</function></link>,
+        <link linkend="gnumeric-function-CSC"><function>CSC</function></link>,
+        <link linkend="gnumeric-function-SEC"><function>SEC</function></link>,
+        <link linkend="gnumeric-function-SINH"><function>SINH</function></link>,
+        <link linkend="gnumeric-function-COSH"><function>COSH</function></link>,
+        <link linkend="gnumeric-function-TANH"><function>TANH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DEGREES">
+    <refentry id="gnumeric-function-DEGREES">
       <refmeta>
         <refentrytitle>
           <function>DEGREES</function>
@@ -10874,12 +10904,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RADIANS"><function>RADIANS</function></link>,
-        <link linkend="gnumeric-PI"><function>PI</function></link>.
+        <para><link linkend="gnumeric-function-RADIANS"><function>RADIANS</function></link>,
+        <link linkend="gnumeric-function-PI"><function>PI</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-EIGEN">
+    <refentry id="gnumeric-function-EIGEN">
       <refmeta>
         <refentrytitle>
           <function>EIGEN</function>
@@ -10905,7 +10935,7 @@
         <para>If <parameter>matrix</parameter> is not symmetric, <function>EIGEN</function> returns #NUM! If <parameter>matrix</parameter> does not contain an equal number of columns and rows, <function>EIGEN</function> returns #VALUE!</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-EVEN">
+    <refentry id="gnumeric-function-EVEN">
       <refmeta>
         <refentrytitle>
           <function>EVEN</function>
@@ -10931,11 +10961,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ODD"><function>ODD</function></link>.
+        <para><link linkend="gnumeric-function-ODD"><function>ODD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-EXP">
+    <refentry id="gnumeric-function-EXP">
       <refmeta>
         <refentrytitle>
           <function>EXP</function>
@@ -10966,13 +10996,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LOG"><function>LOG</function></link>,
-        <link linkend="gnumeric-LOG2"><function>LOG2</function></link>,
-        <link linkend="gnumeric-LOG10"><function>LOG10</function></link>.
+        <para><link linkend="gnumeric-function-LOG"><function>LOG</function></link>,
+        <link linkend="gnumeric-function-LOG2"><function>LOG2</function></link>,
+        <link linkend="gnumeric-function-LOG10"><function>LOG10</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-EXPM1">
+    <refentry id="gnumeric-function-EXPM1">
       <refmeta>
         <refentrytitle>
           <function>EXPM1</function>
@@ -10999,12 +11029,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EXP"><function>EXP</function></link>,
-        <link linkend="gnumeric-LN1P"><function>LN1P</function></link>.
+        <para><link linkend="gnumeric-function-EXP"><function>EXP</function></link>,
+        <link linkend="gnumeric-function-LN1P"><function>LN1P</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FACT">
+    <refentry id="gnumeric-function-FACT">
       <refmeta>
         <refentrytitle>
           <function>FACT</function>
@@ -11034,7 +11064,7 @@
         <para>This function is Excel compatible.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FACTDOUBLE">
+    <refentry id="gnumeric-function-FACTDOUBLE">
       <refmeta>
         <refentrytitle>
           <function>FACTDOUBLE</function>
@@ -11069,11 +11099,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-FACT"><function>FACT</function></link>.
+        <para><link linkend="gnumeric-function-FACT"><function>FACT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FIB">
+    <refentry id="gnumeric-function-FIB">
       <refmeta>
         <refentrytitle>
           <function>FIB</function>
@@ -11103,7 +11133,7 @@
         <para>If <parameter>n</parameter> is not an integer, it is truncated. If it is negative or zero <function>FIB</function> returns #NUM!</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FLOOR">
+    <refentry id="gnumeric-function-FLOOR">
       <refmeta>
         <refentrytitle>
           <function>FLOOR</function>
@@ -11139,15 +11169,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CEIL"><function>CEIL</function></link>,
-        <link linkend="gnumeric-CEILING"><function>CEILING</function></link>,
-        <link linkend="gnumeric-ABS"><function>ABS</function></link>,
-        <link linkend="gnumeric-INT"><function>INT</function></link>,
-        <link linkend="gnumeric-MOD"><function>MOD</function></link>.
+        <para><link linkend="gnumeric-function-CEIL"><function>CEIL</function></link>,
+        <link linkend="gnumeric-function-CEILING"><function>CEILING</function></link>,
+        <link linkend="gnumeric-function-ABS"><function>ABS</function></link>,
+        <link linkend="gnumeric-function-INT"><function>INT</function></link>,
+        <link linkend="gnumeric-function-MOD"><function>MOD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-G_PRODUCT">
+    <refentry id="gnumeric-function-G_PRODUCT">
       <refmeta>
         <refentrytitle>
           <function>G_PRODUCT</function>
@@ -11175,12 +11205,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SUM"><function>SUM</function></link>,
-        <link linkend="gnumeric-COUNT"><function>COUNT</function></link>.
+        <para><link linkend="gnumeric-function-SUM"><function>SUM</function></link>,
+        <link linkend="gnumeric-function-COUNT"><function>COUNT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-GAMMA">
+    <refentry id="gnumeric-function-GAMMA">
       <refmeta>
         <refentrytitle>
           <function>GAMMA</function>
@@ -11203,11 +11233,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-GAMMALN"><function>GAMMALN</function></link>.
+        <para><link linkend="gnumeric-function-GAMMALN"><function>GAMMALN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-GAMMALN">
+    <refentry id="gnumeric-function-GAMMALN">
       <refmeta>
         <refentrytitle>
           <function>GAMMALN</function>
@@ -11234,11 +11264,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-GAMMA"><function>GAMMA</function></link>.
+        <para><link linkend="gnumeric-function-GAMMA"><function>GAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-GCD">
+    <refentry id="gnumeric-function-GCD">
       <refmeta>
         <refentrytitle>
           <function>GCD</function>
@@ -11274,11 +11304,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LCM"><function>LCM</function></link>.
+        <para><link linkend="gnumeric-function-LCM"><function>LCM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-GD">
+    <refentry id="gnumeric-function-GD">
       <refmeta>
         <refentrytitle>
           <function>GD</function>
@@ -11301,12 +11331,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TAN"><function>TAN</function></link>,
-        <link linkend="gnumeric-TANH"><function>TANH</function></link>.
+        <para><link linkend="gnumeric-function-TAN"><function>TAN</function></link>,
+        <link linkend="gnumeric-function-TANH"><function>TANH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-HYPOT">
+    <refentry id="gnumeric-function-HYPOT">
       <refmeta>
         <refentrytitle>
           <function>HYPOT</function>
@@ -11330,12 +11360,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MIN"><function>MIN</function></link>,
-        <link linkend="gnumeric-MAX"><function>MAX</function></link>.
+        <para><link linkend="gnumeric-function-MIN"><function>MIN</function></link>,
+        <link linkend="gnumeric-function-MAX"><function>MAX</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-INT">
+    <refentry id="gnumeric-function-INT">
       <refmeta>
         <refentrytitle>
           <function>INT</function>
@@ -11362,15 +11392,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CEIL"><function>CEIL</function></link>,
-        <link linkend="gnumeric-CEILING"><function>CEILING</function></link>,
-        <link linkend="gnumeric-FLOOR"><function>FLOOR</function></link>,
-        <link linkend="gnumeric-ABS"><function>ABS</function></link>,
-        <link linkend="gnumeric-MOD"><function>MOD</function></link>.
+        <para><link linkend="gnumeric-function-CEIL"><function>CEIL</function></link>,
+        <link linkend="gnumeric-function-CEILING"><function>CEILING</function></link>,
+        <link linkend="gnumeric-function-FLOOR"><function>FLOOR</function></link>,
+        <link linkend="gnumeric-function-ABS"><function>ABS</function></link>,
+        <link linkend="gnumeric-function-MOD"><function>MOD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LCM">
+    <refentry id="gnumeric-function-LCM">
       <refmeta>
         <refentrytitle>
           <function>LCM</function>
@@ -11406,11 +11436,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-GCD"><function>GCD</function></link>.
+        <para><link linkend="gnumeric-function-GCD"><function>GCD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LN">
+    <refentry id="gnumeric-function-LN">
       <refmeta>
         <refentrytitle>
           <function>LN</function>
@@ -11441,13 +11471,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EXP"><function>EXP</function></link>,
-        <link linkend="gnumeric-LOG2"><function>LOG2</function></link>,
-        <link linkend="gnumeric-LOG10"><function>LOG10</function></link>.
+        <para><link linkend="gnumeric-function-EXP"><function>EXP</function></link>,
+        <link linkend="gnumeric-function-LOG2"><function>LOG2</function></link>,
+        <link linkend="gnumeric-function-LOG10"><function>LOG10</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LN1P">
+    <refentry id="gnumeric-function-LN1P">
       <refmeta>
         <refentrytitle>
           <function>LN1P</function>
@@ -11482,13 +11512,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EXP"><function>EXP</function></link>,
-        <link linkend="gnumeric-LN"><function>LN</function></link>,
-        <link linkend="gnumeric-EXPM1"><function>EXPM1</function></link>.
+        <para><link linkend="gnumeric-function-EXP"><function>EXP</function></link>,
+        <link linkend="gnumeric-function-LN"><function>LN</function></link>,
+        <link linkend="gnumeric-function-EXPM1"><function>EXPM1</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LOG">
+    <refentry id="gnumeric-function-LOG">
       <refmeta>
         <refentrytitle>
           <function>LOG</function>
@@ -11520,13 +11550,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LN"><function>LN</function></link>,
-        <link linkend="gnumeric-LOG2"><function>LOG2</function></link>,
-        <link linkend="gnumeric-LOG10"><function>LOG10</function></link>.
+        <para><link linkend="gnumeric-function-LN"><function>LN</function></link>,
+        <link linkend="gnumeric-function-LOG2"><function>LOG2</function></link>,
+        <link linkend="gnumeric-function-LOG10"><function>LOG10</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LOG10">
+    <refentry id="gnumeric-function-LOG10">
       <refmeta>
         <refentrytitle>
           <function>LOG10</function>
@@ -11553,13 +11583,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EXP"><function>EXP</function></link>,
-        <link linkend="gnumeric-LOG2"><function>LOG2</function></link>,
-        <link linkend="gnumeric-LOG"><function>LOG</function></link>.
+        <para><link linkend="gnumeric-function-EXP"><function>EXP</function></link>,
+        <link linkend="gnumeric-function-LOG2"><function>LOG2</function></link>,
+        <link linkend="gnumeric-function-LOG"><function>LOG</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LOG2">
+    <refentry id="gnumeric-function-LOG2">
       <refmeta>
         <refentrytitle>
           <function>LOG2</function>
@@ -11586,13 +11616,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EXP"><function>EXP</function></link>,
-        <link linkend="gnumeric-LOG10"><function>LOG10</function></link>,
-        <link linkend="gnumeric-LOG"><function>LOG</function></link>.
+        <para><link linkend="gnumeric-function-EXP"><function>EXP</function></link>,
+        <link linkend="gnumeric-function-LOG10"><function>LOG10</function></link>,
+        <link linkend="gnumeric-function-LOG"><function>LOG</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MDETERM">
+    <refentry id="gnumeric-function-MDETERM">
       <refmeta>
         <refentrytitle>
           <function>MDETERM</function>
@@ -11619,12 +11649,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MMULT"><function>MMULT</function></link>,
-        <link linkend="gnumeric-MINVERSE"><function>MINVERSE</function></link>.
+        <para><link linkend="gnumeric-function-MMULT"><function>MMULT</function></link>,
+        <link linkend="gnumeric-function-MINVERSE"><function>MINVERSE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MINVERSE">
+    <refentry id="gnumeric-function-MINVERSE">
       <refmeta>
         <refentrytitle>
           <function>MINVERSE</function>
@@ -11655,12 +11685,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MMULT"><function>MMULT</function></link>,
-        <link linkend="gnumeric-MDETERM"><function>MDETERM</function></link>.
+        <para><link linkend="gnumeric-function-MMULT"><function>MMULT</function></link>,
+        <link linkend="gnumeric-function-MDETERM"><function>MDETERM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MMULT">
+    <refentry id="gnumeric-function-MMULT">
       <refmeta>
         <refentrytitle>
           <function>MMULT</function>
@@ -11688,12 +11718,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TRANSPOSE"><function>TRANSPOSE</function></link>,
-        <link linkend="gnumeric-MINVERSE"><function>MINVERSE</function></link>.
+        <para><link linkend="gnumeric-function-TRANSPOSE"><function>TRANSPOSE</function></link>,
+        <link linkend="gnumeric-function-MINVERSE"><function>MINVERSE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MOD">
+    <refentry id="gnumeric-function-MOD">
       <refmeta>
         <refentrytitle>
           <function>MOD</function>
@@ -11729,16 +11759,16 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CEIL"><function>CEIL</function></link>,
-        <link linkend="gnumeric-CEILING"><function>CEILING</function></link>,
-        <link linkend="gnumeric-FLOOR"><function>FLOOR</function></link>,
-        <link linkend="gnumeric-ABS"><function>ABS</function></link>,
-        <link linkend="gnumeric-INT"><function>INT</function></link>,
-        <link linkend="gnumeric-ABS"><function>ABS</function></link>.
+        <para><link linkend="gnumeric-function-CEIL"><function>CEIL</function></link>,
+        <link linkend="gnumeric-function-CEILING"><function>CEILING</function></link>,
+        <link linkend="gnumeric-function-FLOOR"><function>FLOOR</function></link>,
+        <link linkend="gnumeric-function-ABS"><function>ABS</function></link>,
+        <link linkend="gnumeric-function-INT"><function>INT</function></link>,
+        <link linkend="gnumeric-function-ABS"><function>ABS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MROUND">
+    <refentry id="gnumeric-function-MROUND">
       <refmeta>
         <refentrytitle>
           <function>MROUND</function>
@@ -11769,13 +11799,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ROUNDDOWN"><function>ROUNDDOWN</function></link>,
-        <link linkend="gnumeric-ROUND"><function>ROUND</function></link>,
-        <link linkend="gnumeric-ROUNDUP"><function>ROUNDUP</function></link>.
+        <para><link linkend="gnumeric-function-ROUNDDOWN"><function>ROUNDDOWN</function></link>,
+        <link linkend="gnumeric-function-ROUND"><function>ROUND</function></link>,
+        <link linkend="gnumeric-function-ROUNDUP"><function>ROUNDUP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MULTINOMIAL">
+    <refentry id="gnumeric-function-MULTINOMIAL">
       <refmeta>
         <refentrytitle>
           <function>MULTINOMIAL</function>
@@ -11804,12 +11834,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COMBIN"><function>COMBIN</function></link>,
-        <link linkend="gnumeric-SUM"><function>SUM</function></link>.
+        <para><link linkend="gnumeric-function-COMBIN"><function>COMBIN</function></link>,
+        <link linkend="gnumeric-function-SUM"><function>SUM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MUNIT">
+    <refentry id="gnumeric-function-MUNIT">
       <refmeta>
         <refentrytitle>
           <function>MUNIT</function>
@@ -11836,13 +11866,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MMULT"><function>MMULT</function></link>,
-        <link linkend="gnumeric-MDETERM"><function>MDETERM</function></link>,
-        <link linkend="gnumeric-MINVERSE"><function>MINVERSE</function></link>.
+        <para><link linkend="gnumeric-function-MMULT"><function>MMULT</function></link>,
+        <link linkend="gnumeric-function-MDETERM"><function>MDETERM</function></link>,
+        <link linkend="gnumeric-function-MINVERSE"><function>MINVERSE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ODD">
+    <refentry id="gnumeric-function-ODD">
       <refmeta>
         <refentrytitle>
           <function>ODD</function>
@@ -11868,11 +11898,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EVEN"><function>EVEN</function></link>.
+        <para><link linkend="gnumeric-function-EVEN"><function>EVEN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PI">
+    <refentry id="gnumeric-function-PI">
       <refmeta>
         <refentrytitle>
           <function>PI</function>
@@ -11895,11 +11925,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SQRTPI"><function>SQRTPI</function></link>.
+        <para><link linkend="gnumeric-function-SQRTPI"><function>SQRTPI</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-POWER">
+    <refentry id="gnumeric-function-POWER">
       <refmeta>
         <refentrytitle>
           <function>POWER</function>
@@ -11931,11 +11961,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EXP"><function>EXP</function></link>.
+        <para><link linkend="gnumeric-function-EXP"><function>EXP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PRODUCT">
+    <refentry id="gnumeric-function-PRODUCT">
       <refmeta>
         <refentrytitle>
           <function>PRODUCT</function>
@@ -11974,13 +12004,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SUM"><function>SUM</function></link>,
-        <link linkend="gnumeric-COUNT"><function>COUNT</function></link>,
-        <link linkend="gnumeric-G_PRODUCT"><function>G_PRODUCT</function></link>.
+        <para><link linkend="gnumeric-function-SUM"><function>SUM</function></link>,
+        <link linkend="gnumeric-function-COUNT"><function>COUNT</function></link>,
+        <link linkend="gnumeric-function-G_PRODUCT"><function>G_PRODUCT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-QUOTIENT">
+    <refentry id="gnumeric-function-QUOTIENT">
       <refmeta>
         <refentrytitle>
           <function>QUOTIENT</function>
@@ -12013,11 +12043,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MOD"><function>MOD</function></link>.
+        <para><link linkend="gnumeric-function-MOD"><function>MOD</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RADIANS">
+    <refentry id="gnumeric-function-RADIANS">
       <refmeta>
         <refentrytitle>
           <function>RADIANS</function>
@@ -12044,12 +12074,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PI"><function>PI</function></link>,
-        <link linkend="gnumeric-DEGREES"><function>DEGREES</function></link>.
+        <para><link linkend="gnumeric-function-PI"><function>PI</function></link>,
+        <link linkend="gnumeric-function-DEGREES"><function>DEGREES</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ROMAN">
+    <refentry id="gnumeric-function-ROMAN">
       <refmeta>
         <refentrytitle>
           <function>ROMAN</function>
@@ -12081,7 +12111,7 @@
         <para>This function is Excel compatible.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ROUND">
+    <refentry id="gnumeric-function-ROUND">
       <refmeta>
         <refentrytitle>
           <function>ROUND</function>
@@ -12115,12 +12145,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ROUNDDOWN"><function>ROUNDDOWN</function></link>,
-        <link linkend="gnumeric-ROUNDUP"><function>ROUNDUP</function></link>.
+        <para><link linkend="gnumeric-function-ROUNDDOWN"><function>ROUNDDOWN</function></link>,
+        <link linkend="gnumeric-function-ROUNDUP"><function>ROUNDUP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ROUNDDOWN">
+    <refentry id="gnumeric-function-ROUNDDOWN">
       <refmeta>
         <refentrytitle>
           <function>ROUNDDOWN</function>
@@ -12153,12 +12183,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ROUND"><function>ROUND</function></link>,
-        <link linkend="gnumeric-ROUNDUP"><function>ROUNDUP</function></link>.
+        <para><link linkend="gnumeric-function-ROUND"><function>ROUND</function></link>,
+        <link linkend="gnumeric-function-ROUNDUP"><function>ROUNDUP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ROUNDUP">
+    <refentry id="gnumeric-function-ROUNDUP">
       <refmeta>
         <refentrytitle>
           <function>ROUNDUP</function>
@@ -12191,13 +12221,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ROUND"><function>ROUND</function></link>,
-        <link linkend="gnumeric-ROUNDDOWN"><function>ROUNDDOWN</function></link>,
-        <link linkend="gnumeric-INT"><function>INT</function></link>.
+        <para><link linkend="gnumeric-function-ROUND"><function>ROUND</function></link>,
+        <link linkend="gnumeric-function-ROUNDDOWN"><function>ROUNDDOWN</function></link>,
+        <link linkend="gnumeric-function-INT"><function>INT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SEC">
+    <refentry id="gnumeric-function-SEC">
       <refmeta>
         <refentrytitle>
           <function>SEC</function>
@@ -12228,19 +12258,19 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SIN"><function>SIN</function></link>,
-        <link linkend="gnumeric-COS"><function>COS</function></link>,
-        <link linkend="gnumeric-TAN"><function>TAN</function></link>,
-        <link linkend="gnumeric-CSC"><function>CSC</function></link>,
-        <link linkend="gnumeric-SINH"><function>SINH</function></link>,
-        <link linkend="gnumeric-COSH"><function>COSH</function></link>,
-        <link linkend="gnumeric-TANH"><function>TANH</function></link>,
-        <link linkend="gnumeric-RADIANS"><function>RADIANS</function></link>,
-        <link linkend="gnumeric-DEGREES"><function>DEGREES</function></link>.
+        <para><link linkend="gnumeric-function-SIN"><function>SIN</function></link>,
+        <link linkend="gnumeric-function-COS"><function>COS</function></link>,
+        <link linkend="gnumeric-function-TAN"><function>TAN</function></link>,
+        <link linkend="gnumeric-function-CSC"><function>CSC</function></link>,
+        <link linkend="gnumeric-function-SINH"><function>SINH</function></link>,
+        <link linkend="gnumeric-function-COSH"><function>COSH</function></link>,
+        <link linkend="gnumeric-function-TANH"><function>TANH</function></link>,
+        <link linkend="gnumeric-function-RADIANS"><function>RADIANS</function></link>,
+        <link linkend="gnumeric-function-DEGREES"><function>DEGREES</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SECH">
+    <refentry id="gnumeric-function-SECH">
       <refmeta>
         <refentrytitle>
           <function>SECH</function>
@@ -12271,18 +12301,18 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SIN"><function>SIN</function></link>,
-        <link linkend="gnumeric-COS"><function>COS</function></link>,
-        <link linkend="gnumeric-TAN"><function>TAN</function></link>,
-        <link linkend="gnumeric-CSC"><function>CSC</function></link>,
-        <link linkend="gnumeric-SEC"><function>SEC</function></link>,
-        <link linkend="gnumeric-SINH"><function>SINH</function></link>,
-        <link linkend="gnumeric-COSH"><function>COSH</function></link>,
-        <link linkend="gnumeric-TANH"><function>TANH</function></link>.
+        <para><link linkend="gnumeric-function-SIN"><function>SIN</function></link>,
+        <link linkend="gnumeric-function-COS"><function>COS</function></link>,
+        <link linkend="gnumeric-function-TAN"><function>TAN</function></link>,
+        <link linkend="gnumeric-function-CSC"><function>CSC</function></link>,
+        <link linkend="gnumeric-function-SEC"><function>SEC</function></link>,
+        <link linkend="gnumeric-function-SINH"><function>SINH</function></link>,
+        <link linkend="gnumeric-function-COSH"><function>COSH</function></link>,
+        <link linkend="gnumeric-function-TANH"><function>TANH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SERIESSUM">
+    <refentry id="gnumeric-function-SERIESSUM">
       <refmeta>
         <refentrytitle>
           <function>SERIESSUM</function>
@@ -12312,12 +12342,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COUNT"><function>COUNT</function></link>,
-        <link linkend="gnumeric-SUM"><function>SUM</function></link>.
+        <para><link linkend="gnumeric-function-COUNT"><function>COUNT</function></link>,
+        <link linkend="gnumeric-function-SUM"><function>SUM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SIGN">
+    <refentry id="gnumeric-function-SIGN">
       <refmeta>
         <refentrytitle>
           <function>SIGN</function>
@@ -12348,11 +12378,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ABS"><function>ABS</function></link>.
+        <para><link linkend="gnumeric-function-ABS"><function>ABS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SIN">
+    <refentry id="gnumeric-function-SIN">
       <refmeta>
         <refentrytitle>
           <function>SIN</function>
@@ -12379,19 +12409,19 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COS"><function>COS</function></link>,
-        <link linkend="gnumeric-TAN"><function>TAN</function></link>,
-        <link linkend="gnumeric-CSC"><function>CSC</function></link>,
-        <link linkend="gnumeric-SEC"><function>SEC</function></link>,
-        <link linkend="gnumeric-SINH"><function>SINH</function></link>,
-        <link linkend="gnumeric-COSH"><function>COSH</function></link>,
-        <link linkend="gnumeric-TANH"><function>TANH</function></link>,
-        <link linkend="gnumeric-RADIANS"><function>RADIANS</function></link>,
-        <link linkend="gnumeric-DEGREES"><function>DEGREES</function></link>.
+        <para><link linkend="gnumeric-function-COS"><function>COS</function></link>,
+        <link linkend="gnumeric-function-TAN"><function>TAN</function></link>,
+        <link linkend="gnumeric-function-CSC"><function>CSC</function></link>,
+        <link linkend="gnumeric-function-SEC"><function>SEC</function></link>,
+        <link linkend="gnumeric-function-SINH"><function>SINH</function></link>,
+        <link linkend="gnumeric-function-COSH"><function>COSH</function></link>,
+        <link linkend="gnumeric-function-TANH"><function>TANH</function></link>,
+        <link linkend="gnumeric-function-RADIANS"><function>RADIANS</function></link>,
+        <link linkend="gnumeric-function-DEGREES"><function>DEGREES</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SINH">
+    <refentry id="gnumeric-function-SINH">
       <refmeta>
         <refentrytitle>
           <function>SINH</function>
@@ -12418,13 +12448,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SIN"><function>SIN</function></link>,
-        <link linkend="gnumeric-COSH"><function>COSH</function></link>,
-        <link linkend="gnumeric-ASINH"><function>ASINH</function></link>.
+        <para><link linkend="gnumeric-function-SIN"><function>SIN</function></link>,
+        <link linkend="gnumeric-function-COSH"><function>COSH</function></link>,
+        <link linkend="gnumeric-function-ASINH"><function>ASINH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SQRT">
+    <refentry id="gnumeric-function-SQRT">
       <refmeta>
         <refentrytitle>
           <function>SQRT</function>
@@ -12455,11 +12485,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-POWER"><function>POWER</function></link>.
+        <para><link linkend="gnumeric-function-POWER"><function>POWER</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SQRTPI">
+    <refentry id="gnumeric-function-SQRTPI">
       <refmeta>
         <refentrytitle>
           <function>SQRTPI</function>
@@ -12486,11 +12516,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PI"><function>PI</function></link>.
+        <para><link linkend="gnumeric-function-PI"><function>PI</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SUM">
+    <refentry id="gnumeric-function-SUM">
       <refmeta>
         <refentrytitle>
           <function>SUM</function>
@@ -12525,12 +12555,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>,
-        <link linkend="gnumeric-COUNT"><function>COUNT</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>,
+        <link linkend="gnumeric-function-COUNT"><function>COUNT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SUMA">
+    <refentry id="gnumeric-function-SUMA">
       <refmeta>
         <refentrytitle>
           <function>SUMA</function>
@@ -12558,13 +12588,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>,
-        <link linkend="gnumeric-SUM"><function>SUM</function></link>,
-        <link linkend="gnumeric-COUNT"><function>COUNT</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>,
+        <link linkend="gnumeric-function-SUM"><function>SUM</function></link>,
+        <link linkend="gnumeric-function-COUNT"><function>COUNT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SUMIF">
+    <refentry id="gnumeric-function-SUMIF">
       <refmeta>
         <refentrytitle>
           <function>SUMIF</function>
@@ -12588,17 +12618,21 @@
         <para><parameter>actual_range</parameter>: cell area, defaults to <parameter>range</parameter></para>
       </refsect1>
       <refsect1>
+        <title>Note</title>
+        <para>If the <parameter>actual_range</parameter> has a size that differs from the size of <parameter>range</parameter>, <parameter>actual_range</parameter> is resized (retaining the top-left corner) to match the size of <parameter>range</parameter>.</para>
+      </refsect1>
+      <refsect1>
         <title>Microsoft Excel Compatibility</title>
         <para>This function is Excel compatible.</para>
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SUM"><function>SUM</function></link>,
-        <link linkend="gnumeric-COUNTIF"><function>COUNTIF</function></link>.
+        <para><link linkend="gnumeric-function-SUM"><function>SUM</function></link>,
+        <link linkend="gnumeric-function-COUNTIF"><function>COUNTIF</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SUMPRODUCT">
+    <refentry id="gnumeric-function-SUMPRODUCT">
       <refmeta>
         <refentrytitle>
           <function>SUMPRODUCT</function>
@@ -12625,13 +12659,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SUM"><function>SUM</function></link>,
-        <link linkend="gnumeric-PRODUCT"><function>PRODUCT</function></link>,
-        <link linkend="gnumeric-G_PRODUCT"><function>G_PRODUCT</function></link>.
+        <para><link linkend="gnumeric-function-SUM"><function>SUM</function></link>,
+        <link linkend="gnumeric-function-PRODUCT"><function>PRODUCT</function></link>,
+        <link linkend="gnumeric-function-G_PRODUCT"><function>G_PRODUCT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SUMSQ">
+    <refentry id="gnumeric-function-SUMSQ">
       <refmeta>
         <refentrytitle>
           <function>SUMSQ</function>
@@ -12659,12 +12693,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SUM"><function>SUM</function></link>,
-        <link linkend="gnumeric-COUNT"><function>COUNT</function></link>.
+        <para><link linkend="gnumeric-function-SUM"><function>SUM</function></link>,
+        <link linkend="gnumeric-function-COUNT"><function>COUNT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SUMX2MY2">
+    <refentry id="gnumeric-function-SUMX2MY2">
       <refmeta>
         <refentrytitle>
           <function>SUMX2MY2</function>
@@ -12696,12 +12730,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SUMSQ"><function>SUMSQ</function></link>,
-        <link linkend="gnumeric-SUMX2PY2"><function>SUMX2PY2</function></link>.
+        <para><link linkend="gnumeric-function-SUMSQ"><function>SUMSQ</function></link>,
+        <link linkend="gnumeric-function-SUMX2PY2"><function>SUMX2PY2</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SUMX2PY2">
+    <refentry id="gnumeric-function-SUMX2PY2">
       <refmeta>
         <refentrytitle>
           <function>SUMX2PY2</function>
@@ -12738,12 +12772,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SUMSQ"><function>SUMSQ</function></link>,
-        <link linkend="gnumeric-SUMX2MY2"><function>SUMX2MY2</function></link>.
+        <para><link linkend="gnumeric-function-SUMSQ"><function>SUMSQ</function></link>,
+        <link linkend="gnumeric-function-SUMX2MY2"><function>SUMX2MY2</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SUMXMY2">
+    <refentry id="gnumeric-function-SUMXMY2">
       <refmeta>
         <refentrytitle>
           <function>SUMXMY2</function>
@@ -12780,13 +12814,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SUMSQ"><function>SUMSQ</function></link>,
-        <link linkend="gnumeric-SUMX2MY2"><function>SUMX2MY2</function></link>,
-        <link linkend="gnumeric-SUMX2PY2"><function>SUMX2PY2</function></link>.
+        <para><link linkend="gnumeric-function-SUMSQ"><function>SUMSQ</function></link>,
+        <link linkend="gnumeric-function-SUMX2MY2"><function>SUMX2MY2</function></link>,
+        <link linkend="gnumeric-function-SUMX2PY2"><function>SUMX2PY2</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TAN">
+    <refentry id="gnumeric-function-TAN">
       <refmeta>
         <refentrytitle>
           <function>TAN</function>
@@ -12813,17 +12847,17 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TANH"><function>TANH</function></link>,
-        <link linkend="gnumeric-COS"><function>COS</function></link>,
-        <link linkend="gnumeric-COSH"><function>COSH</function></link>,
-        <link linkend="gnumeric-SIN"><function>SIN</function></link>,
-        <link linkend="gnumeric-SINH"><function>SINH</function></link>,
-        <link linkend="gnumeric-DEGREES"><function>DEGREES</function></link>,
-        <link linkend="gnumeric-RADIANS"><function>RADIANS</function></link>.
+        <para><link linkend="gnumeric-function-TANH"><function>TANH</function></link>,
+        <link linkend="gnumeric-function-COS"><function>COS</function></link>,
+        <link linkend="gnumeric-function-COSH"><function>COSH</function></link>,
+        <link linkend="gnumeric-function-SIN"><function>SIN</function></link>,
+        <link linkend="gnumeric-function-SINH"><function>SINH</function></link>,
+        <link linkend="gnumeric-function-DEGREES"><function>DEGREES</function></link>,
+        <link linkend="gnumeric-function-RADIANS"><function>RADIANS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TANH">
+    <refentry id="gnumeric-function-TANH">
       <refmeta>
         <refentrytitle>
           <function>TANH</function>
@@ -12850,15 +12884,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TAN"><function>TAN</function></link>,
-        <link linkend="gnumeric-SIN"><function>SIN</function></link>,
-        <link linkend="gnumeric-SINH"><function>SINH</function></link>,
-        <link linkend="gnumeric-COS"><function>COS</function></link>,
-        <link linkend="gnumeric-COSH"><function>COSH</function></link>.
+        <para><link linkend="gnumeric-function-TAN"><function>TAN</function></link>,
+        <link linkend="gnumeric-function-SIN"><function>SIN</function></link>,
+        <link linkend="gnumeric-function-SINH"><function>SINH</function></link>,
+        <link linkend="gnumeric-function-COS"><function>COS</function></link>,
+        <link linkend="gnumeric-function-COSH"><function>COSH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TRUNC">
+    <refentry id="gnumeric-function-TRUNC">
       <refmeta>
         <refentrytitle>
           <function>TRUNC</function>
@@ -12889,14 +12923,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-INT"><function>INT</function></link>.
+        <para><link linkend="gnumeric-function-INT"><function>INT</function></link>.
       </para>
       </refsect1>
     </refentry>
   </sect1>
   <sect1 id="CATEGORY_Number_Theory">
     <title>Number Theory</title>
-    <refentry id="gnumeric-ISPRIME">
+    <refentry id="gnumeric-function-ISPRIME">
       <refmeta>
         <refentrytitle>
           <function>ISPRIME</function>
@@ -12923,12 +12957,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-NT_D"><function>NT_D</function></link>,
-        <link linkend="gnumeric-NT_SIGMA"><function>NT_SIGMA</function></link>.
+        <para><link linkend="gnumeric-function-NT_D"><function>NT_D</function></link>,
+        <link linkend="gnumeric-function-NT_SIGMA"><function>NT_SIGMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ITHPRIME">
+    <refentry id="gnumeric-function-ITHPRIME">
       <refmeta>
         <refentrytitle>
           <function>ITHPRIME</function>
@@ -12954,12 +12988,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-NT_D"><function>NT_D</function></link>,
-        <link linkend="gnumeric-NT_SIGMA"><function>NT_SIGMA</function></link>.
+        <para><link linkend="gnumeric-function-NT_D"><function>NT_D</function></link>,
+        <link linkend="gnumeric-function-NT_SIGMA"><function>NT_SIGMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NT_D">
+    <refentry id="gnumeric-function-NT_D">
       <refmeta>
         <refentrytitle>
           <function>NT_D</function>
@@ -12986,13 +13020,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ITHPRIME"><function>ITHPRIME</function></link>,
-        <link linkend="gnumeric-NT_PHI"><function>NT_PHI</function></link>,
-        <link linkend="gnumeric-NT_SIGMA"><function>NT_SIGMA</function></link>.
+        <para><link linkend="gnumeric-function-ITHPRIME"><function>ITHPRIME</function></link>,
+        <link linkend="gnumeric-function-NT_PHI"><function>NT_PHI</function></link>,
+        <link linkend="gnumeric-function-NT_SIGMA"><function>NT_SIGMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NT_MU">
+    <refentry id="gnumeric-function-NT_MU">
       <refmeta>
         <refentrytitle>
           <function>NT_MU</function>
@@ -13019,14 +13053,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ITHPRIME"><function>ITHPRIME</function></link>,
-        <link linkend="gnumeric-NT_PHI"><function>NT_PHI</function></link>,
-        <link linkend="gnumeric-NT_SIGMA"><function>NT_SIGMA</function></link>,
-        <link linkend="gnumeric-NT_D"><function>NT_D</function></link>.
+        <para><link linkend="gnumeric-function-ITHPRIME"><function>ITHPRIME</function></link>,
+        <link linkend="gnumeric-function-NT_PHI"><function>NT_PHI</function></link>,
+        <link linkend="gnumeric-function-NT_SIGMA"><function>NT_SIGMA</function></link>,
+        <link linkend="gnumeric-function-NT_D"><function>NT_D</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NT_PHI">
+    <refentry id="gnumeric-function-NT_PHI">
       <refmeta>
         <refentrytitle>
           <function>NT_PHI</function>
@@ -13053,13 +13087,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-NT_D"><function>NT_D</function></link>,
-        <link linkend="gnumeric-ITHPRIME"><function>ITHPRIME</function></link>,
-        <link linkend="gnumeric-NT_SIGMA"><function>NT_SIGMA</function></link>.
+        <para><link linkend="gnumeric-function-NT_D"><function>NT_D</function></link>,
+        <link linkend="gnumeric-function-ITHPRIME"><function>ITHPRIME</function></link>,
+        <link linkend="gnumeric-function-NT_SIGMA"><function>NT_SIGMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NT_PI">
+    <refentry id="gnumeric-function-NT_PI">
       <refmeta>
         <refentrytitle>
           <function>NT_PI</function>
@@ -13086,14 +13120,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ITHPRIME"><function>ITHPRIME</function></link>,
-        <link linkend="gnumeric-NT_PHI"><function>NT_PHI</function></link>,
-        <link linkend="gnumeric-NT_D"><function>NT_D</function></link>,
-        <link linkend="gnumeric-NT_SIGMA"><function>NT_SIGMA</function></link>.
+        <para><link linkend="gnumeric-function-ITHPRIME"><function>ITHPRIME</function></link>,
+        <link linkend="gnumeric-function-NT_PHI"><function>NT_PHI</function></link>,
+        <link linkend="gnumeric-function-NT_D"><function>NT_D</function></link>,
+        <link linkend="gnumeric-function-NT_SIGMA"><function>NT_SIGMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NT_SIGMA">
+    <refentry id="gnumeric-function-NT_SIGMA">
       <refmeta>
         <refentrytitle>
           <function>NT_SIGMA</function>
@@ -13120,13 +13154,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-NT_D"><function>NT_D</function></link>,
-        <link linkend="gnumeric-ITHPRIME"><function>ITHPRIME</function></link>,
-        <link linkend="gnumeric-NT_PHI"><function>NT_PHI</function></link>.
+        <para><link linkend="gnumeric-function-NT_D"><function>NT_D</function></link>,
+        <link linkend="gnumeric-function-ITHPRIME"><function>ITHPRIME</function></link>,
+        <link linkend="gnumeric-function-NT_PHI"><function>NT_PHI</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PFACTOR">
+    <refentry id="gnumeric-function-PFACTOR">
       <refmeta>
         <refentrytitle>
           <function>PFACTOR</function>
@@ -13157,14 +13191,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ITHPRIME"><function>ITHPRIME</function></link>.
+        <para><link linkend="gnumeric-function-ITHPRIME"><function>ITHPRIME</function></link>.
       </para>
       </refsect1>
     </refentry>
   </sect1>
   <sect1 id="CATEGORY_Random_Numbers">
     <title>Random Numbers</title>
-    <refentry id="gnumeric-RAND">
+    <refentry id="gnumeric-function-RAND">
       <refmeta>
         <refentrytitle>
           <function>RAND</function>
@@ -13187,11 +13221,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RANDBETWEEN"><function>RANDBETWEEN</function></link>.
+        <para><link linkend="gnumeric-function-RANDBETWEEN"><function>RANDBETWEEN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDBERNOULLI">
+    <refentry id="gnumeric-function-RANDBERNOULLI">
       <refmeta>
         <refentrytitle>
           <function>RANDBERNOULLI</function>
@@ -13218,12 +13252,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>,
-        <link linkend="gnumeric-RANDBETWEEN"><function>RANDBETWEEN</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>,
+        <link linkend="gnumeric-function-RANDBETWEEN"><function>RANDBETWEEN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDBETA">
+    <refentry id="gnumeric-function-RANDBETA">
       <refmeta>
         <refentrytitle>
           <function>RANDBETA</function>
@@ -13247,12 +13281,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>,
-        <link linkend="gnumeric-RANDGAMMA"><function>RANDGAMMA</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>,
+        <link linkend="gnumeric-function-RANDGAMMA"><function>RANDGAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDBETWEEN">
+    <refentry id="gnumeric-function-RANDBETWEEN">
       <refmeta>
         <refentrytitle>
           <function>RANDBETWEEN</function>
@@ -13284,12 +13318,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>,
-        <link linkend="gnumeric-RANDUNIFORM"><function>RANDUNIFORM</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>,
+        <link linkend="gnumeric-function-RANDUNIFORM"><function>RANDUNIFORM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDBINOM">
+    <refentry id="gnumeric-function-RANDBINOM">
       <refmeta>
         <refentrytitle>
           <function>RANDBINOM</function>
@@ -13317,12 +13351,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>,
-        <link linkend="gnumeric-RANDBETWEEN"><function>RANDBETWEEN</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>,
+        <link linkend="gnumeric-function-RANDBETWEEN"><function>RANDBETWEEN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDCAUCHY">
+    <refentry id="gnumeric-function-RANDCAUCHY">
       <refmeta>
         <refentrytitle>
           <function>RANDCAUCHY</function>
@@ -13349,11 +13383,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDCHISQ">
+    <refentry id="gnumeric-function-RANDCHISQ">
       <refmeta>
         <refentrytitle>
           <function>RANDCHISQ</function>
@@ -13376,12 +13410,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>,
-        <link linkend="gnumeric-RANDGAMMA"><function>RANDGAMMA</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>,
+        <link linkend="gnumeric-function-RANDGAMMA"><function>RANDGAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDDISCRETE">
+    <refentry id="gnumeric-function-RANDDISCRETE">
       <refmeta>
         <refentrytitle>
           <function>RANDDISCRETE</function>
@@ -13413,12 +13447,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RANDBETWEEN"><function>RANDBETWEEN</function></link>,
-        <link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RANDBETWEEN"><function>RANDBETWEEN</function></link>,
+        <link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDEXP">
+    <refentry id="gnumeric-function-RANDEXP">
       <refmeta>
         <refentrytitle>
           <function>RANDEXP</function>
@@ -13441,12 +13475,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>,
-        <link linkend="gnumeric-RANDBETWEEN"><function>RANDBETWEEN</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>,
+        <link linkend="gnumeric-function-RANDBETWEEN"><function>RANDBETWEEN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDEXPPOW">
+    <refentry id="gnumeric-function-RANDEXPPOW">
       <refmeta>
         <refentrytitle>
           <function>RANDEXPPOW</function>
@@ -13475,11 +13509,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDFDIST">
+    <refentry id="gnumeric-function-RANDFDIST">
       <refmeta>
         <refentrytitle>
           <function>RANDFDIST</function>
@@ -13503,12 +13537,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>,
-        <link linkend="gnumeric-RANDGAMMA"><function>RANDGAMMA</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>,
+        <link linkend="gnumeric-function-RANDGAMMA"><function>RANDGAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDGAMMA">
+    <refentry id="gnumeric-function-RANDGAMMA">
       <refmeta>
         <refentrytitle>
           <function>RANDGAMMA</function>
@@ -13536,11 +13570,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDGEOM">
+    <refentry id="gnumeric-function-RANDGEOM">
       <refmeta>
         <refentrytitle>
           <function>RANDGEOM</function>
@@ -13567,11 +13601,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDGUMBEL">
+    <refentry id="gnumeric-function-RANDGUMBEL">
       <refmeta>
         <refentrytitle>
           <function>RANDGUMBEL</function>
@@ -13600,11 +13634,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDHYPERG">
+    <refentry id="gnumeric-function-RANDHYPERG">
       <refmeta>
         <refentrytitle>
           <function>RANDHYPERG</function>
@@ -13629,11 +13663,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDLANDAU">
+    <refentry id="gnumeric-function-RANDLANDAU">
       <refmeta>
         <refentrytitle>
           <function>RANDLANDAU</function>
@@ -13652,11 +13686,11 @@
       </refsynopsisdiv>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDLAPLACE">
+    <refentry id="gnumeric-function-RANDLAPLACE">
       <refmeta>
         <refentrytitle>
           <function>RANDLAPLACE</function>
@@ -13679,11 +13713,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDLEVY">
+    <refentry id="gnumeric-function-RANDLEVY">
       <refmeta>
         <refentrytitle>
           <function>RANDLEVY</function>
@@ -13717,11 +13751,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDLOG">
+    <refentry id="gnumeric-function-RANDLOG">
       <refmeta>
         <refentrytitle>
           <function>RANDLOG</function>
@@ -13748,11 +13782,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDLOGISTIC">
+    <refentry id="gnumeric-function-RANDLOGISTIC">
       <refmeta>
         <refentrytitle>
           <function>RANDLOGISTIC</function>
@@ -13775,11 +13809,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDLOGNORM">
+    <refentry id="gnumeric-function-RANDLOGNORM">
       <refmeta>
         <refentrytitle>
           <function>RANDLOGNORM</function>
@@ -13807,11 +13841,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDNEGBINOM">
+    <refentry id="gnumeric-function-RANDNEGBINOM">
       <refmeta>
         <refentrytitle>
           <function>RANDNEGBINOM</function>
@@ -13839,12 +13873,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>,
-        <link linkend="gnumeric-RANDBETWEEN"><function>RANDBETWEEN</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>,
+        <link linkend="gnumeric-function-RANDBETWEEN"><function>RANDBETWEEN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDNORM">
+    <refentry id="gnumeric-function-RANDNORM">
       <refmeta>
         <refentrytitle>
           <function>RANDNORM</function>
@@ -13872,11 +13906,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDNORMTAIL">
+    <refentry id="gnumeric-function-RANDNORMTAIL">
       <refmeta>
         <refentrytitle>
           <function>RANDNORMTAIL</function>
@@ -13904,11 +13938,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDPARETO">
+    <refentry id="gnumeric-function-RANDPARETO">
       <refmeta>
         <refentrytitle>
           <function>RANDPARETO</function>
@@ -13932,11 +13966,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDPOISSON">
+    <refentry id="gnumeric-function-RANDPOISSON">
       <refmeta>
         <refentrytitle>
           <function>RANDPOISSON</function>
@@ -13963,12 +13997,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>,
-        <link linkend="gnumeric-RANDBETWEEN"><function>RANDBETWEEN</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>,
+        <link linkend="gnumeric-function-RANDBETWEEN"><function>RANDBETWEEN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDRAYLEIGH">
+    <refentry id="gnumeric-function-RANDRAYLEIGH">
       <refmeta>
         <refentrytitle>
           <function>RANDRAYLEIGH</function>
@@ -13991,11 +14025,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDRAYLEIGHTAIL">
+    <refentry id="gnumeric-function-RANDRAYLEIGHTAIL">
       <refmeta>
         <refentrytitle>
           <function>RANDRAYLEIGHTAIL</function>
@@ -14019,12 +14053,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>,
-        <link linkend="gnumeric-RANDRAYLEIGH"><function>RANDRAYLEIGH</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>,
+        <link linkend="gnumeric-function-RANDRAYLEIGH"><function>RANDRAYLEIGH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDSNORM">
+    <refentry id="gnumeric-function-RANDSNORM">
       <refmeta>
         <refentrytitle>
           <function>RANDSNORM</function>
@@ -14053,11 +14087,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RANDNORM"><function>RANDNORM</function></link>.
+        <para><link linkend="gnumeric-function-RANDNORM"><function>RANDNORM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDSTDIST">
+    <refentry id="gnumeric-function-RANDSTDIST">
       <refmeta>
         <refentrytitle>
           <function>RANDSTDIST</function>
@@ -14081,11 +14115,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RANDTDIST"><function>RANDTDIST</function></link>.
+        <para><link linkend="gnumeric-function-RANDTDIST"><function>RANDTDIST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDTDIST">
+    <refentry id="gnumeric-function-RANDTDIST">
       <refmeta>
         <refentrytitle>
           <function>RANDTDIST</function>
@@ -14108,11 +14142,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDUNIFORM">
+    <refentry id="gnumeric-function-RANDUNIFORM">
       <refmeta>
         <refentrytitle>
           <function>RANDUNIFORM</function>
@@ -14140,12 +14174,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RANDBETWEEN"><function>RANDBETWEEN</function></link>,
-        <link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RANDBETWEEN"><function>RANDBETWEEN</function></link>,
+        <link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANDWEIBULL">
+    <refentry id="gnumeric-function-RANDWEIBULL">
       <refmeta>
         <refentrytitle>
           <function>RANDWEIBULL</function>
@@ -14169,11 +14203,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RAND"><function>RAND</function></link>.
+        <para><link linkend="gnumeric-function-RAND"><function>RAND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SIMTABLE">
+    <refentry id="gnumeric-function-SIMTABLE">
       <refmeta>
         <refentrytitle>
           <function>SIMTABLE</function>
@@ -14205,7 +14239,7 @@
   </sect1>
   <sect1 id="CATEGORY_Statistics">
     <title>Statistics</title>
-    <refentry id="gnumeric-ADTEST">
+    <refentry id="gnumeric-function-ADTEST">
       <refmeta>
         <refentrytitle>
           <function>ADTEST</function>
@@ -14236,14 +14270,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CHITEST"><function>CHITEST</function></link>,
-        <link linkend="gnumeric-CVMTEST"><function>CVMTEST</function></link>,
-        <link linkend="gnumeric-LKSTEST"><function>LKSTEST</function></link>,
-        <link linkend="gnumeric-SFTEST"><function>SFTEST</function></link>.
+        <para><link linkend="gnumeric-function-CHITEST"><function>CHITEST</function></link>,
+        <link linkend="gnumeric-function-CVMTEST"><function>CVMTEST</function></link>,
+        <link linkend="gnumeric-function-LKSTEST"><function>LKSTEST</function></link>,
+        <link linkend="gnumeric-function-SFTEST"><function>SFTEST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-AVEDEV">
+    <refentry id="gnumeric-function-AVEDEV">
       <refmeta>
         <refentrytitle>
           <function>AVEDEV</function>
@@ -14271,11 +14305,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-STDEV"><function>STDEV</function></link>.
+        <para><link linkend="gnumeric-function-STDEV"><function>STDEV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-AVERAGE">
+    <refentry id="gnumeric-function-AVERAGE">
       <refmeta>
         <refentrytitle>
           <function>AVERAGE</function>
@@ -14303,12 +14337,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-SUM"><function>SUM</function></link>,
-        <link linkend="gnumeric-COUNT"><function>COUNT</function></link>.
+        <para><link linkend="gnumeric-function-SUM"><function>SUM</function></link>,
+        <link linkend="gnumeric-function-COUNT"><function>COUNT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-AVERAGEA">
+    <refentry id="gnumeric-function-AVERAGEA">
       <refmeta>
         <refentrytitle>
           <function>AVERAGEA</function>
@@ -14340,11 +14374,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BERNOULLI">
+    <refentry id="gnumeric-function-BERNOULLI">
       <refmeta>
         <refentrytitle>
           <function>BERNOULLI</function>
@@ -14372,11 +14406,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RANDBERNOULLI"><function>RANDBERNOULLI</function></link>.
+        <para><link linkend="gnumeric-function-RANDBERNOULLI"><function>RANDBERNOULLI</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BETADIST">
+    <refentry id="gnumeric-function-BETADIST">
       <refmeta>
         <refentrytitle>
           <function>BETADIST</function>
@@ -14411,11 +14445,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BETAINV"><function>BETAINV</function></link>.
+        <para><link linkend="gnumeric-function-BETAINV"><function>BETAINV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BETAINV">
+    <refentry id="gnumeric-function-BETAINV">
       <refmeta>
         <refentrytitle>
           <function>BETAINV</function>
@@ -14450,11 +14484,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BETADIST"><function>BETADIST</function></link>.
+        <para><link linkend="gnumeric-function-BETADIST"><function>BETADIST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BINOM.DIST.RANGE">
+    <refentry id="gnumeric-function-BINOM.DIST.RANGE">
       <refmeta>
         <refentrytitle>
           <function>BINOM.DIST.RANGE</function>
@@ -14488,12 +14522,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BINOMDIST"><function>BINOMDIST</function></link>,
-        <link linkend="gnumeric-R.PBINOM"><function>R.PBINOM</function></link>.
+        <para><link linkend="gnumeric-function-BINOMDIST"><function>BINOMDIST</function></link>,
+        <link linkend="gnumeric-function-R.PBINOM"><function>R.PBINOM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-BINOMDIST">
+    <refentry id="gnumeric-function-BINOMDIST">
       <refmeta>
         <refentrytitle>
           <function>BINOMDIST</function>
@@ -14527,11 +14561,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-POISSON"><function>POISSON</function></link>.
+        <para><link linkend="gnumeric-function-POISSON"><function>POISSON</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CAUCHY">
+    <refentry id="gnumeric-function-CAUCHY">
       <refmeta>
         <refentrytitle>
           <function>CAUCHY</function>
@@ -14560,11 +14594,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RANDCAUCHY"><function>RANDCAUCHY</function></link>.
+        <para><link linkend="gnumeric-function-RANDCAUCHY"><function>RANDCAUCHY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CHIDIST">
+    <refentry id="gnumeric-function-CHIDIST">
       <refmeta>
         <refentrytitle>
           <function>CHIDIST</function>
@@ -14604,12 +14638,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CHIINV"><function>CHIINV</function></link>,
-        <link linkend="gnumeric-CHITEST"><function>CHITEST</function></link>.
+        <para><link linkend="gnumeric-function-CHIINV"><function>CHIINV</function></link>,
+        <link linkend="gnumeric-function-CHITEST"><function>CHITEST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CHIINV">
+    <refentry id="gnumeric-function-CHIINV">
       <refmeta>
         <refentrytitle>
           <function>CHIINV</function>
@@ -14649,12 +14683,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CHIDIST"><function>CHIDIST</function></link>,
-        <link linkend="gnumeric-CHITEST"><function>CHITEST</function></link>.
+        <para><link linkend="gnumeric-function-CHIDIST"><function>CHIDIST</function></link>,
+        <link linkend="gnumeric-function-CHITEST"><function>CHITEST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CHITEST">
+    <refentry id="gnumeric-function-CHITEST">
       <refmeta>
         <refentrytitle>
           <function>CHITEST</function>
@@ -14690,12 +14724,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CHIDIST"><function>CHIDIST</function></link>,
-        <link linkend="gnumeric-CHIINV"><function>CHIINV</function></link>.
+        <para><link linkend="gnumeric-function-CHIDIST"><function>CHIDIST</function></link>,
+        <link linkend="gnumeric-function-CHIINV"><function>CHIINV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CONFIDENCE">
+    <refentry id="gnumeric-function-CONFIDENCE">
       <refmeta>
         <refentrytitle>
           <function>CONFIDENCE</function>
@@ -14728,11 +14762,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CORREL">
+    <refentry id="gnumeric-function-CORREL">
       <refmeta>
         <refentrytitle>
           <function>CORREL</function>
@@ -14764,13 +14798,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COVAR"><function>COVAR</function></link>,
-        <link linkend="gnumeric-FISHER"><function>FISHER</function></link>,
-        <link linkend="gnumeric-FISHERINV"><function>FISHERINV</function></link>.
+        <para><link linkend="gnumeric-function-COVAR"><function>COVAR</function></link>,
+        <link linkend="gnumeric-function-FISHER"><function>FISHER</function></link>,
+        <link linkend="gnumeric-function-FISHERINV"><function>FISHERINV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COUNT">
+    <refentry id="gnumeric-function-COUNT">
       <refmeta>
         <refentrytitle>
           <function>COUNT</function>
@@ -14798,11 +14832,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COUNTA">
+    <refentry id="gnumeric-function-COUNTA">
       <refmeta>
         <refentrytitle>
           <function>COUNTA</function>
@@ -14830,16 +14864,16 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>,
-        <link linkend="gnumeric-COUNT"><function>COUNT</function></link>,
-        <link linkend="gnumeric-DCOUNT"><function>DCOUNT</function></link>,
-        <link linkend="gnumeric-DCOUNTA"><function>DCOUNTA</function></link>,
-        <link linkend="gnumeric-PRODUCT"><function>PRODUCT</function></link>,
-        <link linkend="gnumeric-SUM"><function>SUM</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>,
+        <link linkend="gnumeric-function-COUNT"><function>COUNT</function></link>,
+        <link linkend="gnumeric-function-DCOUNT"><function>DCOUNT</function></link>,
+        <link linkend="gnumeric-function-DCOUNTA"><function>DCOUNTA</function></link>,
+        <link linkend="gnumeric-function-PRODUCT"><function>PRODUCT</function></link>,
+        <link linkend="gnumeric-function-SUM"><function>SUM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-COVAR">
+    <refentry id="gnumeric-function-COVAR">
       <refmeta>
         <refentrytitle>
           <function>COVAR</function>
@@ -14871,13 +14905,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CORREL"><function>CORREL</function></link>,
-        <link linkend="gnumeric-FISHER"><function>FISHER</function></link>,
-        <link linkend="gnumeric-FISHERINV"><function>FISHERINV</function></link>.
+        <para><link linkend="gnumeric-function-CORREL"><function>CORREL</function></link>,
+        <link linkend="gnumeric-function-FISHER"><function>FISHER</function></link>,
+        <link linkend="gnumeric-function-FISHERINV"><function>FISHERINV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CRITBINOM">
+    <refentry id="gnumeric-function-CRITBINOM">
       <refmeta>
         <refentrytitle>
           <function>CRITBINOM</function>
@@ -14910,11 +14944,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BINOMDIST"><function>BINOMDIST</function></link>.
+        <para><link linkend="gnumeric-function-BINOMDIST"><function>BINOMDIST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CRONBACH">
+    <refentry id="gnumeric-function-CRONBACH">
       <refmeta>
         <refentrytitle>
           <function>CRONBACH</function>
@@ -14938,11 +14972,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-VAR"><function>VAR</function></link>.
+        <para><link linkend="gnumeric-function-VAR"><function>VAR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CVMTEST">
+    <refentry id="gnumeric-function-CVMTEST">
       <refmeta>
         <refentrytitle>
           <function>CVMTEST</function>
@@ -14973,14 +15007,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CHITEST"><function>CHITEST</function></link>,
-        <link linkend="gnumeric-ADTEST"><function>ADTEST</function></link>,
-        <link linkend="gnumeric-LKSTEST"><function>LKSTEST</function></link>,
-        <link linkend="gnumeric-SFTEST"><function>SFTEST</function></link>.
+        <para><link linkend="gnumeric-function-CHITEST"><function>CHITEST</function></link>,
+        <link linkend="gnumeric-function-ADTEST"><function>ADTEST</function></link>,
+        <link linkend="gnumeric-function-LKSTEST"><function>LKSTEST</function></link>,
+        <link linkend="gnumeric-function-SFTEST"><function>SFTEST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DEVSQ">
+    <refentry id="gnumeric-function-DEVSQ">
       <refmeta>
         <refentrytitle>
           <function>DEVSQ</function>
@@ -15012,11 +15046,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-STDEV"><function>STDEV</function></link>.
+        <para><link linkend="gnumeric-function-STDEV"><function>STDEV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-EXPONDIST">
+    <refentry id="gnumeric-function-EXPONDIST">
       <refmeta>
         <refentrytitle>
           <function>EXPONDIST</function>
@@ -15053,11 +15087,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-POISSON"><function>POISSON</function></link>.
+        <para><link linkend="gnumeric-function-POISSON"><function>POISSON</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-EXPPOWDIST">
+    <refentry id="gnumeric-function-EXPPOWDIST">
       <refmeta>
         <refentrytitle>
           <function>EXPPOWDIST</function>
@@ -15086,11 +15120,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RANDEXPPOW"><function>RANDEXPPOW</function></link>.
+        <para><link linkend="gnumeric-function-RANDEXPPOW"><function>RANDEXPPOW</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FDIST">
+    <refentry id="gnumeric-function-FDIST">
       <refmeta>
         <refentrytitle>
           <function>FDIST</function>
@@ -15131,11 +15165,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-FINV"><function>FINV</function></link>.
+        <para><link linkend="gnumeric-function-FINV"><function>FINV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FINV">
+    <refentry id="gnumeric-function-FINV">
       <refmeta>
         <refentrytitle>
           <function>FINV</function>
@@ -15176,11 +15210,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-FDIST"><function>FDIST</function></link>.
+        <para><link linkend="gnumeric-function-FDIST"><function>FDIST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FISHER">
+    <refentry id="gnumeric-function-FISHER">
       <refmeta>
         <refentrytitle>
           <function>FISHER</function>
@@ -15211,12 +15245,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-FISHERINV"><function>FISHERINV</function></link>,
-        <link linkend="gnumeric-ATANH"><function>ATANH</function></link>.
+        <para><link linkend="gnumeric-function-FISHERINV"><function>FISHERINV</function></link>,
+        <link linkend="gnumeric-function-ATANH"><function>ATANH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FISHERINV">
+    <refentry id="gnumeric-function-FISHERINV">
       <refmeta>
         <refentrytitle>
           <function>FISHERINV</function>
@@ -15247,12 +15281,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-FISHER"><function>FISHER</function></link>,
-        <link linkend="gnumeric-TANH"><function>TANH</function></link>.
+        <para><link linkend="gnumeric-function-FISHER"><function>FISHER</function></link>,
+        <link linkend="gnumeric-function-TANH"><function>TANH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FORECAST">
+    <refentry id="gnumeric-function-FORECAST">
       <refmeta>
         <refentrytitle>
           <function>FORECAST</function>
@@ -15289,12 +15323,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-INTERCEPT"><function>INTERCEPT</function></link>,
-        <link linkend="gnumeric-TREND"><function>TREND</function></link>.
+        <para><link linkend="gnumeric-function-INTERCEPT"><function>INTERCEPT</function></link>,
+        <link linkend="gnumeric-function-TREND"><function>TREND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FREQUENCY">
+    <refentry id="gnumeric-function-FREQUENCY">
       <refmeta>
         <refentrytitle>
           <function>FREQUENCY</function>
@@ -15326,7 +15360,7 @@
         <para>This function is Excel compatible.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FTEST">
+    <refentry id="gnumeric-function-FTEST">
       <refmeta>
         <refentrytitle>
           <function>FTEST</function>
@@ -15354,12 +15388,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-FDIST"><function>FDIST</function></link>,
-        <link linkend="gnumeric-FINV"><function>FINV</function></link>.
+        <para><link linkend="gnumeric-function-FDIST"><function>FDIST</function></link>,
+        <link linkend="gnumeric-function-FINV"><function>FINV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-GAMMADIST">
+    <refentry id="gnumeric-function-GAMMADIST">
       <refmeta>
         <refentrytitle>
           <function>GAMMADIST</function>
@@ -15393,11 +15427,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-GAMMAINV"><function>GAMMAINV</function></link>.
+        <para><link linkend="gnumeric-function-GAMMAINV"><function>GAMMAINV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-GAMMAINV">
+    <refentry id="gnumeric-function-GAMMAINV">
       <refmeta>
         <refentrytitle>
           <function>GAMMAINV</function>
@@ -15430,11 +15464,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-GAMMADIST"><function>GAMMADIST</function></link>.
+        <para><link linkend="gnumeric-function-GAMMADIST"><function>GAMMADIST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-GEOMDIST">
+    <refentry id="gnumeric-function-GEOMDIST">
       <refmeta>
         <refentrytitle>
           <function>GEOMDIST</function>
@@ -15463,11 +15497,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RANDGEOM"><function>RANDGEOM</function></link>.
+        <para><link linkend="gnumeric-function-RANDGEOM"><function>RANDGEOM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-GEOMEAN">
+    <refentry id="gnumeric-function-GEOMEAN">
       <refmeta>
         <refentrytitle>
           <function>GEOMEAN</function>
@@ -15499,15 +15533,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>,
-        <link linkend="gnumeric-HARMEAN"><function>HARMEAN</function></link>,
-        <link linkend="gnumeric-MEDIAN"><function>MEDIAN</function></link>,
-        <link linkend="gnumeric-MODE"><function>MODE</function></link>,
-        <link linkend="gnumeric-TRIMMEAN"><function>TRIMMEAN</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>,
+        <link linkend="gnumeric-function-HARMEAN"><function>HARMEAN</function></link>,
+        <link linkend="gnumeric-function-MEDIAN"><function>MEDIAN</function></link>,
+        <link linkend="gnumeric-function-MODE"><function>MODE</function></link>,
+        <link linkend="gnumeric-function-TRIMMEAN"><function>TRIMMEAN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-GROWTH">
+    <refentry id="gnumeric-function-GROWTH">
       <refmeta>
         <refentrytitle>
           <function>GROWTH</function>
@@ -15542,13 +15576,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LOGEST"><function>LOGEST</function></link>,
-        <link linkend="gnumeric-GROWTH"><function>GROWTH</function></link>,
-        <link linkend="gnumeric-TREND"><function>TREND</function></link>.
+        <para><link linkend="gnumeric-function-LOGEST"><function>LOGEST</function></link>,
+        <link linkend="gnumeric-function-GROWTH"><function>GROWTH</function></link>,
+        <link linkend="gnumeric-function-TREND"><function>TREND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-HARMEAN">
+    <refentry id="gnumeric-function-HARMEAN">
       <refmeta>
         <refentrytitle>
           <function>HARMEAN</function>
@@ -15580,15 +15614,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>,
-        <link linkend="gnumeric-GEOMEAN"><function>GEOMEAN</function></link>,
-        <link linkend="gnumeric-MEDIAN"><function>MEDIAN</function></link>,
-        <link linkend="gnumeric-MODE"><function>MODE</function></link>,
-        <link linkend="gnumeric-TRIMMEAN"><function>TRIMMEAN</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>,
+        <link linkend="gnumeric-function-GEOMEAN"><function>GEOMEAN</function></link>,
+        <link linkend="gnumeric-function-MEDIAN"><function>MEDIAN</function></link>,
+        <link linkend="gnumeric-function-MODE"><function>MODE</function></link>,
+        <link linkend="gnumeric-function-TRIMMEAN"><function>TRIMMEAN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-HYPGEOMDIST">
+    <refentry id="gnumeric-function-HYPGEOMDIST">
       <refmeta>
         <refentrytitle>
           <function>HYPGEOMDIST</function>
@@ -15623,12 +15657,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BINOMDIST"><function>BINOMDIST</function></link>,
-        <link linkend="gnumeric-POISSON"><function>POISSON</function></link>.
+        <para><link linkend="gnumeric-function-BINOMDIST"><function>BINOMDIST</function></link>,
+        <link linkend="gnumeric-function-POISSON"><function>POISSON</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-INTERCEPT">
+    <refentry id="gnumeric-function-INTERCEPT">
       <refmeta>
         <refentrytitle>
           <function>INTERCEPT</function>
@@ -15660,12 +15694,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-FORECAST"><function>FORECAST</function></link>,
-        <link linkend="gnumeric-TREND"><function>TREND</function></link>.
+        <para><link linkend="gnumeric-function-FORECAST"><function>FORECAST</function></link>,
+        <link linkend="gnumeric-function-TREND"><function>TREND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-KURT">
+    <refentry id="gnumeric-function-KURT">
       <refmeta>
         <refentrytitle>
           <function>KURT</function>
@@ -15701,14 +15735,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>,
-        <link linkend="gnumeric-VAR"><function>VAR</function></link>,
-        <link linkend="gnumeric-SKEW"><function>SKEW</function></link>,
-        <link linkend="gnumeric-KURTP"><function>KURTP</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>,
+        <link linkend="gnumeric-function-VAR"><function>VAR</function></link>,
+        <link linkend="gnumeric-function-SKEW"><function>SKEW</function></link>,
+        <link linkend="gnumeric-function-KURTP"><function>KURTP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-KURTP">
+    <refentry id="gnumeric-function-KURTP">
       <refmeta>
         <refentrytitle>
           <function>KURTP</function>
@@ -15740,14 +15774,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>,
-        <link linkend="gnumeric-VARP"><function>VARP</function></link>,
-        <link linkend="gnumeric-SKEWP"><function>SKEWP</function></link>,
-        <link linkend="gnumeric-KURT"><function>KURT</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>,
+        <link linkend="gnumeric-function-VARP"><function>VARP</function></link>,
+        <link linkend="gnumeric-function-SKEWP"><function>SKEWP</function></link>,
+        <link linkend="gnumeric-function-KURT"><function>KURT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LANDAU">
+    <refentry id="gnumeric-function-LANDAU">
       <refmeta>
         <refentrytitle>
           <function>LANDAU</function>
@@ -15770,11 +15804,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RANDLANDAU"><function>RANDLANDAU</function></link>.
+        <para><link linkend="gnumeric-function-RANDLANDAU"><function>RANDLANDAU</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LAPLACE">
+    <refentry id="gnumeric-function-LAPLACE">
       <refmeta>
         <refentrytitle>
           <function>LAPLACE</function>
@@ -15798,11 +15832,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RANDLAPLACE"><function>RANDLAPLACE</function></link>.
+        <para><link linkend="gnumeric-function-RANDLAPLACE"><function>RANDLAPLACE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LARGE">
+    <refentry id="gnumeric-function-LARGE">
       <refmeta>
         <refentrytitle>
           <function>LARGE</function>
@@ -15833,14 +15867,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PERCENTILE"><function>PERCENTILE</function></link>,
-        <link linkend="gnumeric-PERCENTRANK"><function>PERCENTRANK</function></link>,
-        <link linkend="gnumeric-QUARTILE"><function>QUARTILE</function></link>,
-        <link linkend="gnumeric-SMALL"><function>SMALL</function></link>.
+        <para><link linkend="gnumeric-function-PERCENTILE"><function>PERCENTILE</function></link>,
+        <link linkend="gnumeric-function-PERCENTRANK"><function>PERCENTRANK</function></link>,
+        <link linkend="gnumeric-function-QUARTILE"><function>QUARTILE</function></link>,
+        <link linkend="gnumeric-function-SMALL"><function>SMALL</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LINEST">
+    <refentry id="gnumeric-function-LINEST">
       <refmeta>
         <refentrytitle>
           <function>LINEST</function>
@@ -15876,12 +15910,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LOGEST"><function>LOGEST</function></link>,
-        <link linkend="gnumeric-TREND"><function>TREND</function></link>.
+        <para><link linkend="gnumeric-function-LOGEST"><function>LOGEST</function></link>,
+        <link linkend="gnumeric-function-TREND"><function>TREND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LKSTEST">
+    <refentry id="gnumeric-function-LKSTEST">
       <refmeta>
         <refentrytitle>
           <function>LKSTEST</function>
@@ -15912,14 +15946,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CHITEST"><function>CHITEST</function></link>,
-        <link linkend="gnumeric-ADTEST"><function>ADTEST</function></link>,
-        <link linkend="gnumeric-SFTEST"><function>SFTEST</function></link>,
-        <link linkend="gnumeric-CVMTEST"><function>CVMTEST</function></link>.
+        <para><link linkend="gnumeric-function-CHITEST"><function>CHITEST</function></link>,
+        <link linkend="gnumeric-function-ADTEST"><function>ADTEST</function></link>,
+        <link linkend="gnumeric-function-SFTEST"><function>SFTEST</function></link>,
+        <link linkend="gnumeric-function-CVMTEST"><function>CVMTEST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LOGEST">
+    <refentry id="gnumeric-function-LOGEST">
       <refmeta>
         <refentrytitle>
           <function>LOGEST</function>
@@ -15954,12 +15988,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-GROWTH"><function>GROWTH</function></link>,
-        <link linkend="gnumeric-TREND"><function>TREND</function></link>.
+        <para><link linkend="gnumeric-function-GROWTH"><function>GROWTH</function></link>,
+        <link linkend="gnumeric-function-TREND"><function>TREND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LOGFIT">
+    <refentry id="gnumeric-function-LOGFIT">
       <refmeta>
         <refentrytitle>
           <function>LOGFIT</function>
@@ -15992,13 +16026,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LOGREG"><function>LOGREG</function></link>,
-        <link linkend="gnumeric-LINEST"><function>LINEST</function></link>,
-        <link linkend="gnumeric-LOGEST"><function>LOGEST</function></link>.
+        <para><link linkend="gnumeric-function-LOGREG"><function>LOGREG</function></link>,
+        <link linkend="gnumeric-function-LINEST"><function>LINEST</function></link>,
+        <link linkend="gnumeric-function-LOGEST"><function>LOGEST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LOGINV">
+    <refentry id="gnumeric-function-LOGINV">
       <refmeta>
         <refentrytitle>
           <function>LOGINV</function>
@@ -16031,15 +16065,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EXP"><function>EXP</function></link>,
-        <link linkend="gnumeric-LN"><function>LN</function></link>,
-        <link linkend="gnumeric-LOG"><function>LOG</function></link>,
-        <link linkend="gnumeric-LOG10"><function>LOG10</function></link>,
-        <link linkend="gnumeric-LOGNORMDIST"><function>LOGNORMDIST</function></link>.
+        <para><link linkend="gnumeric-function-EXP"><function>EXP</function></link>,
+        <link linkend="gnumeric-function-LN"><function>LN</function></link>,
+        <link linkend="gnumeric-function-LOG"><function>LOG</function></link>,
+        <link linkend="gnumeric-function-LOG10"><function>LOG10</function></link>,
+        <link linkend="gnumeric-function-LOGNORMDIST"><function>LOGNORMDIST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LOGISTIC">
+    <refentry id="gnumeric-function-LOGISTIC">
       <refmeta>
         <refentrytitle>
           <function>LOGISTIC</function>
@@ -16063,11 +16097,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RANDLOGISTIC"><function>RANDLOGISTIC</function></link>.
+        <para><link linkend="gnumeric-function-RANDLOGISTIC"><function>RANDLOGISTIC</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LOGNORMDIST">
+    <refentry id="gnumeric-function-LOGNORMDIST">
       <refmeta>
         <refentrytitle>
           <function>LOGNORMDIST</function>
@@ -16100,11 +16134,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-NORMDIST"><function>NORMDIST</function></link>.
+        <para><link linkend="gnumeric-function-NORMDIST"><function>NORMDIST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LOGREG">
+    <refentry id="gnumeric-function-LOGREG">
       <refmeta>
         <refentrytitle>
           <function>LOGREG</function>
@@ -16139,13 +16173,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LOGFIT"><function>LOGFIT</function></link>,
-        <link linkend="gnumeric-LINEST"><function>LINEST</function></link>,
-        <link linkend="gnumeric-LOGEST"><function>LOGEST</function></link>.
+        <para><link linkend="gnumeric-function-LOGFIT"><function>LOGFIT</function></link>,
+        <link linkend="gnumeric-function-LINEST"><function>LINEST</function></link>,
+        <link linkend="gnumeric-function-LOGEST"><function>LOGEST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MAX">
+    <refentry id="gnumeric-function-MAX">
       <refmeta>
         <refentrytitle>
           <function>MAX</function>
@@ -16173,12 +16207,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MIN"><function>MIN</function></link>,
-        <link linkend="gnumeric-ABS"><function>ABS</function></link>.
+        <para><link linkend="gnumeric-function-MIN"><function>MIN</function></link>,
+        <link linkend="gnumeric-function-ABS"><function>ABS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MAXA">
+    <refentry id="gnumeric-function-MAXA">
       <refmeta>
         <refentrytitle>
           <function>MAXA</function>
@@ -16210,12 +16244,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MAX"><function>MAX</function></link>,
-        <link linkend="gnumeric-MINA"><function>MINA</function></link>.
+        <para><link linkend="gnumeric-function-MAX"><function>MAX</function></link>,
+        <link linkend="gnumeric-function-MINA"><function>MINA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MEDIAN">
+    <refentry id="gnumeric-function-MEDIAN">
       <refmeta>
         <refentrytitle>
           <function>MEDIAN</function>
@@ -16251,17 +16285,17 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>,
-        <link linkend="gnumeric-COUNT"><function>COUNT</function></link>,
-        <link linkend="gnumeric-COUNTA"><function>COUNTA</function></link>,
-        <link linkend="gnumeric-DAVERAGE"><function>DAVERAGE</function></link>,
-        <link linkend="gnumeric-MODE"><function>MODE</function></link>,
-        <link linkend="gnumeric-SSMEDIAN"><function>SSMEDIAN</function></link>,
-        <link linkend="gnumeric-SUM"><function>SUM</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>,
+        <link linkend="gnumeric-function-COUNT"><function>COUNT</function></link>,
+        <link linkend="gnumeric-function-COUNTA"><function>COUNTA</function></link>,
+        <link linkend="gnumeric-function-DAVERAGE"><function>DAVERAGE</function></link>,
+        <link linkend="gnumeric-function-MODE"><function>MODE</function></link>,
+        <link linkend="gnumeric-function-SSMEDIAN"><function>SSMEDIAN</function></link>,
+        <link linkend="gnumeric-function-SUM"><function>SUM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MIN">
+    <refentry id="gnumeric-function-MIN">
       <refmeta>
         <refentrytitle>
           <function>MIN</function>
@@ -16289,12 +16323,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MAX"><function>MAX</function></link>,
-        <link linkend="gnumeric-ABS"><function>ABS</function></link>.
+        <para><link linkend="gnumeric-function-MAX"><function>MAX</function></link>,
+        <link linkend="gnumeric-function-ABS"><function>ABS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MINA">
+    <refentry id="gnumeric-function-MINA">
       <refmeta>
         <refentrytitle>
           <function>MINA</function>
@@ -16326,12 +16360,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MIN"><function>MIN</function></link>,
-        <link linkend="gnumeric-MAXA"><function>MAXA</function></link>.
+        <para><link linkend="gnumeric-function-MIN"><function>MIN</function></link>,
+        <link linkend="gnumeric-function-MAXA"><function>MAXA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MODE">
+    <refentry id="gnumeric-function-MODE">
       <refmeta>
         <refentrytitle>
           <function>MODE</function>
@@ -16364,12 +16398,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>,
-        <link linkend="gnumeric-MEDIAN"><function>MEDIAN</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>,
+        <link linkend="gnumeric-function-MEDIAN"><function>MEDIAN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NEGBINOMDIST">
+    <refentry id="gnumeric-function-NEGBINOMDIST">
       <refmeta>
         <refentrytitle>
           <function>NEGBINOMDIST</function>
@@ -16402,15 +16436,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BINOMDIST"><function>BINOMDIST</function></link>,
-        <link linkend="gnumeric-COMBIN"><function>COMBIN</function></link>,
-        <link linkend="gnumeric-FACT"><function>FACT</function></link>,
-        <link linkend="gnumeric-HYPGEOMDIST"><function>HYPGEOMDIST</function></link>,
-        <link linkend="gnumeric-PERMUT"><function>PERMUT</function></link>.
+        <para><link linkend="gnumeric-function-BINOMDIST"><function>BINOMDIST</function></link>,
+        <link linkend="gnumeric-function-COMBIN"><function>COMBIN</function></link>,
+        <link linkend="gnumeric-function-FACT"><function>FACT</function></link>,
+        <link linkend="gnumeric-function-HYPGEOMDIST"><function>HYPGEOMDIST</function></link>,
+        <link linkend="gnumeric-function-PERMUT"><function>PERMUT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NORMDIST">
+    <refentry id="gnumeric-function-NORMDIST">
       <refmeta>
         <refentrytitle>
           <function>NORMDIST</function>
@@ -16444,11 +16478,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-POISSON"><function>POISSON</function></link>.
+        <para><link linkend="gnumeric-function-POISSON"><function>POISSON</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NORMINV">
+    <refentry id="gnumeric-function-NORMINV">
       <refmeta>
         <refentrytitle>
           <function>NORMINV</function>
@@ -16481,15 +16515,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-NORMDIST"><function>NORMDIST</function></link>,
-        <link linkend="gnumeric-NORMSDIST"><function>NORMSDIST</function></link>,
-        <link linkend="gnumeric-NORMSINV"><function>NORMSINV</function></link>,
-        <link linkend="gnumeric-STANDARDIZE"><function>STANDARDIZE</function></link>,
-        <link linkend="gnumeric-ZTEST"><function>ZTEST</function></link>.
+        <para><link linkend="gnumeric-function-NORMDIST"><function>NORMDIST</function></link>,
+        <link linkend="gnumeric-function-NORMSDIST"><function>NORMSDIST</function></link>,
+        <link linkend="gnumeric-function-NORMSINV"><function>NORMSINV</function></link>,
+        <link linkend="gnumeric-function-STANDARDIZE"><function>STANDARDIZE</function></link>,
+        <link linkend="gnumeric-function-ZTEST"><function>ZTEST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NORMSDIST">
+    <refentry id="gnumeric-function-NORMSDIST">
       <refmeta>
         <refentrytitle>
           <function>NORMSDIST</function>
@@ -16520,11 +16554,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-NORMDIST"><function>NORMDIST</function></link>.
+        <para><link linkend="gnumeric-function-NORMDIST"><function>NORMDIST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NORMSINV">
+    <refentry id="gnumeric-function-NORMSINV">
       <refmeta>
         <refentrytitle>
           <function>NORMSINV</function>
@@ -16559,15 +16593,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-NORMDIST"><function>NORMDIST</function></link>,
-        <link linkend="gnumeric-NORMINV"><function>NORMINV</function></link>,
-        <link linkend="gnumeric-NORMSDIST"><function>NORMSDIST</function></link>,
-        <link linkend="gnumeric-STANDARDIZE"><function>STANDARDIZE</function></link>,
-        <link linkend="gnumeric-ZTEST"><function>ZTEST</function></link>.
+        <para><link linkend="gnumeric-function-NORMDIST"><function>NORMDIST</function></link>,
+        <link linkend="gnumeric-function-NORMINV"><function>NORMINV</function></link>,
+        <link linkend="gnumeric-function-NORMSDIST"><function>NORMSDIST</function></link>,
+        <link linkend="gnumeric-function-STANDARDIZE"><function>STANDARDIZE</function></link>,
+        <link linkend="gnumeric-function-ZTEST"><function>ZTEST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PARETO">
+    <refentry id="gnumeric-function-PARETO">
       <refmeta>
         <refentrytitle>
           <function>PARETO</function>
@@ -16592,11 +16626,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RANDPARETO"><function>RANDPARETO</function></link>.
+        <para><link linkend="gnumeric-function-RANDPARETO"><function>RANDPARETO</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PEARSON">
+    <refentry id="gnumeric-function-PEARSON">
       <refmeta>
         <refentrytitle>
           <function>PEARSON</function>
@@ -16628,15 +16662,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-INTERCEPT"><function>INTERCEPT</function></link>,
-        <link linkend="gnumeric-LINEST"><function>LINEST</function></link>,
-        <link linkend="gnumeric-RSQ"><function>RSQ</function></link>,
-        <link linkend="gnumeric-SLOPE"><function>SLOPE</function></link>,
-        <link linkend="gnumeric-STEYX"><function>STEYX</function></link>.
+        <para><link linkend="gnumeric-function-INTERCEPT"><function>INTERCEPT</function></link>,
+        <link linkend="gnumeric-function-LINEST"><function>LINEST</function></link>,
+        <link linkend="gnumeric-function-RSQ"><function>RSQ</function></link>,
+        <link linkend="gnumeric-function-SLOPE"><function>SLOPE</function></link>,
+        <link linkend="gnumeric-function-STEYX"><function>STEYX</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PERCENTILE">
+    <refentry id="gnumeric-function-PERCENTILE">
       <refmeta>
         <refentrytitle>
           <function>PERCENTILE</function>
@@ -16668,11 +16702,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-QUARTILE"><function>QUARTILE</function></link>.
+        <para><link linkend="gnumeric-function-QUARTILE"><function>QUARTILE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PERCENTRANK">
+    <refentry id="gnumeric-function-PERCENTRANK">
       <refmeta>
         <refentrytitle>
           <function>PERCENTRANK</function>
@@ -16701,17 +16735,17 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LARGE"><function>LARGE</function></link>,
-        <link linkend="gnumeric-MAX"><function>MAX</function></link>,
-        <link linkend="gnumeric-MEDIAN"><function>MEDIAN</function></link>,
-        <link linkend="gnumeric-MIN"><function>MIN</function></link>,
-        <link linkend="gnumeric-PERCENTILE"><function>PERCENTILE</function></link>,
-        <link linkend="gnumeric-QUARTILE"><function>QUARTILE</function></link>,
-        <link linkend="gnumeric-SMALL"><function>SMALL</function></link>.
+        <para><link linkend="gnumeric-function-LARGE"><function>LARGE</function></link>,
+        <link linkend="gnumeric-function-MAX"><function>MAX</function></link>,
+        <link linkend="gnumeric-function-MEDIAN"><function>MEDIAN</function></link>,
+        <link linkend="gnumeric-function-MIN"><function>MIN</function></link>,
+        <link linkend="gnumeric-function-PERCENTILE"><function>PERCENTILE</function></link>,
+        <link linkend="gnumeric-function-QUARTILE"><function>QUARTILE</function></link>,
+        <link linkend="gnumeric-function-SMALL"><function>SMALL</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PERMUT">
+    <refentry id="gnumeric-function-PERMUT">
       <refmeta>
         <refentrytitle>
           <function>PERMUT</function>
@@ -16743,11 +16777,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COMBIN"><function>COMBIN</function></link>.
+        <para><link linkend="gnumeric-function-COMBIN"><function>COMBIN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PERMUTATIONA">
+    <refentry id="gnumeric-function-PERMUTATIONA">
       <refmeta>
         <refentrytitle>
           <function>PERMUTATIONA</function>
@@ -16779,11 +16813,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-POWER"><function>POWER</function></link>.
+        <para><link linkend="gnumeric-function-POWER"><function>POWER</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-POISSON">
+    <refentry id="gnumeric-function-POISSON">
       <refmeta>
         <refentrytitle>
           <function>POISSON</function>
@@ -16816,12 +16850,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-NORMDIST"><function>NORMDIST</function></link>,
-        <link linkend="gnumeric-WEIBULL"><function>WEIBULL</function></link>.
+        <para><link linkend="gnumeric-function-NORMDIST"><function>NORMDIST</function></link>,
+        <link linkend="gnumeric-function-WEIBULL"><function>WEIBULL</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PROB">
+    <refentry id="gnumeric-function-PROB">
       <refmeta>
         <refentrytitle>
           <function>PROB</function>
@@ -16855,12 +16889,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-BINOMDIST"><function>BINOMDIST</function></link>,
-        <link linkend="gnumeric-CRITBINOM"><function>CRITBINOM</function></link>.
+        <para><link linkend="gnumeric-function-BINOMDIST"><function>BINOMDIST</function></link>,
+        <link linkend="gnumeric-function-CRITBINOM"><function>CRITBINOM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-QUARTILE">
+    <refentry id="gnumeric-function-QUARTILE">
       <refmeta>
         <refentrytitle>
           <function>QUARTILE</function>
@@ -16892,16 +16926,16 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LARGE"><function>LARGE</function></link>,
-        <link linkend="gnumeric-MAX"><function>MAX</function></link>,
-        <link linkend="gnumeric-MEDIAN"><function>MEDIAN</function></link>,
-        <link linkend="gnumeric-MIN"><function>MIN</function></link>,
-        <link linkend="gnumeric-PERCENTILE"><function>PERCENTILE</function></link>,
-        <link linkend="gnumeric-SMALL"><function>SMALL</function></link>.
+        <para><link linkend="gnumeric-function-LARGE"><function>LARGE</function></link>,
+        <link linkend="gnumeric-function-MAX"><function>MAX</function></link>,
+        <link linkend="gnumeric-function-MEDIAN"><function>MEDIAN</function></link>,
+        <link linkend="gnumeric-function-MIN"><function>MIN</function></link>,
+        <link linkend="gnumeric-function-PERCENTILE"><function>PERCENTILE</function></link>,
+        <link linkend="gnumeric-function-SMALL"><function>SMALL</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DBETA">
+    <refentry id="gnumeric-function-R.DBETA">
       <refmeta>
         <refentrytitle>
           <function>R.DBETA</function>
@@ -16931,12 +16965,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.PBETA"><function>R.PBETA</function></link>,
-        <link linkend="gnumeric-R.QBETA"><function>R.QBETA</function></link>.
+        <para><link linkend="gnumeric-function-R.PBETA"><function>R.PBETA</function></link>,
+        <link linkend="gnumeric-function-R.QBETA"><function>R.QBETA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DBINOM">
+    <refentry id="gnumeric-function-R.DBINOM">
       <refmeta>
         <refentrytitle>
           <function>R.DBINOM</function>
@@ -16966,12 +17000,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.PBINOM"><function>R.PBINOM</function></link>,
-        <link linkend="gnumeric-R.QBINOM"><function>R.QBINOM</function></link>.
+        <para><link linkend="gnumeric-function-R.PBINOM"><function>R.PBINOM</function></link>,
+        <link linkend="gnumeric-function-R.QBINOM"><function>R.QBINOM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DCAUCHY">
+    <refentry id="gnumeric-function-R.DCAUCHY">
       <refmeta>
         <refentrytitle>
           <function>R.DCAUCHY</function>
@@ -17001,12 +17035,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.PCAUCHY"><function>R.PCAUCHY</function></link>,
-        <link linkend="gnumeric-R.QCAUCHY"><function>R.QCAUCHY</function></link>.
+        <para><link linkend="gnumeric-function-R.PCAUCHY"><function>R.PCAUCHY</function></link>,
+        <link linkend="gnumeric-function-R.QCAUCHY"><function>R.QCAUCHY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DCHISQ">
+    <refentry id="gnumeric-function-R.DCHISQ">
       <refmeta>
         <refentrytitle>
           <function>R.DCHISQ</function>
@@ -17039,12 +17073,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.PCHISQ"><function>R.PCHISQ</function></link>,
-        <link linkend="gnumeric-R.QCHISQ"><function>R.QCHISQ</function></link>.
+        <para><link linkend="gnumeric-function-R.PCHISQ"><function>R.PCHISQ</function></link>,
+        <link linkend="gnumeric-function-R.QCHISQ"><function>R.QCHISQ</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DEXP">
+    <refentry id="gnumeric-function-R.DEXP">
       <refmeta>
         <refentrytitle>
           <function>R.DEXP</function>
@@ -17073,12 +17107,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.PEXP"><function>R.PEXP</function></link>,
-        <link linkend="gnumeric-R.QEXP"><function>R.QEXP</function></link>.
+        <para><link linkend="gnumeric-function-R.PEXP"><function>R.PEXP</function></link>,
+        <link linkend="gnumeric-function-R.QEXP"><function>R.QEXP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DF">
+    <refentry id="gnumeric-function-R.DF">
       <refmeta>
         <refentrytitle>
           <function>R.DF</function>
@@ -17108,12 +17142,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.PF"><function>R.PF</function></link>,
-        <link linkend="gnumeric-R.QF"><function>R.QF</function></link>.
+        <para><link linkend="gnumeric-function-R.PF"><function>R.PF</function></link>,
+        <link linkend="gnumeric-function-R.QF"><function>R.QF</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DGAMMA">
+    <refentry id="gnumeric-function-R.DGAMMA">
       <refmeta>
         <refentrytitle>
           <function>R.DGAMMA</function>
@@ -17143,12 +17177,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.PGAMMA"><function>R.PGAMMA</function></link>,
-        <link linkend="gnumeric-R.QGAMMA"><function>R.QGAMMA</function></link>.
+        <para><link linkend="gnumeric-function-R.PGAMMA"><function>R.PGAMMA</function></link>,
+        <link linkend="gnumeric-function-R.QGAMMA"><function>R.QGAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DGEOM">
+    <refentry id="gnumeric-function-R.DGEOM">
       <refmeta>
         <refentrytitle>
           <function>R.DGEOM</function>
@@ -17177,12 +17211,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.PGEOM"><function>R.PGEOM</function></link>,
-        <link linkend="gnumeric-R.QGEOM"><function>R.QGEOM</function></link>.
+        <para><link linkend="gnumeric-function-R.PGEOM"><function>R.PGEOM</function></link>,
+        <link linkend="gnumeric-function-R.QGEOM"><function>R.QGEOM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DHYPER">
+    <refentry id="gnumeric-function-R.DHYPER">
       <refmeta>
         <refentrytitle>
           <function>R.DHYPER</function>
@@ -17213,12 +17247,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.PHYPER"><function>R.PHYPER</function></link>,
-        <link linkend="gnumeric-R.QHYPER"><function>R.QHYPER</function></link>.
+        <para><link linkend="gnumeric-function-R.PHYPER"><function>R.PHYPER</function></link>,
+        <link linkend="gnumeric-function-R.QHYPER"><function>R.QHYPER</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DLNORM">
+    <refentry id="gnumeric-function-R.DLNORM">
       <refmeta>
         <refentrytitle>
           <function>R.DLNORM</function>
@@ -17248,12 +17282,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.PLNORM"><function>R.PLNORM</function></link>,
-        <link linkend="gnumeric-R.QLNORM"><function>R.QLNORM</function></link>.
+        <para><link linkend="gnumeric-function-R.PLNORM"><function>R.PLNORM</function></link>,
+        <link linkend="gnumeric-function-R.QLNORM"><function>R.QLNORM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DNBINOM">
+    <refentry id="gnumeric-function-R.DNBINOM">
       <refmeta>
         <refentrytitle>
           <function>R.DNBINOM</function>
@@ -17283,12 +17317,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.PNBINOM"><function>R.PNBINOM</function></link>,
-        <link linkend="gnumeric-R.QNBINOM"><function>R.QNBINOM</function></link>.
+        <para><link linkend="gnumeric-function-R.PNBINOM"><function>R.PNBINOM</function></link>,
+        <link linkend="gnumeric-function-R.QNBINOM"><function>R.QNBINOM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DNORM">
+    <refentry id="gnumeric-function-R.DNORM">
       <refmeta>
         <refentrytitle>
           <function>R.DNORM</function>
@@ -17318,12 +17352,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.PNORM"><function>R.PNORM</function></link>,
-        <link linkend="gnumeric-R.QNORM"><function>R.QNORM</function></link>.
+        <para><link linkend="gnumeric-function-R.PNORM"><function>R.PNORM</function></link>,
+        <link linkend="gnumeric-function-R.QNORM"><function>R.QNORM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DPOIS">
+    <refentry id="gnumeric-function-R.DPOIS">
       <refmeta>
         <refentrytitle>
           <function>R.DPOIS</function>
@@ -17352,12 +17386,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.PPOIS"><function>R.PPOIS</function></link>,
-        <link linkend="gnumeric-R.QPOIS"><function>R.QPOIS</function></link>.
+        <para><link linkend="gnumeric-function-R.PPOIS"><function>R.PPOIS</function></link>,
+        <link linkend="gnumeric-function-R.QPOIS"><function>R.QPOIS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DSNORM">
+    <refentry id="gnumeric-function-R.DSNORM">
       <refmeta>
         <refentrytitle>
           <function>R.DSNORM</function>
@@ -17388,11 +17422,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.PSNORM"><function>R.PSNORM</function></link>.
+        <para><link linkend="gnumeric-function-R.PSNORM"><function>R.PSNORM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DST">
+    <refentry id="gnumeric-function-R.DST">
       <refmeta>
         <refentrytitle>
           <function>R.DST</function>
@@ -17421,7 +17455,7 @@
         <para>This function returns the probability density function of the skew-t distribution.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DT">
+    <refentry id="gnumeric-function-R.DT">
       <refmeta>
         <refentrytitle>
           <function>R.DT</function>
@@ -17450,12 +17484,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.PT"><function>R.PT</function></link>,
-        <link linkend="gnumeric-R.QT"><function>R.QT</function></link>.
+        <para><link linkend="gnumeric-function-R.PT"><function>R.PT</function></link>,
+        <link linkend="gnumeric-function-R.QT"><function>R.QT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.DWEIBULL">
+    <refentry id="gnumeric-function-R.DWEIBULL">
       <refmeta>
         <refentrytitle>
           <function>R.DWEIBULL</function>
@@ -17485,12 +17519,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.PWEIBULL"><function>R.PWEIBULL</function></link>,
-        <link linkend="gnumeric-R.QWEIBULL"><function>R.QWEIBULL</function></link>.
+        <para><link linkend="gnumeric-function-R.PWEIBULL"><function>R.PWEIBULL</function></link>,
+        <link linkend="gnumeric-function-R.QWEIBULL"><function>R.QWEIBULL</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.PBETA">
+    <refentry id="gnumeric-function-R.PBETA">
       <refmeta>
         <refentrytitle>
           <function>R.PBETA</function>
@@ -17521,12 +17555,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DBETA"><function>R.DBETA</function></link>,
-        <link linkend="gnumeric-R.QBETA"><function>R.QBETA</function></link>.
+        <para><link linkend="gnumeric-function-R.DBETA"><function>R.DBETA</function></link>,
+        <link linkend="gnumeric-function-R.QBETA"><function>R.QBETA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.PBINOM">
+    <refentry id="gnumeric-function-R.PBINOM">
       <refmeta>
         <refentrytitle>
           <function>R.PBINOM</function>
@@ -17557,12 +17591,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DBINOM"><function>R.DBINOM</function></link>,
-        <link linkend="gnumeric-R.QBINOM"><function>R.QBINOM</function></link>.
+        <para><link linkend="gnumeric-function-R.DBINOM"><function>R.DBINOM</function></link>,
+        <link linkend="gnumeric-function-R.QBINOM"><function>R.QBINOM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.PCAUCHY">
+    <refentry id="gnumeric-function-R.PCAUCHY">
       <refmeta>
         <refentrytitle>
           <function>R.PCAUCHY</function>
@@ -17593,12 +17627,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DCAUCHY"><function>R.DCAUCHY</function></link>,
-        <link linkend="gnumeric-R.QCAUCHY"><function>R.QCAUCHY</function></link>.
+        <para><link linkend="gnumeric-function-R.DCAUCHY"><function>R.DCAUCHY</function></link>,
+        <link linkend="gnumeric-function-R.QCAUCHY"><function>R.QCAUCHY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.PCHISQ">
+    <refentry id="gnumeric-function-R.PCHISQ">
       <refmeta>
         <refentrytitle>
           <function>R.PCHISQ</function>
@@ -17632,12 +17666,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DCHISQ"><function>R.DCHISQ</function></link>,
-        <link linkend="gnumeric-R.QCHISQ"><function>R.QCHISQ</function></link>.
+        <para><link linkend="gnumeric-function-R.DCHISQ"><function>R.DCHISQ</function></link>,
+        <link linkend="gnumeric-function-R.QCHISQ"><function>R.QCHISQ</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.PEXP">
+    <refentry id="gnumeric-function-R.PEXP">
       <refmeta>
         <refentrytitle>
           <function>R.PEXP</function>
@@ -17667,12 +17701,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DEXP"><function>R.DEXP</function></link>,
-        <link linkend="gnumeric-R.QEXP"><function>R.QEXP</function></link>.
+        <para><link linkend="gnumeric-function-R.DEXP"><function>R.DEXP</function></link>,
+        <link linkend="gnumeric-function-R.QEXP"><function>R.QEXP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.PF">
+    <refentry id="gnumeric-function-R.PF">
       <refmeta>
         <refentrytitle>
           <function>R.PF</function>
@@ -17703,12 +17737,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DF"><function>R.DF</function></link>,
-        <link linkend="gnumeric-R.QF"><function>R.QF</function></link>.
+        <para><link linkend="gnumeric-function-R.DF"><function>R.DF</function></link>,
+        <link linkend="gnumeric-function-R.QF"><function>R.QF</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.PGAMMA">
+    <refentry id="gnumeric-function-R.PGAMMA">
       <refmeta>
         <refentrytitle>
           <function>R.PGAMMA</function>
@@ -17739,12 +17773,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DGAMMA"><function>R.DGAMMA</function></link>,
-        <link linkend="gnumeric-R.QGAMMA"><function>R.QGAMMA</function></link>.
+        <para><link linkend="gnumeric-function-R.DGAMMA"><function>R.DGAMMA</function></link>,
+        <link linkend="gnumeric-function-R.QGAMMA"><function>R.QGAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.PGEOM">
+    <refentry id="gnumeric-function-R.PGEOM">
       <refmeta>
         <refentrytitle>
           <function>R.PGEOM</function>
@@ -17774,12 +17808,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DGEOM"><function>R.DGEOM</function></link>,
-        <link linkend="gnumeric-R.QGEOM"><function>R.QGEOM</function></link>.
+        <para><link linkend="gnumeric-function-R.DGEOM"><function>R.DGEOM</function></link>,
+        <link linkend="gnumeric-function-R.QGEOM"><function>R.QGEOM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.PHYPER">
+    <refentry id="gnumeric-function-R.PHYPER">
       <refmeta>
         <refentrytitle>
           <function>R.PHYPER</function>
@@ -17811,12 +17845,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DHYPER"><function>R.DHYPER</function></link>,
-        <link linkend="gnumeric-R.QHYPER"><function>R.QHYPER</function></link>.
+        <para><link linkend="gnumeric-function-R.DHYPER"><function>R.DHYPER</function></link>,
+        <link linkend="gnumeric-function-R.QHYPER"><function>R.QHYPER</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.PLNORM">
+    <refentry id="gnumeric-function-R.PLNORM">
       <refmeta>
         <refentrytitle>
           <function>R.PLNORM</function>
@@ -17847,12 +17881,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DLNORM"><function>R.DLNORM</function></link>,
-        <link linkend="gnumeric-R.QLNORM"><function>R.QLNORM</function></link>.
+        <para><link linkend="gnumeric-function-R.DLNORM"><function>R.DLNORM</function></link>,
+        <link linkend="gnumeric-function-R.QLNORM"><function>R.QLNORM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.PNBINOM">
+    <refentry id="gnumeric-function-R.PNBINOM">
       <refmeta>
         <refentrytitle>
           <function>R.PNBINOM</function>
@@ -17883,12 +17917,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DNBINOM"><function>R.DNBINOM</function></link>,
-        <link linkend="gnumeric-R.QNBINOM"><function>R.QNBINOM</function></link>.
+        <para><link linkend="gnumeric-function-R.DNBINOM"><function>R.DNBINOM</function></link>,
+        <link linkend="gnumeric-function-R.QNBINOM"><function>R.QNBINOM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.PNORM">
+    <refentry id="gnumeric-function-R.PNORM">
       <refmeta>
         <refentrytitle>
           <function>R.PNORM</function>
@@ -17919,12 +17953,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DNORM"><function>R.DNORM</function></link>,
-        <link linkend="gnumeric-R.QNORM"><function>R.QNORM</function></link>.
+        <para><link linkend="gnumeric-function-R.DNORM"><function>R.DNORM</function></link>,
+        <link linkend="gnumeric-function-R.QNORM"><function>R.QNORM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.PPOIS">
+    <refentry id="gnumeric-function-R.PPOIS">
       <refmeta>
         <refentrytitle>
           <function>R.PPOIS</function>
@@ -17954,12 +17988,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DPOIS"><function>R.DPOIS</function></link>,
-        <link linkend="gnumeric-R.QPOIS"><function>R.QPOIS</function></link>.
+        <para><link linkend="gnumeric-function-R.DPOIS"><function>R.DPOIS</function></link>,
+        <link linkend="gnumeric-function-R.QPOIS"><function>R.QPOIS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.PSNORM">
+    <refentry id="gnumeric-function-R.PSNORM">
       <refmeta>
         <refentrytitle>
           <function>R.PSNORM</function>
@@ -17991,11 +18025,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DSNORM"><function>R.DSNORM</function></link>.
+        <para><link linkend="gnumeric-function-R.DSNORM"><function>R.DSNORM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.PT">
+    <refentry id="gnumeric-function-R.PT">
       <refmeta>
         <refentrytitle>
           <function>R.PT</function>
@@ -18025,12 +18059,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DT"><function>R.DT</function></link>,
-        <link linkend="gnumeric-R.QT"><function>R.QT</function></link>.
+        <para><link linkend="gnumeric-function-R.DT"><function>R.DT</function></link>,
+        <link linkend="gnumeric-function-R.QT"><function>R.QT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.PWEIBULL">
+    <refentry id="gnumeric-function-R.PWEIBULL">
       <refmeta>
         <refentrytitle>
           <function>R.PWEIBULL</function>
@@ -18061,12 +18095,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DWEIBULL"><function>R.DWEIBULL</function></link>,
-        <link linkend="gnumeric-R.QWEIBULL"><function>R.QWEIBULL</function></link>.
+        <para><link linkend="gnumeric-function-R.DWEIBULL"><function>R.DWEIBULL</function></link>,
+        <link linkend="gnumeric-function-R.QWEIBULL"><function>R.QWEIBULL</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.QBETA">
+    <refentry id="gnumeric-function-R.QBETA">
       <refmeta>
         <refentrytitle>
           <function>R.QBETA</function>
@@ -18097,12 +18131,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DBETA"><function>R.DBETA</function></link>,
-        <link linkend="gnumeric-R.PBETA"><function>R.PBETA</function></link>.
+        <para><link linkend="gnumeric-function-R.DBETA"><function>R.DBETA</function></link>,
+        <link linkend="gnumeric-function-R.PBETA"><function>R.PBETA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.QBINOM">
+    <refentry id="gnumeric-function-R.QBINOM">
       <refmeta>
         <refentrytitle>
           <function>R.QBINOM</function>
@@ -18133,12 +18167,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DBINOM"><function>R.DBINOM</function></link>,
-        <link linkend="gnumeric-R.PBINOM"><function>R.PBINOM</function></link>.
+        <para><link linkend="gnumeric-function-R.DBINOM"><function>R.DBINOM</function></link>,
+        <link linkend="gnumeric-function-R.PBINOM"><function>R.PBINOM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.QCAUCHY">
+    <refentry id="gnumeric-function-R.QCAUCHY">
       <refmeta>
         <refentrytitle>
           <function>R.QCAUCHY</function>
@@ -18169,12 +18203,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DCAUCHY"><function>R.DCAUCHY</function></link>,
-        <link linkend="gnumeric-R.PCAUCHY"><function>R.PCAUCHY</function></link>.
+        <para><link linkend="gnumeric-function-R.DCAUCHY"><function>R.DCAUCHY</function></link>,
+        <link linkend="gnumeric-function-R.PCAUCHY"><function>R.PCAUCHY</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.QCHISQ">
+    <refentry id="gnumeric-function-R.QCHISQ">
       <refmeta>
         <refentrytitle>
           <function>R.QCHISQ</function>
@@ -18208,12 +18242,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DCHISQ"><function>R.DCHISQ</function></link>,
-        <link linkend="gnumeric-R.PCHISQ"><function>R.PCHISQ</function></link>.
+        <para><link linkend="gnumeric-function-R.DCHISQ"><function>R.DCHISQ</function></link>,
+        <link linkend="gnumeric-function-R.PCHISQ"><function>R.PCHISQ</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.QEXP">
+    <refentry id="gnumeric-function-R.QEXP">
       <refmeta>
         <refentrytitle>
           <function>R.QEXP</function>
@@ -18243,12 +18277,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DEXP"><function>R.DEXP</function></link>,
-        <link linkend="gnumeric-R.PEXP"><function>R.PEXP</function></link>.
+        <para><link linkend="gnumeric-function-R.DEXP"><function>R.DEXP</function></link>,
+        <link linkend="gnumeric-function-R.PEXP"><function>R.PEXP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.QF">
+    <refentry id="gnumeric-function-R.QF">
       <refmeta>
         <refentrytitle>
           <function>R.QF</function>
@@ -18279,12 +18313,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DF"><function>R.DF</function></link>,
-        <link linkend="gnumeric-R.PF"><function>R.PF</function></link>.
+        <para><link linkend="gnumeric-function-R.DF"><function>R.DF</function></link>,
+        <link linkend="gnumeric-function-R.PF"><function>R.PF</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.QGAMMA">
+    <refentry id="gnumeric-function-R.QGAMMA">
       <refmeta>
         <refentrytitle>
           <function>R.QGAMMA</function>
@@ -18315,12 +18349,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DGAMMA"><function>R.DGAMMA</function></link>,
-        <link linkend="gnumeric-R.PGAMMA"><function>R.PGAMMA</function></link>.
+        <para><link linkend="gnumeric-function-R.DGAMMA"><function>R.DGAMMA</function></link>,
+        <link linkend="gnumeric-function-R.PGAMMA"><function>R.PGAMMA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.QGEOM">
+    <refentry id="gnumeric-function-R.QGEOM">
       <refmeta>
         <refentrytitle>
           <function>R.QGEOM</function>
@@ -18350,12 +18384,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DGEOM"><function>R.DGEOM</function></link>,
-        <link linkend="gnumeric-R.PGEOM"><function>R.PGEOM</function></link>.
+        <para><link linkend="gnumeric-function-R.DGEOM"><function>R.DGEOM</function></link>,
+        <link linkend="gnumeric-function-R.PGEOM"><function>R.PGEOM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.QHYPER">
+    <refentry id="gnumeric-function-R.QHYPER">
       <refmeta>
         <refentrytitle>
           <function>R.QHYPER</function>
@@ -18387,12 +18421,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DHYPER"><function>R.DHYPER</function></link>,
-        <link linkend="gnumeric-R.PHYPER"><function>R.PHYPER</function></link>.
+        <para><link linkend="gnumeric-function-R.DHYPER"><function>R.DHYPER</function></link>,
+        <link linkend="gnumeric-function-R.PHYPER"><function>R.PHYPER</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.QLNORM">
+    <refentry id="gnumeric-function-R.QLNORM">
       <refmeta>
         <refentrytitle>
           <function>R.QLNORM</function>
@@ -18423,12 +18457,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DLNORM"><function>R.DLNORM</function></link>,
-        <link linkend="gnumeric-R.PLNORM"><function>R.PLNORM</function></link>.
+        <para><link linkend="gnumeric-function-R.DLNORM"><function>R.DLNORM</function></link>,
+        <link linkend="gnumeric-function-R.PLNORM"><function>R.PLNORM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.QNBINOM">
+    <refentry id="gnumeric-function-R.QNBINOM">
       <refmeta>
         <refentrytitle>
           <function>R.QNBINOM</function>
@@ -18459,12 +18493,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DNBINOM"><function>R.DNBINOM</function></link>,
-        <link linkend="gnumeric-R.PNBINOM"><function>R.PNBINOM</function></link>.
+        <para><link linkend="gnumeric-function-R.DNBINOM"><function>R.DNBINOM</function></link>,
+        <link linkend="gnumeric-function-R.PNBINOM"><function>R.PNBINOM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.QNORM">
+    <refentry id="gnumeric-function-R.QNORM">
       <refmeta>
         <refentrytitle>
           <function>R.QNORM</function>
@@ -18495,12 +18529,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DNORM"><function>R.DNORM</function></link>,
-        <link linkend="gnumeric-R.PNORM"><function>R.PNORM</function></link>.
+        <para><link linkend="gnumeric-function-R.DNORM"><function>R.DNORM</function></link>,
+        <link linkend="gnumeric-function-R.PNORM"><function>R.PNORM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.QPOIS">
+    <refentry id="gnumeric-function-R.QPOIS">
       <refmeta>
         <refentrytitle>
           <function>R.QPOIS</function>
@@ -18530,12 +18564,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DPOIS"><function>R.DPOIS</function></link>,
-        <link linkend="gnumeric-R.PPOIS"><function>R.PPOIS</function></link>.
+        <para><link linkend="gnumeric-function-R.DPOIS"><function>R.DPOIS</function></link>,
+        <link linkend="gnumeric-function-R.PPOIS"><function>R.PPOIS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.QT">
+    <refentry id="gnumeric-function-R.QT">
       <refmeta>
         <refentrytitle>
           <function>R.QT</function>
@@ -18565,12 +18599,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DT"><function>R.DT</function></link>,
-        <link linkend="gnumeric-R.PT"><function>R.PT</function></link>.
+        <para><link linkend="gnumeric-function-R.DT"><function>R.DT</function></link>,
+        <link linkend="gnumeric-function-R.PT"><function>R.PT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-R.QWEIBULL">
+    <refentry id="gnumeric-function-R.QWEIBULL">
       <refmeta>
         <refentrytitle>
           <function>R.QWEIBULL</function>
@@ -18601,12 +18635,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-R.DWEIBULL"><function>R.DWEIBULL</function></link>,
-        <link linkend="gnumeric-R.PWEIBULL"><function>R.PWEIBULL</function></link>.
+        <para><link linkend="gnumeric-function-R.DWEIBULL"><function>R.DWEIBULL</function></link>,
+        <link linkend="gnumeric-function-R.PWEIBULL"><function>R.PWEIBULL</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANK">
+    <refentry id="gnumeric-function-RANK">
       <refmeta>
         <refentrytitle>
           <function>RANK</function>
@@ -18639,12 +18673,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PERCENTRANK"><function>PERCENTRANK</function></link>,
-        <link linkend="gnumeric-RANK.AVG"><function>RANK.AVG</function></link>.
+        <para><link linkend="gnumeric-function-PERCENTRANK"><function>PERCENTRANK</function></link>,
+        <link linkend="gnumeric-function-RANK.AVG"><function>RANK.AVG</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RANK.AVG">
+    <refentry id="gnumeric-function-RANK.AVG">
       <refmeta>
         <refentrytitle>
           <function>RANK.AVG</function>
@@ -18677,12 +18711,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PERCENTRANK"><function>PERCENTRANK</function></link>,
-        <link linkend="gnumeric-RANK"><function>RANK</function></link>.
+        <para><link linkend="gnumeric-function-PERCENTRANK"><function>PERCENTRANK</function></link>,
+        <link linkend="gnumeric-function-RANK"><function>RANK</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RAYLEIGH">
+    <refentry id="gnumeric-function-RAYLEIGH">
       <refmeta>
         <refentrytitle>
           <function>RAYLEIGH</function>
@@ -18706,11 +18740,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RANDRAYLEIGH"><function>RANDRAYLEIGH</function></link>.
+        <para><link linkend="gnumeric-function-RANDRAYLEIGH"><function>RANDRAYLEIGH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RAYLEIGHTAIL">
+    <refentry id="gnumeric-function-RAYLEIGHTAIL">
       <refmeta>
         <refentrytitle>
           <function>RAYLEIGHTAIL</function>
@@ -18735,11 +18769,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-RANDRAYLEIGHTAIL"><function>RANDRAYLEIGHTAIL</function></link>.
+        <para><link linkend="gnumeric-function-RANDRAYLEIGHTAIL"><function>RANDRAYLEIGHTAIL</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RSQ">
+    <refentry id="gnumeric-function-RSQ">
       <refmeta>
         <refentrytitle>
           <function>RSQ</function>
@@ -18771,19 +18805,19 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CORREL"><function>CORREL</function></link>,
-        <link linkend="gnumeric-COVAR"><function>COVAR</function></link>,
-        <link linkend="gnumeric-INTERCEPT"><function>INTERCEPT</function></link>,
-        <link linkend="gnumeric-LINEST"><function>LINEST</function></link>,
-        <link linkend="gnumeric-LOGEST"><function>LOGEST</function></link>,
-        <link linkend="gnumeric-PEARSON"><function>PEARSON</function></link>,
-        <link linkend="gnumeric-SLOPE"><function>SLOPE</function></link>,
-        <link linkend="gnumeric-STEYX"><function>STEYX</function></link>,
-        <link linkend="gnumeric-TREND"><function>TREND</function></link>.
+        <para><link linkend="gnumeric-function-CORREL"><function>CORREL</function></link>,
+        <link linkend="gnumeric-function-COVAR"><function>COVAR</function></link>,
+        <link linkend="gnumeric-function-INTERCEPT"><function>INTERCEPT</function></link>,
+        <link linkend="gnumeric-function-LINEST"><function>LINEST</function></link>,
+        <link linkend="gnumeric-function-LOGEST"><function>LOGEST</function></link>,
+        <link linkend="gnumeric-function-PEARSON"><function>PEARSON</function></link>,
+        <link linkend="gnumeric-function-SLOPE"><function>SLOPE</function></link>,
+        <link linkend="gnumeric-function-STEYX"><function>STEYX</function></link>,
+        <link linkend="gnumeric-function-TREND"><function>TREND</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SFTEST">
+    <refentry id="gnumeric-function-SFTEST">
       <refmeta>
         <refentrytitle>
           <function>SFTEST</function>
@@ -18814,14 +18848,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CHITEST"><function>CHITEST</function></link>,
-        <link linkend="gnumeric-ADTEST"><function>ADTEST</function></link>,
-        <link linkend="gnumeric-LKSTEST"><function>LKSTEST</function></link>,
-        <link linkend="gnumeric-CVMTEST"><function>CVMTEST</function></link>.
+        <para><link linkend="gnumeric-function-CHITEST"><function>CHITEST</function></link>,
+        <link linkend="gnumeric-function-ADTEST"><function>ADTEST</function></link>,
+        <link linkend="gnumeric-function-LKSTEST"><function>LKSTEST</function></link>,
+        <link linkend="gnumeric-function-CVMTEST"><function>CVMTEST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SKEW">
+    <refentry id="gnumeric-function-SKEW">
       <refmeta>
         <refentrytitle>
           <function>SKEW</function>
@@ -18857,14 +18891,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>,
-        <link linkend="gnumeric-VAR"><function>VAR</function></link>,
-        <link linkend="gnumeric-SKEWP"><function>SKEWP</function></link>,
-        <link linkend="gnumeric-KURT"><function>KURT</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>,
+        <link linkend="gnumeric-function-VAR"><function>VAR</function></link>,
+        <link linkend="gnumeric-function-SKEWP"><function>SKEWP</function></link>,
+        <link linkend="gnumeric-function-KURT"><function>KURT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SKEWP">
+    <refentry id="gnumeric-function-SKEWP">
       <refmeta>
         <refentrytitle>
           <function>SKEWP</function>
@@ -18896,14 +18930,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>,
-        <link linkend="gnumeric-VARP"><function>VARP</function></link>,
-        <link linkend="gnumeric-SKEW"><function>SKEW</function></link>,
-        <link linkend="gnumeric-KURTP"><function>KURTP</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>,
+        <link linkend="gnumeric-function-VARP"><function>VARP</function></link>,
+        <link linkend="gnumeric-function-SKEW"><function>SKEW</function></link>,
+        <link linkend="gnumeric-function-KURTP"><function>KURTP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SLOPE">
+    <refentry id="gnumeric-function-SLOPE">
       <refmeta>
         <refentrytitle>
           <function>SLOPE</function>
@@ -18935,12 +18969,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-STDEV"><function>STDEV</function></link>,
-        <link linkend="gnumeric-STDEVPA"><function>STDEVPA</function></link>.
+        <para><link linkend="gnumeric-function-STDEV"><function>STDEV</function></link>,
+        <link linkend="gnumeric-function-STDEVPA"><function>STDEVPA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SMALL">
+    <refentry id="gnumeric-function-SMALL">
       <refmeta>
         <refentrytitle>
           <function>SMALL</function>
@@ -18971,14 +19005,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PERCENTILE"><function>PERCENTILE</function></link>,
-        <link linkend="gnumeric-PERCENTRANK"><function>PERCENTRANK</function></link>,
-        <link linkend="gnumeric-QUARTILE"><function>QUARTILE</function></link>,
-        <link linkend="gnumeric-LARGE"><function>LARGE</function></link>.
+        <para><link linkend="gnumeric-function-PERCENTILE"><function>PERCENTILE</function></link>,
+        <link linkend="gnumeric-function-PERCENTRANK"><function>PERCENTRANK</function></link>,
+        <link linkend="gnumeric-function-QUARTILE"><function>QUARTILE</function></link>,
+        <link linkend="gnumeric-function-LARGE"><function>LARGE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SSMEDIAN">
+    <refentry id="gnumeric-function-SSMEDIAN">
       <refmeta>
         <refentrytitle>
           <function>SSMEDIAN</function>
@@ -19016,11 +19050,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MEDIAN"><function>MEDIAN</function></link>.
+        <para><link linkend="gnumeric-function-MEDIAN"><function>MEDIAN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-STANDARDIZE">
+    <refentry id="gnumeric-function-STANDARDIZE">
       <refmeta>
         <refentrytitle>
           <function>STANDARDIZE</function>
@@ -19053,11 +19087,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-STDEV">
+    <refentry id="gnumeric-function-STDEV">
       <refmeta>
         <refentrytitle>
           <function>STDEV</function>
@@ -19090,16 +19124,16 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>,
-        <link linkend="gnumeric-DSTDEV"><function>DSTDEV</function></link>,
-        <link linkend="gnumeric-DSTDEVP"><function>DSTDEVP</function></link>,
-        <link linkend="gnumeric-STDEVA"><function>STDEVA</function></link>,
-        <link linkend="gnumeric-STDEVPA"><function>STDEVPA</function></link>,
-        <link linkend="gnumeric-VAR"><function>VAR</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>,
+        <link linkend="gnumeric-function-DSTDEV"><function>DSTDEV</function></link>,
+        <link linkend="gnumeric-function-DSTDEVP"><function>DSTDEVP</function></link>,
+        <link linkend="gnumeric-function-STDEVA"><function>STDEVA</function></link>,
+        <link linkend="gnumeric-function-STDEVPA"><function>STDEVPA</function></link>,
+        <link linkend="gnumeric-function-VAR"><function>VAR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-STDEVA">
+    <refentry id="gnumeric-function-STDEVA">
       <refmeta>
         <refentrytitle>
           <function>STDEVA</function>
@@ -19133,12 +19167,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-STDEV"><function>STDEV</function></link>,
-        <link linkend="gnumeric-STDEVPA"><function>STDEVPA</function></link>.
+        <para><link linkend="gnumeric-function-STDEV"><function>STDEV</function></link>,
+        <link linkend="gnumeric-function-STDEVPA"><function>STDEVPA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-STDEVP">
+    <refentry id="gnumeric-function-STDEVP">
       <refmeta>
         <refentrytitle>
           <function>STDEVP</function>
@@ -19170,13 +19204,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-STDEV"><function>STDEV</function></link>,
-        <link linkend="gnumeric-STDEVA"><function>STDEVA</function></link>,
-        <link linkend="gnumeric-STDEVPA"><function>STDEVPA</function></link>.
+        <para><link linkend="gnumeric-function-STDEV"><function>STDEV</function></link>,
+        <link linkend="gnumeric-function-STDEVA"><function>STDEVA</function></link>,
+        <link linkend="gnumeric-function-STDEVPA"><function>STDEVPA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-STDEVPA">
+    <refentry id="gnumeric-function-STDEVPA">
       <refmeta>
         <refentrytitle>
           <function>STDEVPA</function>
@@ -19209,12 +19243,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-STDEVA"><function>STDEVA</function></link>,
-        <link linkend="gnumeric-STDEVP"><function>STDEVP</function></link>.
+        <para><link linkend="gnumeric-function-STDEVA"><function>STDEVA</function></link>,
+        <link linkend="gnumeric-function-STDEVP"><function>STDEVP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-STEYX">
+    <refentry id="gnumeric-function-STEYX">
       <refmeta>
         <refentrytitle>
           <function>STEYX</function>
@@ -19246,13 +19280,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PEARSON"><function>PEARSON</function></link>,
-        <link linkend="gnumeric-RSQ"><function>RSQ</function></link>,
-        <link linkend="gnumeric-SLOPE"><function>SLOPE</function></link>.
+        <para><link linkend="gnumeric-function-PEARSON"><function>PEARSON</function></link>,
+        <link linkend="gnumeric-function-RSQ"><function>RSQ</function></link>,
+        <link linkend="gnumeric-function-SLOPE"><function>SLOPE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SUBTOTAL">
+    <refentry id="gnumeric-function-SUBTOTAL">
       <refmeta>
         <refentrytitle>
           <function>SUBTOTAL</function>
@@ -19292,12 +19326,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-COUNT"><function>COUNT</function></link>,
-        <link linkend="gnumeric-SUM"><function>SUM</function></link>.
+        <para><link linkend="gnumeric-function-COUNT"><function>COUNT</function></link>,
+        <link linkend="gnumeric-function-SUM"><function>SUM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TDIST">
+    <refentry id="gnumeric-function-TDIST">
       <refmeta>
         <refentrytitle>
           <function>TDIST</function>
@@ -19331,12 +19365,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TINV"><function>TINV</function></link>,
-        <link linkend="gnumeric-TTEST"><function>TTEST</function></link>.
+        <para><link linkend="gnumeric-function-TINV"><function>TINV</function></link>,
+        <link linkend="gnumeric-function-TTEST"><function>TTEST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TINV">
+    <refentry id="gnumeric-function-TINV">
       <refmeta>
         <refentrytitle>
           <function>TINV</function>
@@ -19372,12 +19406,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TDIST"><function>TDIST</function></link>,
-        <link linkend="gnumeric-TTEST"><function>TTEST</function></link>.
+        <para><link linkend="gnumeric-function-TDIST"><function>TDIST</function></link>,
+        <link linkend="gnumeric-function-TTEST"><function>TTEST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TREND">
+    <refentry id="gnumeric-function-TREND">
       <refmeta>
         <refentrytitle>
           <function>TREND</function>
@@ -19407,11 +19441,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LINEST"><function>LINEST</function></link>.
+        <para><link linkend="gnumeric-function-LINEST"><function>LINEST</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TRIMMEAN">
+    <refentry id="gnumeric-function-TRIMMEAN">
       <refmeta>
         <refentrytitle>
           <function>TRIMMEAN</function>
@@ -19443,15 +19477,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>,
-        <link linkend="gnumeric-GEOMEAN"><function>GEOMEAN</function></link>,
-        <link linkend="gnumeric-HARMEAN"><function>HARMEAN</function></link>,
-        <link linkend="gnumeric-MEDIAN"><function>MEDIAN</function></link>,
-        <link linkend="gnumeric-MODE"><function>MODE</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>,
+        <link linkend="gnumeric-function-GEOMEAN"><function>GEOMEAN</function></link>,
+        <link linkend="gnumeric-function-HARMEAN"><function>HARMEAN</function></link>,
+        <link linkend="gnumeric-function-MEDIAN"><function>MEDIAN</function></link>,
+        <link linkend="gnumeric-function-MODE"><function>MODE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TTEST">
+    <refentry id="gnumeric-function-TTEST">
       <refmeta>
         <refentrytitle>
           <function>TTEST</function>
@@ -19485,12 +19519,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-FDIST"><function>FDIST</function></link>,
-        <link linkend="gnumeric-FINV"><function>FINV</function></link>.
+        <para><link linkend="gnumeric-function-FDIST"><function>FDIST</function></link>,
+        <link linkend="gnumeric-function-FINV"><function>FINV</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-VAR">
+    <refentry id="gnumeric-function-VAR">
       <refmeta>
         <refentrytitle>
           <function>VAR</function>
@@ -19526,13 +19560,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-VARP"><function>VARP</function></link>,
-        <link linkend="gnumeric-STDEV"><function>STDEV</function></link>,
-        <link linkend="gnumeric-VARA"><function>VARA</function></link>.
+        <para><link linkend="gnumeric-function-VARP"><function>VARP</function></link>,
+        <link linkend="gnumeric-function-STDEV"><function>STDEV</function></link>,
+        <link linkend="gnumeric-function-VARA"><function>VARA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-VARA">
+    <refentry id="gnumeric-function-VARA">
       <refmeta>
         <refentrytitle>
           <function>VARA</function>
@@ -19570,12 +19604,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-VAR"><function>VAR</function></link>,
-        <link linkend="gnumeric-VARPA"><function>VARPA</function></link>.
+        <para><link linkend="gnumeric-function-VAR"><function>VAR</function></link>,
+        <link linkend="gnumeric-function-VARPA"><function>VARPA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-VARP">
+    <refentry id="gnumeric-function-VARP">
       <refmeta>
         <refentrytitle>
           <function>VARP</function>
@@ -19603,15 +19637,15 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-AVERAGE"><function>AVERAGE</function></link>,
-        <link linkend="gnumeric-DVAR"><function>DVAR</function></link>,
-        <link linkend="gnumeric-DVARP"><function>DVARP</function></link>,
-        <link linkend="gnumeric-STDEV"><function>STDEV</function></link>,
-        <link linkend="gnumeric-VAR"><function>VAR</function></link>.
+        <para><link linkend="gnumeric-function-AVERAGE"><function>AVERAGE</function></link>,
+        <link linkend="gnumeric-function-DVAR"><function>DVAR</function></link>,
+        <link linkend="gnumeric-function-DVARP"><function>DVARP</function></link>,
+        <link linkend="gnumeric-function-STDEV"><function>STDEV</function></link>,
+        <link linkend="gnumeric-function-VAR"><function>VAR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-VARPA">
+    <refentry id="gnumeric-function-VARPA">
       <refmeta>
         <refentrytitle>
           <function>VARPA</function>
@@ -19644,12 +19678,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-VARA"><function>VARA</function></link>,
-        <link linkend="gnumeric-VARP"><function>VARP</function></link>.
+        <para><link linkend="gnumeric-function-VARA"><function>VARA</function></link>,
+        <link linkend="gnumeric-function-VARP"><function>VARP</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-WEIBULL">
+    <refentry id="gnumeric-function-WEIBULL">
       <refmeta>
         <refentrytitle>
           <function>WEIBULL</function>
@@ -19687,11 +19721,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-POISSON"><function>POISSON</function></link>.
+        <para><link linkend="gnumeric-function-POISSON"><function>POISSON</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-ZTEST">
+    <refentry id="gnumeric-function-ZTEST">
       <refmeta>
         <refentrytitle>
           <function>ZTEST</function>
@@ -19732,19 +19766,19 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CONFIDENCE"><function>CONFIDENCE</function></link>,
-        <link linkend="gnumeric-NORMDIST"><function>NORMDIST</function></link>,
-        <link linkend="gnumeric-NORMINV"><function>NORMINV</function></link>,
-        <link linkend="gnumeric-NORMSDIST"><function>NORMSDIST</function></link>,
-        <link linkend="gnumeric-NORMSINV"><function>NORMSINV</function></link>,
-        <link linkend="gnumeric-STANDARDIZE"><function>STANDARDIZE</function></link>.
+        <para><link linkend="gnumeric-function-CONFIDENCE"><function>CONFIDENCE</function></link>,
+        <link linkend="gnumeric-function-NORMDIST"><function>NORMDIST</function></link>,
+        <link linkend="gnumeric-function-NORMINV"><function>NORMINV</function></link>,
+        <link linkend="gnumeric-function-NORMSDIST"><function>NORMSDIST</function></link>,
+        <link linkend="gnumeric-function-NORMSINV"><function>NORMSINV</function></link>,
+        <link linkend="gnumeric-function-STANDARDIZE"><function>STANDARDIZE</function></link>.
       </para>
       </refsect1>
     </refentry>
   </sect1>
   <sect1 id="CATEGORY_String">
     <title>String</title>
-    <refentry id="gnumeric-ASC">
+    <refentry id="gnumeric-function-ASC">
       <refmeta>
         <refentrytitle>
           <function>ASC</function>
@@ -19784,11 +19818,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-JIS"><function>JIS</function></link>.
+        <para><link linkend="gnumeric-function-JIS"><function>JIS</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CHAR">
+    <refentry id="gnumeric-function-CHAR">
       <refmeta>
         <refentrytitle>
           <function>CHAR</function>
@@ -19823,11 +19857,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CODE"><function>CODE</function></link>.
+        <para><link linkend="gnumeric-function-CODE"><function>CODE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CLEAN">
+    <refentry id="gnumeric-function-CLEAN">
       <refmeta>
         <refentrytitle>
           <function>CLEAN</function>
@@ -19856,7 +19890,7 @@
         <para>This function is Excel compatible.</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CODE">
+    <refentry id="gnumeric-function-CODE">
       <refmeta>
         <refentrytitle>
           <function>CODE</function>
@@ -19890,11 +19924,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CHAR"><function>CHAR</function></link>.
+        <para><link linkend="gnumeric-function-CHAR"><function>CHAR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-CONCATENATE">
+    <refentry id="gnumeric-function-CONCATENATE">
       <refmeta>
         <refentrytitle>
           <function>CONCATENATE</function>
@@ -19922,13 +19956,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LEFT"><function>LEFT</function></link>,
-        <link linkend="gnumeric-MID"><function>MID</function></link>,
-        <link linkend="gnumeric-RIGHT"><function>RIGHT</function></link>.
+        <para><link linkend="gnumeric-function-LEFT"><function>LEFT</function></link>,
+        <link linkend="gnumeric-function-MID"><function>MID</function></link>,
+        <link linkend="gnumeric-function-RIGHT"><function>RIGHT</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-DOLLAR">
+    <refentry id="gnumeric-function-DOLLAR">
       <refmeta>
         <refentrytitle>
           <function>DOLLAR</function>
@@ -19955,13 +19989,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-FIXED"><function>FIXED</function></link>,
-        <link linkend="gnumeric-TEXT"><function>TEXT</function></link>,
-        <link linkend="gnumeric-VALUE"><function>VALUE</function></link>.
+        <para><link linkend="gnumeric-function-FIXED"><function>FIXED</function></link>,
+        <link linkend="gnumeric-function-TEXT"><function>TEXT</function></link>,
+        <link linkend="gnumeric-function-VALUE"><function>VALUE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-EXACT">
+    <refentry id="gnumeric-function-EXACT">
       <refmeta>
         <refentrytitle>
           <function>EXACT</function>
@@ -19989,13 +20023,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LEN"><function>LEN</function></link>,
-        <link linkend="gnumeric-SEARCH"><function>SEARCH</function></link>,
-        <link linkend="gnumeric-DELTA"><function>DELTA</function></link>.
+        <para><link linkend="gnumeric-function-LEN"><function>LEN</function></link>,
+        <link linkend="gnumeric-function-SEARCH"><function>SEARCH</function></link>,
+        <link linkend="gnumeric-function-DELTA"><function>DELTA</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FIND">
+    <refentry id="gnumeric-function-FIND">
       <refmeta>
         <refentrytitle>
           <function>FIND</function>
@@ -20028,14 +20062,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-EXACT"><function>EXACT</function></link>,
-        <link linkend="gnumeric-LEN"><function>LEN</function></link>,
-        <link linkend="gnumeric-MID"><function>MID</function></link>,
-        <link linkend="gnumeric-SEARCH"><function>SEARCH</function></link>.
+        <para><link linkend="gnumeric-function-EXACT"><function>EXACT</function></link>,
+        <link linkend="gnumeric-function-LEN"><function>LEN</function></link>,
+        <link linkend="gnumeric-function-MID"><function>MID</function></link>,
+        <link linkend="gnumeric-function-SEARCH"><function>SEARCH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FINDB">
+    <refentry id="gnumeric-function-FINDB">
       <refmeta>
         <refentrytitle>
           <function>FINDB</function>
@@ -20072,18 +20106,18 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-FIND"><function>FIND</function></link>,
-        <link linkend="gnumeric-LEFTB"><function>LEFTB</function></link>,
-        <link linkend="gnumeric-RIGHTB"><function>RIGHTB</function></link>,
-        <link linkend="gnumeric-LENB"><function>LENB</function></link>,
-        <link linkend="gnumeric-LEFT"><function>LEFT</function></link>,
-        <link linkend="gnumeric-MID"><function>MID</function></link>,
-        <link linkend="gnumeric-RIGHT"><function>RIGHT</function></link>,
-        <link linkend="gnumeric-LEN"><function>LEN</function></link>.
+        <para><link linkend="gnumeric-function-FIND"><function>FIND</function></link>,
+        <link linkend="gnumeric-function-LEFTB"><function>LEFTB</function></link>,
+        <link linkend="gnumeric-function-RIGHTB"><function>RIGHTB</function></link>,
+        <link linkend="gnumeric-function-LENB"><function>LENB</function></link>,
+        <link linkend="gnumeric-function-LEFT"><function>LEFT</function></link>,
+        <link linkend="gnumeric-function-MID"><function>MID</function></link>,
+        <link linkend="gnumeric-function-RIGHT"><function>RIGHT</function></link>,
+        <link linkend="gnumeric-function-LEN"><function>LEN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-FIXED">
+    <refentry id="gnumeric-function-FIXED">
       <refmeta>
         <refentrytitle>
           <function>FIXED</function>
@@ -20112,13 +20146,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-TEXT"><function>TEXT</function></link>,
-        <link linkend="gnumeric-VALUE"><function>VALUE</function></link>,
-        <link linkend="gnumeric-DOLLAR"><function>DOLLAR</function></link>.
+        <para><link linkend="gnumeric-function-TEXT"><function>TEXT</function></link>,
+        <link linkend="gnumeric-function-VALUE"><function>VALUE</function></link>,
+        <link linkend="gnumeric-function-DOLLAR"><function>DOLLAR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-JIS">
+    <refentry id="gnumeric-function-JIS">
       <refmeta>
         <refentrytitle>
           <function>JIS</function>
@@ -20158,11 +20192,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-ASC"><function>ASC</function></link>.
+        <para><link linkend="gnumeric-function-ASC"><function>ASC</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LEFT">
+    <refentry id="gnumeric-function-LEFT">
       <refmeta>
         <refentrytitle>
           <function>LEFT</function>
@@ -20198,16 +20232,16 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MID"><function>MID</function></link>,
-        <link linkend="gnumeric-RIGHT"><function>RIGHT</function></link>,
-        <link linkend="gnumeric-LEN"><function>LEN</function></link>,
-        <link linkend="gnumeric-MIDB"><function>MIDB</function></link>,
-        <link linkend="gnumeric-RIGHTB"><function>RIGHTB</function></link>,
-        <link linkend="gnumeric-LENB"><function>LENB</function></link>.
+        <para><link linkend="gnumeric-function-MID"><function>MID</function></link>,
+        <link linkend="gnumeric-function-RIGHT"><function>RIGHT</function></link>,
+        <link linkend="gnumeric-function-LEN"><function>LEN</function></link>,
+        <link linkend="gnumeric-function-MIDB"><function>MIDB</function></link>,
+        <link linkend="gnumeric-function-RIGHTB"><function>RIGHTB</function></link>,
+        <link linkend="gnumeric-function-LENB"><function>LENB</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LEFTB">
+    <refentry id="gnumeric-function-LEFTB">
       <refmeta>
         <refentrytitle>
           <function>LEFTB</function>
@@ -20243,17 +20277,17 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MIDB"><function>MIDB</function></link>,
-        <link linkend="gnumeric-RIGHTB"><function>RIGHTB</function></link>,
-        <link linkend="gnumeric-LENB"><function>LENB</function></link>,
-        <link linkend="gnumeric-LEFT"><function>LEFT</function></link>,
-        <link linkend="gnumeric-MID"><function>MID</function></link>,
-        <link linkend="gnumeric-RIGHT"><function>RIGHT</function></link>,
-        <link linkend="gnumeric-LEN"><function>LEN</function></link>.
+        <para><link linkend="gnumeric-function-MIDB"><function>MIDB</function></link>,
+        <link linkend="gnumeric-function-RIGHTB"><function>RIGHTB</function></link>,
+        <link linkend="gnumeric-function-LENB"><function>LENB</function></link>,
+        <link linkend="gnumeric-function-LEFT"><function>LEFT</function></link>,
+        <link linkend="gnumeric-function-MID"><function>MID</function></link>,
+        <link linkend="gnumeric-function-RIGHT"><function>RIGHT</function></link>,
+        <link linkend="gnumeric-function-LEN"><function>LEN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LEN">
+    <refentry id="gnumeric-function-LEN">
       <refmeta>
         <refentrytitle>
           <function>LEN</function>
@@ -20280,13 +20314,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CHAR"><function>CHAR</function></link>,
-        <link linkend="gnumeric-CODE"><function>CODE</function></link>,
-        <link linkend="gnumeric-LENB"><function>LENB</function></link>.
+        <para><link linkend="gnumeric-function-CHAR"><function>CHAR</function></link>,
+        <link linkend="gnumeric-function-CODE"><function>CODE</function></link>,
+        <link linkend="gnumeric-function-LENB"><function>LENB</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LENB">
+    <refentry id="gnumeric-function-LENB">
       <refmeta>
         <refentrytitle>
           <function>LENB</function>
@@ -20313,13 +20347,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CHAR"><function>CHAR</function></link>,
-        <link linkend="gnumeric-CODE"><function>CODE</function></link>,
-        <link linkend="gnumeric-LEN"><function>LEN</function></link>.
+        <para><link linkend="gnumeric-function-CHAR"><function>CHAR</function></link>,
+        <link linkend="gnumeric-function-CODE"><function>CODE</function></link>,
+        <link linkend="gnumeric-function-LEN"><function>LEN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-LOWER">
+    <refentry id="gnumeric-function-LOWER">
       <refmeta>
         <refentrytitle>
           <function>LOWER</function>
@@ -20346,11 +20380,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-UPPER"><function>UPPER</function></link>.
+        <para><link linkend="gnumeric-function-UPPER"><function>UPPER</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MID">
+    <refentry id="gnumeric-function-MID">
       <refmeta>
         <refentrytitle>
           <function>MID</function>
@@ -20383,17 +20417,17 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LEFT"><function>LEFT</function></link>,
-        <link linkend="gnumeric-RIGHT"><function>RIGHT</function></link>,
-        <link linkend="gnumeric-LEN"><function>LEN</function></link>,
-        <link linkend="gnumeric-LEFTB"><function>LEFTB</function></link>,
-        <link linkend="gnumeric-MIDB"><function>MIDB</function></link>,
-        <link linkend="gnumeric-RIGHTB"><function>RIGHTB</function></link>,
-        <link linkend="gnumeric-LENB"><function>LENB</function></link>.
+        <para><link linkend="gnumeric-function-LEFT"><function>LEFT</function></link>,
+        <link linkend="gnumeric-function-RIGHT"><function>RIGHT</function></link>,
+        <link linkend="gnumeric-function-LEN"><function>LEN</function></link>,
+        <link linkend="gnumeric-function-LEFTB"><function>LEFTB</function></link>,
+        <link linkend="gnumeric-function-MIDB"><function>MIDB</function></link>,
+        <link linkend="gnumeric-function-RIGHTB"><function>RIGHTB</function></link>,
+        <link linkend="gnumeric-function-LENB"><function>LENB</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-MIDB">
+    <refentry id="gnumeric-function-MIDB">
       <refmeta>
         <refentrytitle>
           <function>MIDB</function>
@@ -20430,17 +20464,17 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LEFTB"><function>LEFTB</function></link>,
-        <link linkend="gnumeric-RIGHTB"><function>RIGHTB</function></link>,
-        <link linkend="gnumeric-LENB"><function>LENB</function></link>,
-        <link linkend="gnumeric-LEFT"><function>LEFT</function></link>,
-        <link linkend="gnumeric-MID"><function>MID</function></link>,
-        <link linkend="gnumeric-RIGHT"><function>RIGHT</function></link>,
-        <link linkend="gnumeric-LEN"><function>LEN</function></link>.
+        <para><link linkend="gnumeric-function-LEFTB"><function>LEFTB</function></link>,
+        <link linkend="gnumeric-function-RIGHTB"><function>RIGHTB</function></link>,
+        <link linkend="gnumeric-function-LENB"><function>LENB</function></link>,
+        <link linkend="gnumeric-function-LEFT"><function>LEFT</function></link>,
+        <link linkend="gnumeric-function-MID"><function>MID</function></link>,
+        <link linkend="gnumeric-function-RIGHT"><function>RIGHT</function></link>,
+        <link linkend="gnumeric-function-LEN"><function>LEN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-NUMBERVALUE">
+    <refentry id="gnumeric-function-NUMBERVALUE">
       <refmeta>
         <refentrytitle>
           <function>NUMBERVALUE</function>
@@ -20472,11 +20506,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-VALUE"><function>VALUE</function></link>.
+        <para><link linkend="gnumeric-function-VALUE"><function>VALUE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PROPER">
+    <refentry id="gnumeric-function-PROPER">
       <refmeta>
         <refentrytitle>
           <function>PROPER</function>
@@ -20502,12 +20536,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LOWER"><function>LOWER</function></link>,
-        <link linkend="gnumeric-UPPER"><function>UPPER</function></link>.
+        <para><link linkend="gnumeric-function-LOWER"><function>LOWER</function></link>,
+        <link linkend="gnumeric-function-UPPER"><function>UPPER</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-REPLACE">
+    <refentry id="gnumeric-function-REPLACE">
       <refmeta>
         <refentrytitle>
           <function>REPLACE</function>
@@ -20537,14 +20571,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MID"><function>MID</function></link>,
-        <link linkend="gnumeric-SEARCH"><function>SEARCH</function></link>,
-        <link linkend="gnumeric-SUBSTITUTE"><function>SUBSTITUTE</function></link>,
-        <link linkend="gnumeric-TRIM"><function>TRIM</function></link>.
+        <para><link linkend="gnumeric-function-MID"><function>MID</function></link>,
+        <link linkend="gnumeric-function-SEARCH"><function>SEARCH</function></link>,
+        <link linkend="gnumeric-function-SUBSTITUTE"><function>SUBSTITUTE</function></link>,
+        <link linkend="gnumeric-function-TRIM"><function>TRIM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-REPLACEB">
+    <refentry id="gnumeric-function-REPLACEB">
       <refmeta>
         <refentrytitle>
           <function>REPLACEB</function>
@@ -20586,14 +20620,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-MID"><function>MID</function></link>,
-        <link linkend="gnumeric-SEARCH"><function>SEARCH</function></link>,
-        <link linkend="gnumeric-SUBSTITUTE"><function>SUBSTITUTE</function></link>,
-        <link linkend="gnumeric-TRIM"><function>TRIM</function></link>.
+        <para><link linkend="gnumeric-function-MID"><function>MID</function></link>,
+        <link linkend="gnumeric-function-SEARCH"><function>SEARCH</function></link>,
+        <link linkend="gnumeric-function-SUBSTITUTE"><function>SUBSTITUTE</function></link>,
+        <link linkend="gnumeric-function-TRIM"><function>TRIM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-REPT">
+    <refentry id="gnumeric-function-REPT">
       <refmeta>
         <refentrytitle>
           <function>REPT</function>
@@ -20620,11 +20654,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CONCATENATE"><function>CONCATENATE</function></link>.
+        <para><link linkend="gnumeric-function-CONCATENATE"><function>CONCATENATE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RIGHT">
+    <refentry id="gnumeric-function-RIGHT">
       <refmeta>
         <refentrytitle>
           <function>RIGHT</function>
@@ -20660,17 +20694,17 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LEFT"><function>LEFT</function></link>,
-        <link linkend="gnumeric-MID"><function>MID</function></link>,
-        <link linkend="gnumeric-LEN"><function>LEN</function></link>,
-        <link linkend="gnumeric-LEFTB"><function>LEFTB</function></link>,
-        <link linkend="gnumeric-MIDB"><function>MIDB</function></link>,
-        <link linkend="gnumeric-RIGHTB"><function>RIGHTB</function></link>,
-        <link linkend="gnumeric-LENB"><function>LENB</function></link>.
+        <para><link linkend="gnumeric-function-LEFT"><function>LEFT</function></link>,
+        <link linkend="gnumeric-function-MID"><function>MID</function></link>,
+        <link linkend="gnumeric-function-LEN"><function>LEN</function></link>,
+        <link linkend="gnumeric-function-LEFTB"><function>LEFTB</function></link>,
+        <link linkend="gnumeric-function-MIDB"><function>MIDB</function></link>,
+        <link linkend="gnumeric-function-RIGHTB"><function>RIGHTB</function></link>,
+        <link linkend="gnumeric-function-LENB"><function>LENB</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-RIGHTB">
+    <refentry id="gnumeric-function-RIGHTB">
       <refmeta>
         <refentrytitle>
           <function>RIGHTB</function>
@@ -20706,17 +20740,17 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LEFTB"><function>LEFTB</function></link>,
-        <link linkend="gnumeric-MIDB"><function>MIDB</function></link>,
-        <link linkend="gnumeric-LENB"><function>LENB</function></link>,
-        <link linkend="gnumeric-LEFT"><function>LEFT</function></link>,
-        <link linkend="gnumeric-MID"><function>MID</function></link>,
-        <link linkend="gnumeric-RIGHT"><function>RIGHT</function></link>,
-        <link linkend="gnumeric-LEN"><function>LEN</function></link>.
+        <para><link linkend="gnumeric-function-LEFTB"><function>LEFTB</function></link>,
+        <link linkend="gnumeric-function-MIDB"><function>MIDB</function></link>,
+        <link linkend="gnumeric-function-LENB"><function>LENB</function></link>,
+        <link linkend="gnumeric-function-LEFT"><function>LEFT</function></link>,
+        <link linkend="gnumeric-function-MID"><function>MID</function></link>,
+        <link linkend="gnumeric-function-RIGHT"><function>RIGHT</function></link>,
+        <link linkend="gnumeric-function-LEN"><function>LEN</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SEARCH">
+    <refentry id="gnumeric-function-SEARCH">
       <refmeta>
         <refentrytitle>
           <function>SEARCH</function>
@@ -20753,12 +20787,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-FIND"><function>FIND</function></link>,
-        <link linkend="gnumeric-SEARCHB"><function>SEARCHB</function></link>.
+        <para><link linkend="gnumeric-function-FIND"><function>FIND</function></link>,
+        <link linkend="gnumeric-function-SEARCHB"><function>SEARCHB</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SEARCHB">
+    <refentry id="gnumeric-function-SEARCHB">
       <refmeta>
         <refentrytitle>
           <function>SEARCHB</function>
@@ -20799,12 +20833,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-FINDB"><function>FINDB</function></link>,
-        <link linkend="gnumeric-SEARCH"><function>SEARCH</function></link>.
+        <para><link linkend="gnumeric-function-FINDB"><function>FINDB</function></link>,
+        <link linkend="gnumeric-function-SEARCH"><function>SEARCH</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-SUBSTITUTE">
+    <refentry id="gnumeric-function-SUBSTITUTE">
       <refmeta>
         <refentrytitle>
           <function>SUBSTITUTE</function>
@@ -20833,12 +20867,12 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-REPLACE"><function>REPLACE</function></link>,
-        <link linkend="gnumeric-TRIM"><function>TRIM</function></link>.
+        <para><link linkend="gnumeric-function-REPLACE"><function>REPLACE</function></link>,
+        <link linkend="gnumeric-function-TRIM"><function>TRIM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-T">
+    <refentry id="gnumeric-function-T">
       <refmeta>
         <refentrytitle>
           <function>T</function>
@@ -20864,13 +20898,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CELL"><function>CELL</function></link>,
-        <link linkend="gnumeric-N"><function>N</function></link>,
-        <link linkend="gnumeric-VALUE"><function>VALUE</function></link>.
+        <para><link linkend="gnumeric-function-CELL"><function>CELL</function></link>,
+        <link linkend="gnumeric-function-N"><function>N</function></link>,
+        <link linkend="gnumeric-function-VALUE"><function>VALUE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TEXT">
+    <refentry id="gnumeric-function-TEXT">
       <refmeta>
         <refentrytitle>
           <function>TEXT</function>
@@ -20897,13 +20931,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DOLLAR"><function>DOLLAR</function></link>,
-        <link linkend="gnumeric-FIXED"><function>FIXED</function></link>,
-        <link linkend="gnumeric-VALUE"><function>VALUE</function></link>.
+        <para><link linkend="gnumeric-function-DOLLAR"><function>DOLLAR</function></link>,
+        <link linkend="gnumeric-function-FIXED"><function>FIXED</function></link>,
+        <link linkend="gnumeric-function-VALUE"><function>VALUE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-TRIM">
+    <refentry id="gnumeric-function-TRIM">
       <refmeta>
         <refentrytitle>
           <function>TRIM</function>
@@ -20929,14 +20963,14 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CLEAN"><function>CLEAN</function></link>,
-        <link linkend="gnumeric-MID"><function>MID</function></link>,
-        <link linkend="gnumeric-REPLACE"><function>REPLACE</function></link>,
-        <link linkend="gnumeric-SUBSTITUTE"><function>SUBSTITUTE</function></link>.
+        <para><link linkend="gnumeric-function-CLEAN"><function>CLEAN</function></link>,
+        <link linkend="gnumeric-function-MID"><function>MID</function></link>,
+        <link linkend="gnumeric-function-REPLACE"><function>REPLACE</function></link>,
+        <link linkend="gnumeric-function-SUBSTITUTE"><function>SUBSTITUTE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-UNICHAR">
+    <refentry id="gnumeric-function-UNICHAR">
       <refmeta>
         <refentrytitle>
           <function>UNICHAR</function>
@@ -20959,13 +20993,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-CHAR"><function>CHAR</function></link>,
-        <link linkend="gnumeric-UNICODE"><function>UNICODE</function></link>,
-        <link linkend="gnumeric-CODE"><function>CODE</function></link>.
+        <para><link linkend="gnumeric-function-CHAR"><function>CHAR</function></link>,
+        <link linkend="gnumeric-function-UNICODE"><function>UNICODE</function></link>,
+        <link linkend="gnumeric-function-CODE"><function>CODE</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-UNICODE">
+    <refentry id="gnumeric-function-UNICODE">
       <refmeta>
         <refentrytitle>
           <function>UNICODE</function>
@@ -20988,13 +21022,13 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-UNICHAR"><function>UNICHAR</function></link>,
-        <link linkend="gnumeric-CODE"><function>CODE</function></link>,
-        <link linkend="gnumeric-CHAR"><function>CHAR</function></link>.
+        <para><link linkend="gnumeric-function-UNICHAR"><function>UNICHAR</function></link>,
+        <link linkend="gnumeric-function-CODE"><function>CODE</function></link>,
+        <link linkend="gnumeric-function-CHAR"><function>CHAR</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-UPPER">
+    <refentry id="gnumeric-function-UPPER">
       <refmeta>
         <refentrytitle>
           <function>UPPER</function>
@@ -21021,11 +21055,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-LOWER"><function>LOWER</function></link>.
+        <para><link linkend="gnumeric-function-LOWER"><function>LOWER</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-VALUE">
+    <refentry id="gnumeric-function-VALUE">
       <refmeta>
         <refentrytitle>
           <function>VALUE</function>
@@ -21052,16 +21086,16 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-DOLLAR"><function>DOLLAR</function></link>,
-        <link linkend="gnumeric-FIXED"><function>FIXED</function></link>,
-        <link linkend="gnumeric-TEXT"><function>TEXT</function></link>.
+        <para><link linkend="gnumeric-function-DOLLAR"><function>DOLLAR</function></link>,
+        <link linkend="gnumeric-function-FIXED"><function>FIXED</function></link>,
+        <link linkend="gnumeric-function-TEXT"><function>TEXT</function></link>.
       </para>
       </refsect1>
     </refentry>
   </sect1>
   <sect1 id="CATEGORY_Time_Series_Analysis">
     <title>Time Series Analysis</title>
-    <refentry id="gnumeric-FOURIER">
+    <refentry id="gnumeric-function-FOURIER">
       <refmeta>
         <refentrytitle>
           <function>FOURIER</function>
@@ -21095,7 +21129,7 @@
         <para>If <parameter>Sequence</parameter> is neither an n by 1 nor 1 by n array, this function returns #NUM!</para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-INTERPOLATION">
+    <refentry id="gnumeric-function-INTERPOLATION">
       <refmeta>
         <refentrytitle>
           <function>INTERPOLATION</function>
@@ -21136,11 +21170,11 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-PERIODOGRAM"><function>PERIODOGRAM</function></link>.
+        <para><link linkend="gnumeric-function-PERIODOGRAM"><function>PERIODOGRAM</function></link>.
       </para>
       </refsect1>
     </refentry>
-    <refentry id="gnumeric-PERIODOGRAM">
+    <refentry id="gnumeric-function-PERIODOGRAM">
       <refmeta>
         <refentrytitle>
           <function>PERIODOGRAM</function>
@@ -21188,7 +21222,7 @@
       </refsect1>
       <refsect1>
         <title>See also</title>
-        <para><link linkend="gnumeric-INTERPOLATION"><function>INTERPOLATION</function></link>.
+        <para><link linkend="gnumeric-function-INTERPOLATION"><function>INTERPOLATION</function></link>.
       </para>
       </refsect1>
     </refentry>
diff --git a/doc/ChangeLog b/doc/ChangeLog
index c8c5ddb..1b4fa58 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-15  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* make-func-list.pl: change prefix for function refs, fixes [#656545]
+
 2011-07-31  Morten Welinder <terra gnome org>
 
 	* Release 1.10.17
diff --git a/doc/make-func-list.pl b/doc/make-func-list.pl
index cabaa57..1bc1a04 100755
--- a/doc/make-func-list.pl
+++ b/doc/make-func-list.pl
@@ -114,7 +114,7 @@ sub process_function($) {
 	my ($func) = @_;
 
 	my $ws = "  " x scalar(@tagstack);
-	print $ws, "<refentry id=\"gnumeric-$func\">\n";
+	print $ws, "<refentry id=\"gnumeric-function-$func\">\n";
 	print $ws, "  <refmeta>\n";
 	print $ws, "    <refentrytitle><function>$func</function></refentrytitle>\n";
 	print $ws, "  </refmeta>\n";
@@ -229,7 +229,7 @@ sub process_seealso($) {
 	my @a = ();
 	print $ws, "  <para>\n";
 	foreach my $link (@links) {
-	    push @a, $ws . "    <link linkend=\"gnumeric-$link\"><function>$link</function></link>";
+	    push @a, $ws . "    <link linkend=\"gnumeric-function-$link\"><function>$link</function></link>";
 	}
 	if (scalar(@a) > 0) {
 	    print join (",\n", @a), ".\n";



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]