diff --git a/src/ca/CAref.html b/src/ca/CAref.html
index 344ab78b4..1af9739a2 100644
--- a/src/ca/CAref.html
+++ b/src/ca/CAref.html
@@ -94,63 +94,61 @@ height="31" width="88"></a></p>
 href="file://E:\users\hill\epicsDvl\epics\base\src\ca\CAref.htm#Function Call Reference">Function
 Call Interface Index</a></h3>
 <ul>
-  <li><a href="#ca_context_create">ca_context_create</a></li>
+  <li><a href="#ca_add_event">ca_add_event</a></li>
+  <li><a href="#L5095">ca_add_exception_event</a></li>
+  <li><a href="#ca_attach_context">ca_attach_context </a></li>
+  <li><a href="#ca_clear_channel">ca_clear_channel</a></li>
+  <li><a href="#ca_clear_event">ca_clear_event</a></li>
+  <li><a href="#ca_client_status">ca_client_status</a></li>
   <li><a href="#ca_context_destroy">ca_context_destroy</a></li>
   <li><a href="#ca_create_channel">ca_create_channel</a></li>
-  <li><a href="#ca_clear_channel">ca_clear_channel</a></li>
-  <li><a href="#ca_put">ca_put</a></li>
-  <li><a href="#ca_get">ca_get</a></li>
-  <li><a href="#ca_add_event">ca_add_event</a></li>
-  <li><a href="#ca_clear_event">ca_clear_event</a></li>
-  <li><a href="#ca_pend_io">ca_pend_io</a></li>
-  <li><a href="#ca_test_io">ca_test_io</a></li>
-  <li><a href="#L3249">ca_pend_event</a></li>
-  <li><a href="#L3251">ca_flush_io</a></li>
-  <li><a href="#ca_signal">ca_signal</a></li>
-  <li><a href="#ca_addException_event">ca_add_exception_event</a></li>
-  <li><a href="#ca_replace_printf_handler ">ca_replace_printf_handler</a></li>
-  <li><a
-    href="#ca_replace_access_rights_event">ca_replace_access_rights_event</a></li>
-  <li><a href="#ca_field_type">ca_field_type</a></li>
+  <li><a href="#ca_current_context">ca_current_context</a></li>
   <li><a href="#ca_element_count">ca_element_count</a></li>
-  <li><a href="#ca_name">ca_name</a></li>
+  <li><a href="#L6925">ca_field_type</a></li>
+  <li><a href="#L3251">ca_flush_io</a></li>
+  <li><a href="#ca_get">ca_get</a></li>
+  <li><a href="#L6927">ca_host_name</a></li>
+  <li><a href="#L6929">ca_message</a></li>
+  <li><a href="#L6931">ca_name</a></li>
+  <li><a href="#L6933">ca_read_access</a></li>
+  <li><a href="#L6935">ca_replace_access_rights_event</a></li>
+  <li><a href="#ca_replace">ca_replace_printf_handler</a></li>
+  <li><a href="#L3249">ca_pend_event</a></li>
+  <li><a href="#ca_pend_io">ca_pend_io</a></li>
+  <li><a href="#L3249">ca_poll</a></li>
+  <li><a href="#L6939">ca_puser</a></li>
+  <li><a href="#ca_put">ca_put</a></li>
   <li><a href="#ca_set_puser">ca_set_puser</a></li>
-  <li><a href="#ca_puser">ca_puser</a></li>
-  <li><a href="#channel_state">channel_state</a></li>
-  <li><a href="#ca_message">ca_message</a></li>
-  <li><a href="#ca_host_name">ca_host_name</a></li>
-  <li><a href="#ca_read_access">ca_read_access</a></li>
-  <li><a href="#ca_write_access">ca_write_access</a></li>
-  <li><a href="#dbr_size">dbr_size</a></li>
-  <li><a href="#dbr_size_n">dbr_size_n</a></li>
-  <li><a href="#dbr_value_size">dbr_value_size</a></li>
-  <li><a href="#ca_test_event">ca_test_event</a></li>
+  <li><a href="#ca_sg_block">ca_sg_block</a></li>
   <li><a href="#ca_sg_create">ca_sg_create</a></li>
   <li><a href="#ca_sg_delete">ca_sg_delete</a></li>
-  <li><a href="#ca_sg_block">ca_sg_block</a></li>
-  <li><a href="#ca_sg_test">ca_sg_test</a></li>
-  <li><a href="#ca_sg_reset">ca_sg_reset</a></li>
-  <li><a href="#ca_sg_put">ca_sg_put</a></li>
   <li><a href="#ca_sg_get">ca_sg_get</a></li>
-  <li><a href="#ca_current_context">ca_current_context</a></li>
-  <li><a href="#ca_attach_context">ca_attach_context </a></li>
-  <li><a href="#ca_client_status">ca_client_status</a></li>
+  <li><a href="#ca_sg_put">ca_sg_put</a></li>
+  <li><a href="#ca_sg_reset">ca_sg_reset</a></li>
+  <li><a href="#ca_sg_test">ca_sg_test</a></li>
+  <li><a href="#ca_test_event">ca_test_event</a></li>
+  <li><a href="#ca_test_io">ca_test_io</a></li>
+  <li><a href="#L6941">ca_write_access</a></li>
+  <li><a href="#L6746">channel_state</a></li>
+  <li><a href="#dbr_size[]">dbr_size[]</a></li>
+  <li><a href="#L6946">dbr_size_n</a></li>
+  <li><a href="#dbr_value_size">dbr_value_size[]</a></li>
 </ul>
 
 <h3>Deprecated Function Call Interface Function Index</h3>
 <ul>
-  <li><a href="#ca_context_create">ca_task_initialize</a></li>
-  <li><a href="#ca_context_destroy">ca_task_exit</a></li>
   <li><a href="#ca_create_channel">ca_search</a></li>
   <li><a href="#ca_create_channel">ca_search_and_connect</a></li>
+  <li><a href="#ca_context_destroy">ca_task_exit</a></li>
+  <li><a href="#ca_context_create">ca_task_initialize</a></li>
 </ul>
 
 <h3><a href="#Command">Command Line Utilities</a></h3>
 <ul>
   <li><a href="#acctst">acctst - CA client library regression test</a></li>
-  <li><a href="#catime">catime - CA client library performance test</a></li>
-  <li><a href="#casw">casw - CA server beacon anomaly logging</a></li>
   <li><a href="#caEventRat">caEventRate - PV event rate logging</a></li>
+  <li><a href="#casw">casw - CA server beacon anomaly logging</a></li>
+  <li><a href="#catime">catime - CA client library performance test</a></li>
   <li><a href="#ca_test">ca_test - dump each external type to the
   console</a></li>
 </ul>
@@ -687,8 +685,7 @@ page 24 for more information on this topic.</p>
 <pre><code>if ( status != ECA_NORMAL ) { </code></pre>
 <pre><code>        printf("The requested ca_XXXX() operation didn't complete successfully because \"%s\"\n",</code></pre>
 <pre><code>                ca_message ( status ) ); </code></pre>
-<pre><code>}
-</code></pre>
+<pre><code>}</code></pre>
 
 <p>With the embryonic releases of EPICS it was a common practice to examine a
 channel's connection state, its native type, and its native element count by
@@ -1429,7 +1426,7 @@ for this purpose.</p>
 
 <p>ECA_NORMAL - Normal successful completion</p>
 
-<h3><code><a name="L3253">ca_add_exception_event()</a></code></h3>
+<h3><code><a name="L5095">ca_add_exception_event()</a></code></h3>
 <pre>#include &lt;cadef.h&gt; </pre>
 <pre>typedef void (*pCallback) ( struct exception_handler_args HANDLERARGS );</pre>
 <pre>int ca_add_exception_event ( pCallback  USERFUNC, void *USERARG );</pre>
@@ -1491,7 +1488,7 @@ field should not be used.</p>
 
 <p>ECA_NORMAL - Normal successful completion</p>
 
-<h3><code>ca_replace_printf_handler ()</code></h3>
+<h3><code><a name="ca_replace">ca_replace_printf_handler ()</a></code></h3>
 <pre><code>#include &lt;cadef.h&gt;</code></pre>
 <pre><code>typedef int caPrintfFunc ( const char *pFromat, va_list args );</code></pre>
 <pre><code>int ca_replace_printf_handler ( caPrintfFunc *PFUNC );</code></pre>
@@ -1523,7 +1520,7 @@ default handler uses fprintf to send messages to 'stderr'.</p>
 
 <p>ECA_NORMAL - Normal successful completion</p>
 
-<h3><code>ca_replace_access_rights_event()</code></h3>
+<h3><code><a name="L6935">ca_replace_access_rights_event()</a></code></h3>
 <pre><code>#include &lt;cadef.h&gt;</code></pre>
 <pre><code>typedef void ( *pCallBack )( struct access_rights_handler_args );</code></pre>
 <pre><code>int ca_replace_access_rights_event ( chid CHAN, pCallBack PFUNC );</code></pre>
@@ -1568,7 +1565,7 @@ the specified channel.</p>
 
 <p>ca_modify_host_name()</p>
 
-<h3><code>ca_field_type()</code></h3>
+<h3><code><a name="L6925">ca_field_type()</a></code></h3>
 <pre><code>#include &lt;cadef.h&gt;</code></pre>
 <pre><code>chtype ca_field_type ( CHID );</code></pre>
 
@@ -1616,7 +1613,7 @@ channel.</p>
     </dd>
 </dl>
 
-<h3><code>ca_name()</code></h3>
+<h3><code><a name="L6931">ca_name()</a></code></h3>
 <pre><code>#include &lt;cadef.h&gt;</code></pre>
 <code>char * ca_name ( CHID );</code>
 
@@ -1662,7 +1659,7 @@ use at the users discretion.</p>
     </dd>
 </dl>
 
-<h3><code>ca_puser()</code></h3>
+<h3><code><a name="L6939">ca_puser()</a></code></h3>
 <pre><code>#include &lt;cadef.h&gt;</code></pre>
 <code>void * ca_puser ( CHID );</code>
 
@@ -1685,7 +1682,7 @@ use at the users discretion.</p>
     </dd>
 </dl>
 
-<h3><code>channel_state()</code></h3>
+<h3><code><a name="L6746">channel_state()</a></code></h3>
 <pre><a name="ca_set_puser"></a></pre>
 <pre><code>/* channel connection state */</code></pre>
 <pre><code>#include &lt;cadef.h&gt;</code></pre>
@@ -1715,7 +1712,7 @@ IO channel.</p>
     </dd>
 </dl>
 
-<h3><code>ca_message()</code></h3>
+<h3><code><a name="L6929">ca_message()</a></code></h3>
 <pre><code>#include &lt;cadef.h&gt;</code></pre>
 <pre><code>const char * ca_message ( STATUS );</code></pre>
 
@@ -1738,7 +1735,7 @@ status code.</p>
     </dd>
 </dl>
 
-<h3><code>ca_host_name()</code></h3>
+<h3><code><a name="L6927">ca_host_name()</a></code></h3>
 <pre><code>#include &lt;cadef.h&gt;</code></pre>
 <pre><code>char * ca_host_name ( CHID );</code></pre>
 
@@ -1762,7 +1759,7 @@ channel is currently connected.</p>
     </dd>
 </dl>
 
-<h3><code>ca_read_access()</code></h3>
+<h3><code><a name="L6933">ca_read_access()</a></code></h3>
 <pre><code>#include &lt;cadef.h&gt;</code></pre>
 <pre><code>int ca_read_access ( CHID );</code></pre>
 
@@ -1786,7 +1783,7 @@ specified channel and
     </dd>
 </dl>
 
-<h3><code>ca_write_access()</code></h3>
+<h3><code><a name="L6941">ca_write_access()</a></code></h3>
 <pre><code>#include &lt;cadef.h&gt;</code></pre>
 <pre><code>int ca_write_access ( CHID );</code></pre>
 
@@ -1810,7 +1807,7 @@ specified channel and
     </dd>
 </dl>
 
-<h3><code>dbr_size[]</code></h3>
+<h3><code><a name="dbr_size[]">dbr_size[]</a></code></h3>
 <pre><code>#include &lt;db_access.h&gt;</code></pre>
 <pre><code>extern unsigned dbr_size[/*TYPE*/];</code></pre>
 
@@ -1833,7 +1830,7 @@ specified channel and
     </dd>
 </dl>
 
-<h3><code>dbr_size_n()</code></h3>
+<h3><code><a name="L6946">dbr_size_n()</a></code></h3>
 <pre><code>#include &lt;db_access.h&gt;</code></pre>
 <pre><code>unsigned dbr_size_n  (  TYPE, COUNT  );</code></pre>