Index: /trunk/source/doc/src/build.xml
===================================================================
--- /trunk/source/doc/src/build.xml	(revision 16295)
+++ /trunk/source/doc/src/build.xml	(revision 16296)
@@ -40,7 +40,7 @@
       may be helpful to refer to these definitions.</para>
 
-    <para><indexterm><primary>fasl
-          files</primary></indexterm><glossterm linkend="fasl-file">fasl
-        files</glossterm> are the object files produced
+    <para>
+
+     <glossterm linkend="fasl-file">fasl files</glossterm> are the object files produced
       by <literal>compile-file</literal>.  fasl files store the
       machine code associated with function definitions and the
@@ -53,7 +53,5 @@
       <xref linkend="Platform-specific-filename-conventions"/> </para>
 
-    <para>The <indexterm><primary>lisp
-          kernel</primary></indexterm> <glossterm linkend="lisp_kernel">Lisp
-        kernel</glossterm> is a C program with a fair amount of
+    <para>The <glossterm linkend="lisp_kernel">Lisp kernel</glossterm> is a C program with a fair amount of
       platform-specific assembly language code. Its basic job is to
       map a lisp heap image into memory, transfer control to some
@@ -65,7 +63,5 @@
       <xref linkend="Platform-specific-filename-conventions"/>.</para>
 
-    <para>A <indexterm><primary>heap
-          image</primary></indexterm> <glossterm linkend="lisp_image">heap
-        image</glossterm> is a file that can be quickly mapped into a
+    <para>A <glossterm linkend="lisp_image">heap image</glossterm> is a file that can be quickly mapped into a
       process's address space. Conceptually, it's not too different
       from an executable file or shared library in the OS's native
@@ -78,6 +74,6 @@
       <xref linkend="Platform-specific-filename-conventions"/>.</para>
 
-    <para>A <indexterm><primary>bootstrapping
-          image</primary></indexterm> bootstrapping image is a minimal
+    <para>A bootstrapping image (<xref linkend="Generating-a-bootstrapping-image"/>)
+      is a minimal
       heap image used in the process of building &CCL; itself.  The
       bootstrapping image contains just enough code to load the rest
@@ -92,5 +88,5 @@
       as-yet-unsupported ones) has a uniquely named subdirectory of
       <literal>ccl/lisp-kernel/</literal>; each such
-      <indexterm><primary>kernel build directory</primary></indexterm>
+      kernel build directory
       contains a Makefile and may contain some auxiliary files (linker
       scripts, etc.) that are used to build the lisp kernel on a
Index: /trunk/source/doc/src/external-process.xml
===================================================================
--- /trunk/source/doc/src/external-process.xml	(revision 16295)
+++ /trunk/source/doc/src/external-process.xml	(revision 16296)
@@ -87,5 +87,5 @@
 	    <variablelist>
 	      <varlistentry>
-		<term>program</term>
+		<term><parameter>program</parameter></term>
 
 		<listitem>
@@ -97,5 +97,5 @@
 
 	      <varlistentry>
-		<term>args</term>
+		<term><parameter>args</parameter></term>
 
 		<listitem>
@@ -105,5 +105,5 @@
 
 	      <varlistentry>
-		<term>wait</term>
+		<term><parameter>wait</parameter></term>
 
 		<listitem>
@@ -115,5 +115,5 @@
 
 	      <varlistentry>
-		<term>pty</term>
+		<term><parameter>pty</parameter></term>
 
 		<listitem>
@@ -125,5 +125,5 @@
 
 	      <varlistentry>
-		<term>sharing</term>
+		<term><parameter>sharing</parameter></term>
 
 		<listitem>
@@ -136,5 +136,5 @@
 
 	      <varlistentry>
-		<term>input</term>
+		<term><parameter>input</parameter></term>
 
 		<listitem>
@@ -176,5 +176,5 @@
 
 	      <varlistentry>
-		<term>if-input-does-not-exist</term>
+		<term><parameter>if-input-does-not-exist</parameter></term>
 
 		<listitem>
@@ -186,5 +186,5 @@
 
 	      <varlistentry>
-		<term>output</term>
+		<term><parameter>output</parameter></term>
 
 		<listitem>
@@ -195,5 +195,5 @@
 
 	      <varlistentry>
-		<term>if-output-exists</term>
+		<term><parameter>if-output-exists</parameter></term>
 
 		<listitem>
@@ -205,5 +205,5 @@
 
 	      <varlistentry>
-		<term>error</term>
+		<term><parameter>error</parameter></term>
 
 		<listitem>
@@ -216,5 +216,5 @@
 
 	      <varlistentry>
-		<term>if-error-exists</term>
+		<term><parameter>if-error-exists</parameter></term>
 
 		<listitem>
@@ -224,5 +224,5 @@
 
 	      <varlistentry>
-		<term>status-hook</term>
+		<term><parameter>status-hook</parameter></term>
 
 		<listitem>
@@ -235,5 +235,5 @@
 
 	      <varlistentry>
-		<term>external-format</term>
+		<term><parameter>external-format</parameter></term>
 
 		<listitem>
@@ -247,5 +247,5 @@
 	      </varlistentry>
 	      <varlistentry>
-		<term>env</term>
+		<term><parameter>env</parameter></term>
 		<listitem>
 		  <para>
@@ -262,5 +262,5 @@
 	      </varlistentry>
 	      <varlistentry>
-		<term>>silently-ignore-catastrophic-failures</term>
+		<term><parameter>>silently-ignore-catastrophic-failures</parameter></term>
 		<listitem>
 		  <para>
@@ -270,5 +270,5 @@
 		    by setting the status and exit-code
 		    fields. Default is
-		    *silently-ignore-catastrophic-failure-in-run-program*.
+		    <varname>*silently-ignore-catastrophic-failure-in-run-program*</varname>.
 		  </para>
 		</listitem>
@@ -314,5 +314,5 @@
 	    <variablelist>
 	      <varlistentry>
-		<term>proc</term>
+		<term><parameter>proc</parameter></term>
 
 		<listitem>
@@ -322,5 +322,5 @@
 
 	      <varlistentry>
-		<term>signal</term>
+		<term><parameter>signal</parameter></term>
 
 		<listitem>
@@ -329,5 +329,5 @@
 	      </varlistentry>
 	      <varlistentry>
-		<term>error-if-exited</term>
+		<term><parameter>error-if-exited</parameter></term>
 
 		<listitem>
@@ -342,6 +342,6 @@
 
 	    <para>
-	      Sends <varname>signal</varname> to the external process
-	      <varname>proc</varname>. (Typically, it would only be
+	      Sends <parameter>signal</parameter> to the external process
+	      <parameter>proc</parameter>. (Typically, it would only be
 	      useful to call this function if the EXTERNAL-PROCESS was
 	      created with :WAIT NIL.)
@@ -352,5 +352,5 @@
 	    </para>
 	    <para>
-	      However, if <varname>error-if-exited</varname> is nil,
+	      However, if <parameter>error-if-exited</parameter> is nil,
 	      and the attempt to signal the external process fails
 	      because the external process has already exited, the
@@ -382,5 +382,5 @@
 	    <variablelist>
 	      <varlistentry>
-		<term>proc</term>
+		<term><parameter>proc</parameter></term>
 
 		<listitem>
@@ -422,5 +422,5 @@
 	    <variablelist>
 	      <varlistentry>
-		<term>proc</term>
+		<term><parameter>proc</parameter></term>
 
 		<listitem>
@@ -461,5 +461,5 @@
 	    <variablelist>
 	      <varlistentry>
-		<term>proc</term>
+		<term><parameter>proc</parameter></term>
 
 		<listitem>
@@ -501,5 +501,5 @@
 	    <variablelist>
 	      <varlistentry>
-		<term>proc</term>
+		<term><parameter>proc</parameter></term>
 
 		<listitem>
@@ -541,5 +541,5 @@
 	    <variablelist>
 	      <varlistentry>
-		<term>proc</term>
+		<term><parameter>proc</parameter></term>
 
 		<listitem>
Index: /trunk/source/doc/src/ffi.xml
===================================================================
--- /trunk/source/doc/src/ffi.xml	(revision 16295)
+++ /trunk/source/doc/src/ffi.xml	(revision 16296)
@@ -87,5 +87,5 @@
           corresponds to <code>NS:NS-RECT</code>, and you can
           use <code>:NS-RECT</code> as a type designator
-          in <link linkend="m_rlet"><code>RLET</code></link> forms to
+          in <xref linkend="m_rlet"/> forms to
           specify a structure of type <code>NS-RECT</code>.</para>
         </listitem>
@@ -256,5 +256,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>:UNSIGNED-BYTE</term>
+	        <term><code>:UNSIGNED-BYTE</code></term>
 
 	        <listitem>
@@ -264,5 +264,5 @@
 
 	      <varlistentry>
-	        <term>:SIGNED-BYTE</term>
+	        <term><code>:SIGNED-BYTE</code></term>
 
 	        <listitem>
@@ -272,5 +272,5 @@
 
 	      <varlistentry>
-	        <term>:UNSIGNED-HALFWORD</term>
+	        <term><code>:UNSIGNED-HALFWORD</code></term>
 
 	        <listitem>
@@ -280,5 +280,5 @@
 
 	      <varlistentry>
-	        <term>:SIGNED-HALFWORD</term>
+	        <term><code>:SIGNED-HALFWORD</code></term>
 
 	        <listitem>
@@ -288,5 +288,5 @@
 
 	      <varlistentry>
-	        <term>:UNSIGNED-FULLWORD</term>
+	        <term><code>:UNSIGNED-FULLWORD</code></term>
 
 	        <listitem>
@@ -296,5 +296,5 @@
 
 	      <varlistentry>
-	        <term>:SIGNED-FULLWORD</term>
+	        <term><code>:SIGNED-FULLWORD</code></term>
 
 	        <listitem>
@@ -304,5 +304,5 @@
 
 	      <varlistentry>
-	        <term>:UNSIGNED-DOUBLEWORD</term>
+	        <term><code>:UNSIGNED-DOUBLEWORD</code></term>
 
 	        <listitem>
@@ -312,5 +312,5 @@
 
 	      <varlistentry>
-	        <term>:SIGNED-DOUBLEWORD</term>
+	        <term><code>:SIGNED-DOUBLEWORD</code></term>
 
 	        <listitem>
@@ -320,5 +320,5 @@
 
 	      <varlistentry>
-	        <term>:SINGLE-FLOAT</term>
+	        <term><code>:SINGLE-FLOAT</code></term>
 
 	        <listitem>
@@ -328,5 +328,5 @@
 
 	      <varlistentry>
-	        <term>:DOUBLE-FLOAT</term>
+	        <term><code>:DOUBLE-FLOAT</code></term>
 
 	        <listitem>
@@ -336,5 +336,5 @@
 
 	      <varlistentry>
-	        <term>:ADDRESS</term>
+	        <term><code>:ADDRESS</code></term>
 
 	        <listitem>
@@ -345,5 +345,5 @@
 
 	      <varlistentry>
-	        <term>:VOID</term>
+	        <term><code>:VOID</code></term>
 
 	        <listitem>
@@ -662,5 +662,5 @@
 		      <variablelist>
 		        <varlistentry>
-		          <term>ptr</term>
+		          <term><parameter>ptr</parameter></term>
 
 		          <listitem>
@@ -670,5 +670,5 @@
 
 		        <varlistentry>
-		          <term>offset</term>
+		          <term><parameter>offset</parameter></term>
 
 		          <listitem>
@@ -716,5 +716,5 @@
 		      <variablelist>
 		        <varlistentry>
-		          <term>ptr</term>
+		          <term><parameter>ptr</parameter></term>
 
 		          <listitem>
@@ -724,5 +724,5 @@
 
 		        <varlistentry>
-		          <term>bit-offset</term>
+		          <term><parameter>bit-offset</parameter></term>
 
 		          <listitem>
@@ -767,5 +767,5 @@
 
 	      <varlistentry>
-	        <term>ptr</term>
+	        <term><parameter>ptr</parameter></term>
 
 	        <listitem>
@@ -774,5 +774,5 @@
 		      <variablelist>
 		        <varlistentry>
-		          <term>bit-offset</term>
+		          <term><parameter>bit-offset</parameter></term>
 
 		          <listitem>
@@ -782,5 +782,5 @@
 
 		        <varlistentry>
-		          <term>width</term>
+		          <term><parameter>width</parameter></term>
 
 		          <listitem>
@@ -822,5 +822,5 @@
 		      <variablelist>
 		        <varlistentry>
-		          <term>int</term>
+		          <term><parameter>int</parameter></term>
 
 		          <listitem>
@@ -865,5 +865,5 @@
 		      <variablelist>
 		        <varlistentry>
-		          <term>ptr</term>
+		          <term><parameter>ptr</parameter></term>
 
 		          <listitem>
@@ -873,5 +873,5 @@
 
 		        <varlistentry>
-		          <term>delta</term>
+		          <term><parameter>delta</parameter></term>
 
 		          <listitem>
@@ -914,5 +914,5 @@
 		      <variablelist>
 		        <varlistentry>
-		          <term>ptr</term>
+		          <term><parameter>ptr</parameter></term>
 
 		          <listitem>
@@ -977,5 +977,5 @@
 		      <variablelist>
 		        <varlistentry>
-		          <term>ptr</term>
+		          <term><parameter>ptr</parameter></term>
 
 		          <listitem>
@@ -1018,5 +1018,5 @@
 		      <variablelist>
 		        <varlistentry>
-		          <term>dest-ptr</term>
+		          <term><parameter>dest-ptr</parameter></term>
 
 		          <listitem>
@@ -1026,5 +1026,5 @@
 
 		        <varlistentry>
-		          <term>src-ptr</term>
+		          <term><parameter>src-ptr</parameter></term>
 
 		          <listitem>
@@ -1067,5 +1067,5 @@
 		      <variablelist>
 		        <varlistentry>
-		          <term>ptr</term>
+		          <term><parameter>ptr</parameter></term>
 
 		          <listitem>
@@ -1075,5 +1075,5 @@
 
 		        <varlistentry>
-		          <term>delta</term>
+		          <term><parameter>delta</parameter></term>
 
 		          <listitem>
@@ -1118,5 +1118,5 @@
 		      <variablelist>
 		        <varlistentry>
-		          <term>var</term>
+		          <term><parameter>var</parameter></term>
 
 		          <listitem>
@@ -1126,5 +1126,5 @@
 
 		        <varlistentry>
-		          <term>expr</term>
+		          <term><parameter>expr</parameter></term>
 
 		          <listitem>
@@ -1169,5 +1169,5 @@
 		      <variablelist>
 		        <varlistentry>
-		          <term>var</term>
+		          <term><parameter>var</parameter></term>
 
 		          <listitem>
@@ -1177,5 +1177,5 @@
 
 		        <varlistentry>
-		          <term>expr</term>
+		          <term><parameter>expr</parameter></term>
 
 		          <listitem>
@@ -1220,5 +1220,5 @@
 		      <variablelist>
 		        <varlistentry>
-		          <term>string</term>
+		          <term><parameter>string</parameter></term>
 
 		          <listitem>
@@ -1263,5 +1263,5 @@
 		      <variablelist>
 		        <varlistentry>
-		          <term>var</term>
+		          <term><parameter>var</parameter></term>
 
 		          <listitem>
@@ -1271,5 +1271,5 @@
 
 		        <varlistentry>
-		          <term>string</term>
+		          <term><parameter>string</parameter></term>
 
 		          <listitem>
@@ -1333,5 +1333,5 @@
 		      <variablelist>
 		        <varlistentry>
-		          <term>varI</term>
+		          <term><parameter>varI</parameter></term>
 
 		          <listitem>
@@ -1341,5 +1341,5 @@
 
 		        <varlistentry>
-		          <term>stringI</term>
+		          <term><parameter>stringI</parameter></term>
 
 		          <listitem>
@@ -1382,5 +1382,5 @@
 		      <variablelist>
 		        <varlistentry>
-		          <term>ptr</term>
+		          <term><parameter>ptr</parameter></term>
 
 		          <listitem>
@@ -1410,6 +1410,6 @@
 
 	        <listitem>
-		      <para>Returns a lisp string of length <varname>length</varname>,
-		        whose contents are initialized from the bytes at<varname> ptr.</varname>
+		      <para>Returns a lisp string of length <parameter>length</parameter>,
+		        whose contents are initialized from the bytes at<parameter> ptr.</parameter>
 		      </para>
 	        </listitem>
@@ -1420,6 +1420,7 @@
 
 	        <listitem>
-		      <para><variablelist><varlistentry><term>ptr</term><listitem><para>A
-		                MACPTR</para></listitem></varlistentry><varlistentry><term>length</term><listitem><para>a
+		      <para><variablelist><varlistentry><term><parameter>ptr</parameter></term><listitem><para>A
+		                MACPTR</para></listitem></varlistentry>
+				<varlistentry><term><parameter>length</parameter></term><listitem><para>a
 		                non-negative fixnum</para></listitem></varlistentry></variablelist></para>
 	        </listitem>
@@ -3075,5 +3076,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>library</term>
+	        <term><parameter>library</parameter></term>
 
 	        <listitem>
@@ -3084,5 +3085,5 @@
 
 	      <varlistentry>
-	        <term>completely</term>
+	        <term><parameter>completely</parameter></term>
 
 	        <listitem>
@@ -3096,9 +3097,9 @@
 	    <title>Description</title>
 
-	    <para>If <varname>completely</varname> is T, sets the
-	      reference count of <varname>library</varname> to 0.  Otherwise,
+	    <para>If <parameter>completely</parameter> is T, sets the
+	      reference count of <parameter>library</parameter> to 0.  Otherwise,
 	      decrements it by 1.  In either case, if the reference count
 	      becomes 0, <function>close-shared-library</function>
-	      frees all memory resources consumed <varname>library</varname>
+	      frees all memory resources consumed <parameter>library</parameter>
 	      and
 	      causes any EXTERNAL-ENTRY-POINTs known to be defined by it to
@@ -3132,5 +3133,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>name</term>
+	        <term><parameter>name</parameter></term>
 
 	        <listitem>
@@ -3140,5 +3141,5 @@
 
 	      <varlistentry>
-	        <term>arg-type-specifer</term>
+	        <term><parameter>arg-type-specifer</parameter></term>
 
 	        <listitem>
@@ -3156,5 +3157,5 @@
 
 	      <varlistentry>
-	        <term>var</term>
+	        <term><parameter>var</parameter></term>
 
 	        <listitem>
@@ -3165,5 +3166,5 @@
 
 	      <varlistentry>
-	        <term>body</term>
+	        <term><parameter>body</parameter></term>
 
 	        <listitem>
@@ -3178,5 +3179,5 @@
 	    <title>Description</title>
 
-	    <para>Proclaims <varname>name</varname>
+	    <para>Proclaims <parameter>name</parameter>
 	      to be a special variable; sets its value to a
 	      MACPTR which, when called by foreign code, calls a lisp function
@@ -3186,5 +3187,5 @@
 	      are bound to stack-allocated MACPTRs.</para>
 	    
-	    <para>If <varname>name</varname>
+	    <para>If <parameter>name</parameter>
 	      is already a callback function pointer, its value is
 	      not changed; instead, it&#39;s arranged
@@ -3196,5 +3197,5 @@
 	    <para><function>defcallback</function>
 	      returns the callback pointer, e.g., the
-	      value of <varname>name</varname>.</para>
+	      value of <parameter>name</parameter>.</para>
 	  </refsect1>
     </refentry>
@@ -3223,5 +3224,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>name</term>
+	        <term><parameter>name</parameter></term>
 	        
 	        <listitem>
@@ -3232,5 +3233,5 @@
 	      
 	      <varlistentry>
-	        <term>foreign-type-spec</term>
+	        <term><parameter>foreign-type-spec</parameter></term>
 	        
 	        <listitem>
@@ -3258,6 +3259,6 @@
 	      type names, one for the names of ordinary types and one for
 	      the names of structs and unions.  Which one
-	      <varname>name</varname> refers to depends on
-	      <varname>foreign-type-spec</varname> in the obvious manner.
+	      <parameter>name</parameter> refers to depends on
+	      <parameter>foreign-type-spec</parameter> in the obvious manner.
 	    </para>
 	  </refsect1>
@@ -3288,5 +3289,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>name</term>
+	        <term><parameter>name</parameter></term>
 	        <listitem>
 		      <para>
@@ -3297,10 +3298,10 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>entry</term>
+	        <term><parameter>entry</parameter></term>
 	        <listitem>
 		      <para>
 		        an object of type EXTERNAL-ENTRY-POINT which maintains
 		        the address of the foreign symbol named by
-		        <varname>name</varname>.
+		        <parameter>name</parameter>.
 		      </para>
 	        </listitem>
@@ -3313,5 +3314,5 @@
 
 	    <para>If there is already an EXTERNAL-ENTRY-POINT for
-	      the symbol named by <varname>name</varname>, finds it and
+	      the symbol named by <parameter>name</parameter>, finds it and
 	      returns it.  If not, creates one and returns it.</para>
 
@@ -3349,5 +3350,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>name</term>
+	        <term><parameter>name</parameter></term>
 
 	        <listitem>
@@ -3357,5 +3358,5 @@
 
 	      <varlistentry>
-	        <term>arg-type-specifer</term>
+	        <term><parameter>arg-type-specifer</parameter></term>
 
 	        <listitem>
@@ -3367,5 +3368,5 @@
 
 	      <varlistentry>
-	        <term>arg</term>
+	        <term><parameter>arg</parameter></term>
 
 	        <listitem>
@@ -3376,5 +3377,5 @@
 
 	      <varlistentry>
-	        <term>result-type-specifier</term>
+	        <term><parameter>result-type-specifier</parameter></term>
 
 	        <listitem>
@@ -3424,5 +3425,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>entrypoint</term>
+	        <term><parameter>entrypoint</parameter></term>
 	        
 	        <listitem>
@@ -3432,5 +3433,5 @@
 
 	      <varlistentry>
-	        <term>arg-type-keyword</term>
+	        <term><parameter>arg-type-keyword</parameter></term>
 
 	        <listitem>
@@ -3441,5 +3442,5 @@
 
 	      <varlistentry>
-	        <term>arg</term>
+	        <term><parameter>arg</parameter></term>
 
 	        <listitem>
@@ -3450,5 +3451,5 @@
 
 	      <varlistentry>
-	        <term>result-type-keyword</term>
+	        <term><parameter>result-type-keyword</parameter></term>
 
 	        <listitem>
@@ -3496,5 +3497,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>entrypoint</term>
+	        <term><parameter>entrypoint</parameter></term>
 
 	        <listitem>
@@ -3504,5 +3505,5 @@
 
 	      <varlistentry>
-	        <term>arg-type-specifer</term>
+	        <term><parameter>arg-type-specifer</parameter></term>
 
 	        <listitem>
@@ -3514,5 +3515,5 @@
 
 	      <varlistentry>
-	        <term>arg</term>
+	        <term><parameter>arg</parameter></term>
 
 	        <listitem>
@@ -3523,5 +3524,5 @@
 
 	      <varlistentry>
-	        <term>result-type-specifier</term>
+	        <term><parameter>result-type-specifier</parameter></term>
 
 	        <listitem>
@@ -3569,5 +3570,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>name</term>
+	        <term><parameter>name</parameter></term>
 
 	        <listitem>
@@ -3612,5 +3613,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>name</term>
+	        <term><parameter>name</parameter></term>
 
 	        <listitem>
@@ -3653,5 +3654,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>ptr</term>
+	        <term><parameter>ptr</parameter></term>
 
 	        <listitem>
@@ -3707,5 +3708,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>element-count</term>
+	        <term><parameter>element-count</parameter></term>
 
 	        <listitem>
@@ -3714,5 +3715,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>element-type</term>
+	        <term><parameter>element-type</parameter></term>
 
 	        <listitem>
@@ -3723,5 +3724,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>vector</term>
+	        <term><parameter>vector</parameter></term>
 
 	        <listitem>
@@ -3731,5 +3732,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>mactpr</term>
+	        <term><parameter>mactpr</parameter></term>
 
 	        <listitem>
@@ -3740,5 +3741,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>size</term>
+	        <term><parameter>size</parameter></term>
 
 	        <listitem>
@@ -3795,5 +3796,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>typespec</term>
+	        <term><parameter>typespec</parameter></term>
 
 	        <listitem>
@@ -3804,8 +3805,8 @@
 
 	      <varlistentry>
-	        <term>initforms</term>
-
-	        <listitem>
-		      <para>If the type denoted by <varname>typespec</varname>
+	        <term><parameter>initforms</parameter></term>
+
+	        <listitem>
+		      <para>If the type denoted by <parameter>typespec</parameter>
 		        is scalar, a single value appropriate for that type;
 		        otherwise, a list of alternating field names and
@@ -3815,5 +3816,5 @@
 
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 
 	        <listitem>
@@ -3836,5 +3837,5 @@
 	      Allocates a block of foreign memory suitable to hold the foreign
 	      type described by <code>typespec</code>, in the same manner
-	      as <link linkend="m_make-record">MAKE-RECORD</link>. In
+	      as <xref linkend="m_make-record"/>. In
 	      addition, <code>MAKE-GCABLE-RECORD</code> marks the
 	      returned object gcable; in other words, it informs the garbage
@@ -3898,5 +3899,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>typespec</term>
+	        <term><parameter>typespec</parameter></term>
 
 	        <listitem>
@@ -3907,8 +3908,8 @@
 
 	      <varlistentry>
-	        <term>initforms</term>
-
-	        <listitem>
-		      <para>If the type denoted by <varname>typespec</varname>
+	        <term><parameter>initforms</parameter></term>
+
+	        <listitem>
+		      <para>If the type denoted by <parameter>typespec</parameter>
 		        is scalar, a single value appropriate for that type;
 		        otherwise, a list of alternating field names and
@@ -3918,5 +3919,5 @@
 
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 
 	        <listitem>
@@ -3936,5 +3937,5 @@
 	      Expands into code which allocates and initializes
 	      an instance of the type 
-	      denoted by <varname>typespec</varname>, on the foreign
+	      denoted by <parameter>typespec</parameter>, on the foreign
 	      heap.  The record is allocated using the C function
 	      <function>malloc</function>, and the user of
@@ -3945,10 +3946,10 @@
 
 	    <para>
-	      If <varname>initforms</varname> is provided, its value
+	      If <parameter>initforms</parameter> is provided, its value
 	      or values are used in the initialization.  When the type
-	      is a scalar, <varname>initforms</varname> is either a single
+	      is a scalar, <parameter>initforms</parameter> is either a single
 	      value which can be coerced to that type, or no value, in which
-	      case binary 0 is used.  When the type is a <type>struct</type>,
-	      <varname>initforms</varname> is a list, giving field names
+	      case binary 0 is used.  When the type is a <code>struct</code>,
+	      <parameter>initforms</parameter> is a list, giving field names
 	      and the values for each.  Each field is treated in the same way
 	      as a scalar is: If a value for it is given, it must be
@@ -3957,10 +3958,10 @@
 
 	    <para>
-	      When the type is an array, <varname>initforms</varname> may
+	      When the type is an array, <parameter>initforms</parameter> may
 	      not be provided, because <function>make-record</function>
 	      cannot initialize its values.  <function>make-record</function>
-	      is also unable to initialize fields of a <type>struct</type>
+	      is also unable to initialize fields of a <code>struct</code>
 	      which are themselves
-	      <type>struct</type>s.  The user of
+	      <code>struct</code>s.  The user of
 	      <function>make-record</function> should set these values
 	      by another means.
@@ -3980,5 +3981,5 @@
 	    <para>
 	      It is inconvenient that <function>make-record</function> is a
-	      macro, because this means that <varname>typespec</varname>
+	      macro, because this means that <parameter>typespec</parameter>
 	      cannot be a variable; it must be an immediate value.
 	    </para>
@@ -4019,5 +4020,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>name</term>	
+	        <term><parameter>name</parameter></term>	
 	        <listitem>
 		      <para>A SIMPLE-STRING which is presumed to be the so-name of
@@ -4027,8 +4028,8 @@
 	      
 	      <varlistentry>
-	        <term>library</term>
+	        <term><parameter>library</parameter></term>
 	        <listitem>
 		      <para>An object of type SHLIB which describes the
-		        library denoted by <varname>name</varname>.</para>
+		        library denoted by <parameter>name</parameter>.</para>
 	        </listitem>
 	      </varlistentry>
@@ -4039,5 +4040,5 @@
 	    <title>Description</title>
 
-	    <para>If the library denoted by <varname>name</varname> can
+	    <para>If the library denoted by <parameter>name</parameter> can
 	      be loaded by the
 	      operating system, returns an object of type SHLIB that describes
@@ -4119,5 +4120,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>ptr</term>
+	        <term><parameter>ptr</parameter></term>
 
 	        <listitem>
@@ -4127,5 +4128,5 @@
 
 	      <varlistentry>
-	        <term>accessor-form</term>
+	        <term><parameter>accessor-form</parameter></term>
 
 	        <listitem>
@@ -4177,5 +4178,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>eep</term>
+	        <term><parameter>eep</parameter></term>
 
 	        <listitem>
@@ -4225,5 +4226,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>var</term>
+	        <term><parameter>var</parameter></term>
 
 	        <listitem>
@@ -4233,5 +4234,5 @@
 
 	      <varlistentry>
-	        <term>typespec</term>
+	        <term><parameter>typespec</parameter></term>
 
 	        <listitem>
@@ -4241,5 +4242,5 @@
 
           <varlistentry>
-	        <term>initforms</term>
+	        <term><parameter>initforms</parameter></term>
 
 	        <listitem>
@@ -4254,5 +4255,5 @@
 	    <title>Description</title>
 
-	    <para>Executes <varname>body</varname>
+	    <para>Executes <parameter>body</parameter>
 	      in an environment in which each var is bound
 	      to <link linkend="Referencing-and-Using-Foreign-Memory-Addresses">a MACPTR</link> encapsulating the
@@ -4260,5 +4261,5 @@
 	      initialized from typespec and initforms as per
 	      <xref linkend="m_make-record"/>.
-	      Returns whatever value(s) <varname>body</varname>
+	      Returns whatever value(s) <parameter>body</parameter>
 	      returns.</para>
 	    
@@ -4292,5 +4293,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>var</term>
+	        <term><parameter>var</parameter></term>
 
 	        <listitem>
@@ -4300,5 +4301,5 @@
 
 	      <varlistentry>
-	        <term>typespec</term>
+	        <term><parameter>typespec</parameter></term>
 
 	        <listitem>
@@ -4308,5 +4309,5 @@
 
 	      <varlistentry>
-	        <term>initforms</term>
+	        <term><parameter>initforms</parameter></term>
 
 	        <listitem>
@@ -4357,5 +4358,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>object</term>
+	        <term><parameter>object</parameter></term>
 
 	        <listitem>
@@ -4458,5 +4459,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>dir-id</term>
+	        <term><parameter>dir-id</parameter></term>
 
 	        <listitem>
@@ -4503,5 +4504,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>dir-id</term>
+	        <term><parameter>dir-id</parameter></term>
 
 	        <listitem>
Index: /trunk/source/doc/src/gc.xml
===================================================================
--- /trunk/source/doc/src/gc.xml	(revision 16295)
+++ /trunk/source/doc/src/gc.xml	(revision 16296)
@@ -278,5 +278,5 @@
         <variablelist>
           <varlistentry>
-            <term>type</term>
+            <term><parameter>type</parameter></term>
             <listitem>
               <para>The type of population, one of <literal>:LIST</literal> (the default) or <literal>:ALIST</literal></para>
@@ -285,5 +285,5 @@
 
           <varlistentry>
-            <term>initial-contents</term>
+            <term><parameter>initial-contents</parameter></term>
             <listitem>
               <para> A sequence of elements (or conses, for <literal>:alist</literal>) to be used to initialize the
@@ -446,5 +446,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>new-threshold</term>
+	      <term><parameter>new-threshold</parameter></term>
 
 	      <listitem>
@@ -512,5 +512,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>arg</term>
+	      <term><parameter>arg</parameter></term>
 
 	      <listitem>
@@ -626,5 +626,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>generation-0-size</term>
+	      <term><parameter>generation-0-size</parameter></term>
 
 	      <listitem>
@@ -635,5 +635,5 @@
 
 	    <varlistentry>
-	      <term>generation-1-size</term>
+	      <term><parameter>generation-1-size</parameter></term>
 
 	      <listitem>
@@ -644,5 +644,5 @@
 
 	    <varlistentry>
-	      <term>generation-2-size</term>
+	      <term><parameter>generation-2-size</parameter></term>
 
 	      <listitem>
@@ -687,5 +687,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>arg</term>
+	      <term><parameter>arg</parameter></term>
 
 	      <listitem>
Index: /trunk/source/doc/src/hemlock.xml
===================================================================
--- /trunk/source/doc/src/hemlock.xml	(revision 16295)
+++ /trunk/source/doc/src/hemlock.xml	(revision 16296)
@@ -2058,5 +2058,5 @@
                     <title>Description</title>
                     <para>
-delete-buffer removes buffer from <link linkend="f_all-buffers">(all-buffers)</link> and its name
+delete-buffer removes buffer from (<xref linkend="f_all-buffers"/>) and its name
 from <link linkend="v_buffer-names">*buffer-names*</link>.  Before buffer is deleted, this invokes
 the functions on buffer returned by buffer-delete-hook and those found
@@ -3701,5 +3701,5 @@
                     <variablelist>
                         <varlistentry>
-                            <term>string-name</term>
+                            <term><parameter>string-name</parameter></term>
                             <listitem>
                                 <para>
@@ -3709,5 +3709,5 @@
                         </varlistentry>
                         <varlistentry>
-                            <term>documentation</term>
+                            <term><parameter>documentation</parameter></term>
                             <listitem>
                                 <para>
@@ -3717,5 +3717,5 @@
                         </varlistentry>
                         <varlistentry>
-                            <term>:mode, :buffer</term>
+                            <term><parameter>mode</parameter>, <parameter>buffer</parameter></term>
                             <listitem>
                                 <para>
@@ -3725,5 +3725,5 @@
                         </varlistentry>
                         <varlistentry>
-                            <term>:value</term>
+                            <term><parameter>value</parameter></term>
                             <listitem>
                                 <para>
@@ -3733,5 +3733,5 @@
                         </varlistentry>
                         <varlistentry>
-                            <term>:hooks</term>
+                            <term><parameter>hooks</parameter></term>
                             <listitem>
                                 <para>
Index: /trunk/source/doc/src/ide.xml
===================================================================
--- /trunk/source/doc/src/ide.xml	(revision 16295)
+++ /trunk/source/doc/src/ide.xml	(revision 16296)
@@ -248,7 +248,7 @@
       the required subsystems, if necessary.</para>
 
-    <para>
-      <indexterm zone="build-application"/>
-      <command><varname id="build-application">BUILD-APPLICATION</varname> &key;
+      <refentry id="f_build-application"><indexterm zone="f_build-application"><primary>build-application</primary></indexterm>
+        <refnamediv><refname>BUILD-APPLICATION</refname><refpurpose></refpurpose><refclass>Function</refclass></refnamediv>
+        <refsynopsisdiv><synopsis><function>BUILD-APPLICATION</function> &key;
         (<parameter>name</parameter> <replaceable>"MyApplication"</replaceable>)
         (<parameter>type-string</parameter> <replaceable>"APPL"</replaceable>)
@@ -261,7 +261,7 @@
         (<parameter>application-class</parameter> <replaceable>'GUI::COCOA-APPLICATION</replaceable>)
         (<parameter>toplevel-function</parameter> <replaceable>NIL</replaceable>)
-        [Function]</command>
-    </para>
-
+        </synopsis></refsynopsisdiv>
+
+    <refsect1><title>Description</title>
     <para>
       The <varname>build-application</varname> function constructs an
@@ -280,5 +280,5 @@
 
       <varlistentry>
-        <term><varname>name</varname></term>
+        <term><parameter>name</parameter></term>
         <listitem>
           <para>Specifies the application name of the
@@ -292,5 +292,5 @@
 
       <varlistentry>
-        <term><varname>type-string</varname></term>
+        <term><parameter>type-string</parameter></term>
         <listitem>
           <para>Specifies type of bundle to create. You should normally
@@ -301,5 +301,5 @@
 
       <varlistentry>
-        <term><varname>creator-string</varname></term>
+        <term><parameter>creator-string</parameter></term>
         <listitem>
           <para>Specifies the <glossterm linkend="creator_code">creator
@@ -314,5 +314,5 @@
 
       <varlistentry>
-        <term><varname>directory</varname></term>
+        <term><parameter>directory</parameter></term>
         <listitem>
           <para>The directory in which <code>BUILD-APPLICATION</code>
@@ -328,5 +328,5 @@
 
       <varlistentry>
-        <term><varname>copy-ide-resources</varname></term>
+        <term><parameter>copy-ide-resources</parameter></term>
         <listitem>
           <para>Whether to copy the resource files from the IDE's
@@ -349,5 +349,5 @@
 
       <varlistentry>
-        <term><varname>info-plist</varname></term>
+        <term><parameter>info-plist</parameter></term>
         <listitem>
           <para>A user-supplied NSDictionary object that defines the
@@ -367,5 +367,5 @@
 
       <varlistentry>
-        <term><varname>nibfiles</varname></term>
+        <term><parameter>nibfiles</parameter></term>
         <listitem>
           <para>A list of pathnames, where each pathname identifies
@@ -384,5 +384,5 @@
 
       <varlistentry>
-        <term><varname>main-nib-name</varname></term>
+        <term><parameter>main-nib-name</parameter></term>
         <listitem>
           <para>The name of
@@ -397,5 +397,5 @@
 
       <varlistentry>
-        <term><varname>application-class</varname></term>
+        <term><parameter>application-class</parameter></term>
         <listitem>
           <para>The name of the application's CLOS class. The default
@@ -407,5 +407,5 @@
 
       <varlistentry>
-        <term><varname>toplevel-function</varname></term>
+        <term><parameter>toplevel-function</parameter></term>
         <listitem>
           <para>The toplevel function that runs when the application
@@ -462,4 +462,7 @@
     example in "ccl/examples/cocoa/currency-converter/".</para>
 
+    </refsect1></refentry>
+
+
     <!-- ***************************************************** -->
     <sect2 id="running-the-application-builder-from-command-line">
Index: /trunk/source/doc/src/implementation.xml
===================================================================
--- /trunk/source/doc/src/implementation.xml	(revision 16295)
+++ /trunk/source/doc/src/implementation.xml	(revision 16296)
@@ -1175,11 +1175,9 @@
 	    <orderedlist>
 	      <listitem>
-	        <para>To support a feature called <emphasis>GCTWA
-                <footnote>
-		          <para>I believe that the acronym comes from MACLISP,
+	        <para>To support a feature called <emphasis>GCTWA</emphasis>
+                (an acronym that I believe comes from MACLISP,
 		            where it stood for "Garbage Collection of Truly
-		            Worthless Atoms".</para>
-                </footnote>
-	            , </emphasis>the vector that contains the internal
+		            Worthless Atoms"),
+                   the vector that contains the internal
 	          symbols of the current package is marked on entry to the
 	          mark phase, but the symbols themselves are not marked at
@@ -1342,8 +1340,8 @@
         generations looking for such intergenerational references, the
         runtime system must note all such intergenerational references
-        at the point where they're created (via Setf).<footnote><para>This is
+        at the point where they're created (via Setf). (This is
             sometimes called "The Write Barrier": all assignments which
             might result in intergenerational references must be noted, as
-            if the other generations were write-protected.</para></footnote> The
+            if the other generations were write-protected). The
         set of pointers that may contain intergenerational references is
         sometimes called <emphasis>the remembered set</emphasis>.</para>
@@ -1391,9 +1389,9 @@
         that might introduce an intergenerational reference must be
         memoized.
-        <footnote><para>Note that the implicit setfs that occur when
+        Note that the implicit setfs that occur when
         initializing an object - as in the case of a call to cons or
         vector - can't introduce intergenerational references, since
         the newly created object is always younger than the objects
-        used to initialize it.</para></footnote> It's always safe to
+        used to initialize it. It's always safe to
         push any cons cell or gvector locative onto the memo stack;
         it's never safe to push anything else.
Index: /trunk/source/doc/src/install.xml
===================================================================
--- /trunk/source/doc/src/install.xml	(revision 16295)
+++ /trunk/source/doc/src/install.xml	(revision 16296)
@@ -180,5 +180,5 @@
         in the <literal>ccl</literal> directory.  If you use a shell,
         you can set the value of the
-        <varname>CCL_DEFAULT_DIRECTORY</varname> environment variable
+        <filename>CCL_DEFAULT_DIRECTORY</filename> environment variable
         to explicitly indicate the location of
         the <literal>ccl</literal> directory. If you choose to do
@@ -194,5 +194,5 @@
       Download and extract
       one on your local disk.  Then edit the &CCL; shell script to set
-      the value of <varname>CCL_DEFAULT_DIRECTORY</varname> and start
+      the value of <filename>CCL_DEFAULT_DIRECTORY</filename> and start
       up the appropriate &CCL; kernel. See <xref
       linkend="The-ccl-Shell-Script"/> for more information about the
@@ -526,5 +526,5 @@
         information (see <link linkend="The-Interface-Database">The
         Interface Database</link>) and the Lisp build process (see
-        <link linkend="Building-CCL-from-source">Building &CCL; from its Source
+        <link linkend="building-ccl-from-source">Building &CCL; from its Source
         Code</link>). Specifically, it needs to set up logical
         pathname translations for the <literal>"ccl:"</literal>
@@ -551,9 +551,9 @@
 	<listitem>
 	  <para>Copy the script to a directory that is on your
-	  <varname>PATH</varname>.  This is often
+	  <filename>PATH</filename>.  This is often
 	  <literal>/usr/local/bin</literal> or
 	  <literal>~/bin</literal>.  It is better to do this than to
 	  add <literal>ccl/scripts</literal> to your
-	  <varname>PATH</varname>, because the script needs to be edited,
+	  <filename>PATH</filename>, because the script needs to be edited,
 	  and editing it in-place means that Subversion sees the script as
 	  modified..</para>
Index: /trunk/source/doc/src/modifying.xml
===================================================================
--- /trunk/source/doc/src/modifying.xml	(revision 16295)
+++ /trunk/source/doc/src/modifying.xml	(revision 16296)
@@ -471,5 +471,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>reglist</term>
+	        <term><parameter>reglist</parameter></term>
 
 	        <listitem>
@@ -479,5 +479,5 @@
 
 	      <varlistentry>
-	        <term>body</term>
+	        <term><parameter>body</parameter></term>
 
 	        <listitem>
@@ -523,5 +523,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>base</term>
+	        <term><parameter>base</parameter></term>
 
 	        <listitem>
@@ -531,5 +531,5 @@
 
 	      <varlistentry>
-	        <term>n</term>
+	        <term><parameter>n</parameter></term>
 
 	        <listitem>
@@ -541,5 +541,5 @@
 
 	      <varlistentry>
-	        <term>body</term>
+	        <term><parameter>body</parameter></term>
 
 	        <listitem>
Index: /trunk/source/doc/src/platform-notes.xml
===================================================================
--- /trunk/source/doc/src/platform-notes.xml	(revision 16295)
+++ /trunk/source/doc/src/platform-notes.xml	(revision 16296)
@@ -441,5 +441,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>name</term>
+	        <term><parameter>name</parameter></term>
 
 	        <listitem>
@@ -451,9 +451,9 @@
 
 	      <varlistentry>
-	        <term>value</term>
+	        <term><parameter>value</parameter></term>
 
 	        <listitem>
 		      <para>if there is an environment variable named
-		        <varname>name</varname>, its value, as a string; if there
+		        <parameter>name</parameter>, its value, as a string; if there
 		        is not, NIL</para>
 	        </listitem>
@@ -467,5 +467,5 @@
 	    <para>
 	      Looks up the value of the environment variable named by
-	      <varname>name</varname>, in the OS environment.
+	      <parameter>name</parameter>, in the OS environment.
 	    </para>
 	  </refsect1>
@@ -492,5 +492,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>name</term>
+	        <term><parameter>name</parameter></term>
 
 	        <listitem>
@@ -502,15 +502,15 @@
 
 	      <varlistentry>
-	        <term>value</term>
+	        <term><parameter>value</parameter></term>
 
 	        <listitem>
 		      <para>a string, to be the new value of the
 		        environment variable
-		        named by <varname>name</varname></para>
-	        </listitem>
-	      </varlistentry>
-
-	      <varlistentry>
-	        <term>errno</term>
+		        named by <parameter>name</parameter></para>
+	        </listitem>
+	      </varlistentry>
+
+	      <varlistentry>
+	        <term><parameter>errno</parameter></term>
 
 	        <listitem>
@@ -528,5 +528,5 @@
 	    <para>
 	      Sets the value of the environment variable named by
-	      <varname>name</varname>, in the OS environment.  If there is
+	      <parameter>name</parameter>, in the OS environment.  If there is
 	      no such environment
 	      variable, creates it.
@@ -556,5 +556,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>path</term>
+	        <term><parameter>path</parameter></term>
 
 	        <listitem>
@@ -597,5 +597,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>uid</term>
+	        <term><parameter>uid</parameter></term>
 
 	        <listitem>
@@ -636,5 +636,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>uid</term>
+	        <term><parameter>uid</parameter></term>
 
 	        <listitem>
@@ -645,5 +645,5 @@
 
 	      <varlistentry>
-	        <term>errno</term>
+	        <term><parameter>errno</parameter></term>
 
 	        <listitem>
@@ -688,5 +688,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>gid</term>
+	        <term><parameter>gid</parameter></term>
 
 	        <listitem>
@@ -697,5 +697,5 @@
 
 	      <varlistentry>
-	        <term>errno</term>
+	        <term><parameter>errno</parameter></term>
 
 	        <listitem>
@@ -740,5 +740,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>pid</term>
+	        <term><parameter>pid</parameter></term>
 
 	        <listitem>
@@ -779,5 +779,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>uid</term>
+	        <term><parameter>uid</parameter></term>
 
 	        <listitem>
@@ -787,5 +787,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>path</term>
+	        <term><parameter>path</parameter></term>
 
 	        <listitem>
@@ -802,8 +802,8 @@
 	    <para>
 	      Looks up and returns the defined home directory of the user
-	      identified by <varname>uid</varname>.  This value comes from the
-	      OS user database, not from the <varname>$HOME</varname>
+	      identified by <parameter>uid</parameter>.  This value comes from the
+	      OS user database, not from the <filename>$HOME</filename>
 	      environment variable.  Returns NIL if there is no user with
-	      the ID <varname>uid</varname>.
+	      the ID <parameter>uid</parameter>.
 	    </para>
 	  </refsect1>
@@ -831,5 +831,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>command-line</term>
+	        <term><parameter>command-line</parameter></term>
 
 	        <listitem><para>a string, obeying all the whitespace and
@@ -841,5 +841,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>exit-code</term>
+	        <term><parameter>exit-code</parameter></term>
 
 	        <listitem><para>a non-negative integer, returned as the exit
@@ -856,10 +856,10 @@
 	      invokes the user's default system shell (such as
 	      sh or tcsh) as a new process, and has that shell execute
-	      <varname>command-line</varname>.
+	      <parameter>command-line</parameter>.
 	    </para>
 	    
 	    <para>
 	      If the shell was able to find the command specified in
-	      <varname>command-line</varname>, then <varname>exit-code</varname>
+	      <parameter>command-line</parameter>, then <parameter>exit-code</parameter>
 	      is the exit code of that command.  If not, it is the exit
 	      code of the shell itself.
@@ -901,5 +901,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>class-name</term>
+	        <term><parameter>class-name</parameter></term>
 
 	        <listitem>
@@ -947,5 +947,5 @@
 	    <variablelist>
 	      <varlistentry>
-		    <term>string</term>
+		    <term><parameter>string</parameter></term>
 
 		    <listitem>
@@ -989,5 +989,5 @@
 
 	      <varlistentry>
-		    <term>name-and-result-type</term>
+		    <term><parameter>name-and-result-type</parameter></term>
             
 		    <listitem>
@@ -1001,5 +1001,5 @@
           
 	      <varlistentry>
-		    <term>receiver-arg-and-class</term>
+		    <term><parameter>receiver-arg-and-class</parameter></term>
             
 		    <listitem>
@@ -1017,5 +1017,5 @@
           
 	      <varlistentry>
-		    <term>other-args</term>
+		    <term><parameter>other-args</parameter></term>
             
 		    <listitem>
@@ -1065,5 +1065,5 @@
 	      <variablelist>
 	        <varlistentry>
-		      <term>selector</term>
+		      <term><parameter>selector</parameter></term>
 
 		      <listitem>
@@ -1078,5 +1078,5 @@
 
 	        <varlistentry>
-		      <term>class-name</term>
+		      <term><parameter>class-name</parameter></term>
 
 		      <listitem>
@@ -1215,5 +1215,5 @@
 	      <variablelist>
 	        <varlistentry>
-		      <term>:string</term>
+		      <term><parameter>:string</parameter></term>
 		      
 		      <listitem>
Index: /trunk/source/doc/src/profile.xml
===================================================================
--- /trunk/source/doc/src/profile.xml	(revision 16295)
+++ /trunk/source/doc/src/profile.xml	(revision 16296)
@@ -356,8 +356,8 @@
       <title>Reference</title>
 
-      <para><indexterm zone="chud_shark-config-file"></indexterm>
-      <command><varname
-      id="chud_shark-config-file">CHUD:*SHARK-CONFIG-FILE*</varname>
-      [Variable]</command></para>
+      <refentry id="v_shark-config-file"><indexterm zone="v_shark-config-file"><primary>chud:*shark-config-file*</primary></indexterm>
+        <refnamediv><refname>CHUD:*SHARK-CONFIG-FILE*</refname><refpurpose></refpurpose><refclass>Variable</refclass></refnamediv>
+        <refsynopsisdiv><synopsis><varname>CHUD:*SHARK-CONFIG-FILE*</varname></synopsis></refsynopsisdiv>
+       <refsect1><title>Description</title>
 
       <para>When non-null, this should be the pathname of an alternate
@@ -365,7 +365,10 @@
       Shark.app.</para>
 
-      <para><indexterm zone="chud_meter"></indexterm> <command><varname
-      id="chud_meter">CHUD:METER</varname> form &key; (reset nil)
-      (debug-output nil) [Macro]</command></para>
+    </refsect1></refentry>
+
+      <refentry id="m_chud_meter"><indexterm zone="m_chud_meter"><primary>chud:meter</primary></indexterm>
+        <refnamediv><refname>CHUD:METER</refname><refpurpose></refpurpose><refclass>Macro</refclass></refnamediv>
+        <refsynopsisdiv><synopsis><function>CHUD:METER</function> form &key; (reset nil) (debug-output nil)</synopsis></refsynopsisdiv>
+       <refsect1><title>Description</title>
 
       <para>Executes FORM (an arbitrary lisp form) and returns whatever
@@ -379,5 +382,5 @@
       <variablelist>
         <varlistentry>
-          <term><varname>debug-output</varname></term>
+          <term><parameter>debug-output</parameter></term>
 
           <listitem>
@@ -388,5 +391,5 @@
 
         <varlistentry>
-          <term><varname>reset</varname></term>
+          <term><parameter>reset</parameter></term>
 
           <listitem>
@@ -402,4 +405,6 @@
         </varlistentry>
       </variablelist>
+    </refsect1></refentry>
+
     </sect2>
 
Index: /trunk/source/doc/src/sockets.xml
===================================================================
--- /trunk/source/doc/src/sockets.xml	(revision 16295)
+++ /trunk/source/doc/src/sockets.xml	(revision 16296)
@@ -130,5 +130,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>address-family</term>
+	      <term><parameter>address-family</parameter></term>
 
 	      <listitem>
@@ -141,5 +141,5 @@
 
 	    <varlistentry>
-	      <term>type</term>
+	      <term><parameter>type</parameter></term>
 
 	      <listitem>
@@ -151,5 +151,5 @@
 
 	    <varlistentry>
-	      <term>connect</term>
+	      <term><parameter>connect</parameter></term>
 
 	      <listitem>
@@ -161,5 +161,5 @@
 
 	    <varlistentry>
-	      <term>eol</term>
+	      <term><parameter>eol</parameter></term>
 
 	      <listitem>
@@ -170,5 +170,5 @@
 
 	    <varlistentry>
-	      <term>format</term>
+	      <term><parameter>format</parameter></term>
 
 	      <listitem>
@@ -184,5 +184,5 @@
 
 	    <varlistentry>
-	      <term>remote</term>
+	      <term><parameter>remote</parameter></term>
 
 	      <listitem>
@@ -196,5 +196,5 @@
 
 	    <varlistentry>
-	      <term>remote-host</term>
+	      <term><parameter>remote-host</parameter></term>
 
 	      <listitem>
@@ -208,5 +208,5 @@
 
 	    <varlistentry>
-	      <term>remote-port</term>
+	      <term><parameter>remote-port</parameter></term>
 
 	      <listitem>
@@ -220,5 +220,5 @@
 
 	    <varlistentry>
-	      <term>remote-filename</term>
+	      <term><parameter>remote-filename</parameter></term>
 
 	      <listitem>
@@ -231,5 +231,5 @@
 
 	    <varlistentry>
-	      <term>local-address</term>
+	      <term><parameter>local-address</parameter></term>
 
 	      <listitem>
@@ -242,5 +242,5 @@
 
 	    <varlistentry>
-	      <term>local-host</term>
+	      <term><parameter>local-host</parameter></term>
 
 	      <listitem>
@@ -253,5 +253,5 @@
 
 	    <varlistentry>
-	      <term>local-port</term>
+	      <term><parameter>local-port</parameter></term>
 
 	      <listitem>
@@ -263,5 +263,5 @@
 
 	    <varlistentry>
-	      <term>local-filename</term>
+	      <term><parameter>local-filename</parameter></term>
 
 	      <listitem>
@@ -277,5 +277,5 @@
 
 	    <varlistentry>
-	      <term>keepalive</term>
+	      <term><parameter>keepalive</parameter></term>
 
 	      <listitem>
@@ -286,5 +286,5 @@
 
 	    <varlistentry>
-	      <term>reuse-address</term>
+	      <term><parameter>reuse-address</parameter></term>
 
 	      <listitem>
@@ -296,5 +296,5 @@
 
 	    <varlistentry>
-	      <term>nodelay</term>
+	      <term><parameter>nodelay</parameter></term>
 
 	      <listitem>
@@ -309,5 +309,5 @@
 
 	    <varlistentry>
-	      <term>broadcast</term>
+	      <term><parameter>broadcast</parameter></term>
 
 	      <listitem>
@@ -318,5 +318,5 @@
 
 	    <varlistentry>
-	      <term>linger</term>
+	      <term><parameter>linger</parameter></term>
 
 	      <listitem>
@@ -328,5 +328,5 @@
 
 	    <varlistentry>
-	      <term>backlog</term>
+	      <term><parameter>backlog</parameter></term>
 
 	      <listitem>
@@ -339,5 +339,5 @@
 
 	    <varlistentry>
-	      <term>input-timeout</term>
+	      <term><parameter>input-timeout</parameter></term>
 
 	      <listitem>
@@ -353,5 +353,5 @@
 
 	    <varlistentry>
-	      <term>output-timeout</term>
+	      <term><parameter>output-timeout</parameter></term>
 
 	      <listitem>
@@ -367,5 +367,5 @@
 
 	    <varlistentry>
-	      <term>connect-timeout</term>
+	      <term><parameter>connect-timeout</parameter></term>
 
 	      <listitem>
@@ -382,5 +382,5 @@
 
 	    <varlistentry>
-	      <term>auto-close</term>
+	      <term><parameter>auto-close</parameter></term>
 
 	      <listitem>
@@ -392,5 +392,5 @@
 	    </varlistentry>
 	    <varlistentry>
-	      <term>deadline</term>
+	      <term><parameter>deadline</parameter></term>
 
 	      <listitem>
@@ -441,5 +441,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket</term>
+	      <term><parameter>socket</parameter></term>
 
 	      <listitem>
@@ -449,5 +449,5 @@
 
 	    <varlistentry>
-	      <term>wait</term>
+	      <term><parameter>wait</parameter></term>
 
 	      <listitem>
@@ -495,5 +495,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>host</term>
+	      <term><parameter>host</parameter></term>
 
 	      <listitem>
@@ -506,5 +506,5 @@
 
 	    <varlistentry>
-	      <term>port</term>
+	      <term><parameter>port</parameter></term>
 
 	      <listitem>
@@ -516,5 +516,5 @@
 
 	    <varlistentry>
-	      <term>socket-type</term>
+	      <term><parameter>socket-type</parameter></term>
 
 	      <listitem>
@@ -526,5 +526,5 @@
 
 	    <varlistentry>
-	      <term>connect</term>
+	      <term><parameter>connect</parameter></term>
 
 	      <listitem>
@@ -542,5 +542,5 @@
 
 	    <varlistentry>
-	      <term>address-family</term>
+	      <term><parameter>address-family</parameter></term>
 
 	      <listitem>
@@ -553,5 +553,5 @@
 
 	    <varlistentry>
-	      <term>numeric-host-p</term>
+	      <term><parameter>numeric-host-p</parameter></term>
 
 	      <listitem>
@@ -563,5 +563,5 @@
 
 	    <varlistentry>
-	      <term>numeric-port-p</term>
+	      <term><parameter>numeric-port-p</parameter></term>
 
 	      <listitem>
@@ -574,5 +574,5 @@
 
 	    <varlistentry>
-	      <term>singlep</term>
+	      <term><parameter>singlep</parameter></term>
 
 	      <listitem>
@@ -585,5 +585,5 @@
 
 	    <varlistentry>
-	      <term>errorp</term>
+	      <term><parameter>errorp</parameter></term>
 
 	      <listitem>
@@ -634,5 +634,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>dotted</term>
+	      <term><parameter>dotted</parameter></term>
 
 	      <listitem>
@@ -643,5 +643,5 @@
 
 	    <varlistentry>
-	      <term>errorp</term>
+	      <term><parameter>errorp</parameter></term>
 
 	      <listitem>
@@ -681,5 +681,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>ipaddr</term>
+	      <term><parameter>ipaddr</parameter></term>
 
 	      <listitem>
@@ -690,5 +690,5 @@
 
 	    <varlistentry>
-	      <term>values</term>
+	      <term><parameter>values</parameter></term>
 
 	      <listitem>
@@ -729,5 +729,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>ipaddr</term>
+	      <term><parameter>ipaddr</parameter></term>
 
 	      <listitem>
@@ -737,5 +737,5 @@
 
 	    <varlistentry>
-	      <term>ignore-cache</term>
+	      <term><parameter>ignore-cache</parameter></term>
 
 	      <listitem>
@@ -775,5 +775,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>host</term>
+	      <term><parameter>host</parameter></term>
 
 	      <listitem>
@@ -817,5 +817,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>port</term>
+	      <term><parameter>port</parameter></term>
 
 	      <listitem>
@@ -829,5 +829,5 @@
 
 	    <varlistentry>
-	      <term>protocol</term>
+	      <term><parameter>protocol</parameter></term>
 
 	      <listitem>
@@ -866,5 +866,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket</term>
+	      <term><parameter>socket</parameter></term>
 
 	      <listitem>
@@ -874,5 +874,5 @@
 
 	    <varlistentry>
-	      <term>size</term>
+	      <term><parameter>size</parameter></term>
 
 	      <listitem>
@@ -883,5 +883,5 @@
 
 	    <varlistentry>
-	      <term>buffer</term>
+	      <term><parameter>buffer</parameter></term>
 
 	      <listitem>
@@ -894,5 +894,5 @@
 
 	    <varlistentry>
-	      <term>extract</term>
+	      <term><parameter>extract</parameter></term>
 
 	      <listitem>
@@ -905,5 +905,5 @@
 
 	    <varlistentry>
-	      <term>offset</term>
+	      <term><parameter>offset</parameter></term>
 
 	      <listitem>
@@ -914,5 +914,5 @@
 
 	    <varlistentry>
-	      <term>want-socket-address-p</term>
+	      <term><parameter>want-socket-address-p</parameter></term>
 
 	      <listitem>
@@ -993,5 +993,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket</term>
+	      <term><parameter>socket</parameter></term>
 
 	      <listitem>
@@ -1001,5 +1001,5 @@
 
 	    <varlistentry>
-	      <term>buffer</term>
+	      <term><parameter>buffer</parameter></term>
 
 	      <listitem>
@@ -1010,5 +1010,5 @@
 
 	    <varlistentry>
-	      <term>size</term>
+	      <term><parameter>size</parameter></term>
 
 	      <listitem>
@@ -1018,5 +1018,5 @@
 
 	    <varlistentry>
-	      <term>remote</term>
+	      <term><parameter>remote</parameter></term>
 
 	      <listitem>
@@ -1029,5 +1029,5 @@
 
 	    <varlistentry>
-	      <term>remote-host</term>
+	      <term><parameter>remote-host</parameter></term>
 
 	      <listitem>
@@ -1039,5 +1039,5 @@
 
 	    <varlistentry>
-	      <term>remote-port</term>
+	      <term><parameter>remote-port</parameter></term>
 
 	      <listitem>
@@ -1049,5 +1049,5 @@
 
 	    <varlistentry>
-	      <term>offset</term>
+	      <term><parameter>offset</parameter></term>
 
 	      <listitem>
@@ -1085,5 +1085,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket</term>
+	      <term><parameter>socket</parameter></term>
 
 	      <listitem>
@@ -1093,5 +1093,5 @@
 
 	    <varlistentry>
-	      <term>direction</term>
+	      <term><parameter>direction</parameter></term>
 
 	      <listitem>
@@ -1132,5 +1132,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket</term>
+	      <term><parameter>socket</parameter></term>
 
 	      <listitem>
@@ -1174,5 +1174,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket</term>
+	      <term><parameter>socket</parameter></term>
 
 	      <listitem>
@@ -1211,5 +1211,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket</term>
+	      <term><parameter>socket</parameter></term>
 
 	      <listitem>
@@ -1248,5 +1248,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket</term>
+	      <term><parameter>socket</parameter></term>
 
 	      <listitem>
@@ -1285,5 +1285,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket</term>
+	      <term><parameter>socket</parameter></term>
 
 	      <listitem>
@@ -1321,5 +1321,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>thing</term>
+	      <term><parameter>thing</parameter></term>
 
 	      <listitem>
@@ -1358,5 +1358,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket-address</term>
+	      <term><parameter>socket-address</parameter></term>
 
 	      <listitem>
@@ -1398,5 +1398,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket-address</term>
+	      <term><parameter>socket-address</parameter></term>
 
 	      <listitem>
@@ -1437,5 +1437,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket</term>
+	      <term><parameter>socket</parameter></term>
 
 	      <listitem>
@@ -1474,5 +1474,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket</term>
+	      <term><parameter>socket</parameter></term>
 
 	      <listitem>
@@ -1511,5 +1511,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket</term>
+	      <term><parameter>socket</parameter></term>
 
 	      <listitem>
@@ -1593,5 +1593,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket-error</term>
+	      <term><parameter>socket-error</parameter></term>
 
 	      <listitem>
@@ -1629,5 +1629,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket-error</term>
+	      <term><parameter>socket-error</parameter></term>
 
 	      <listitem>
@@ -1671,5 +1671,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket-error</term>
+	      <term><parameter>socket-error</parameter></term>
 
 	      <listitem>
@@ -1709,5 +1709,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>socket</term>
+	      <term><parameter>socket</parameter></term>
 
 	      <listitem>
@@ -1717,5 +1717,5 @@
 
 	    <varlistentry>
-	      <term>abort</term>
+	      <term><parameter>abort</parameter></term>
 
 	      <listitem>
@@ -1760,5 +1760,5 @@
 	  <variablelist>
 	    <varlistentry>
-	      <term>var</term>
+	      <term><parameter>var</parameter></term>
 
 	      <listitem>
@@ -1768,5 +1768,5 @@
 
 	    <varlistentry>
-	      <term>make-socket-args</term>
+	      <term><parameter>make-socket-args</parameter></term>
 
 	      <listitem>
@@ -1776,5 +1776,5 @@
 
 	    <varlistentry>
-	      <term>body</term>
+	      <term><parameter>body</parameter></term>
 
 	      <listitem>
Index: /trunk/source/doc/src/streams.xml
===================================================================
--- /trunk/source/doc/src/streams.xml	(revision 16295)
+++ /trunk/source/doc/src/streams.xml	(revision 16296)
@@ -230,5 +230,5 @@
 	      <variablelist>
 	        <varlistentry>
-	          <term>stream-list</term>
+	          <term><parameter>stream-list</parameter></term>
 	          <listitem>
 		        <para>A list of open file streams.  This is a copy of
@@ -279,5 +279,5 @@
 	      <variablelist>
 	        <varlistentry>
-	          <term>file-stream</term>
+	          <term><parameter>file-stream</parameter></term>
 	          <listitem>
 		        <para>A file stream.</para>
@@ -331,5 +331,5 @@
 	      <variablelist>
 	        <varlistentry>
-	          <term>file-stream</term>
+	          <term><parameter>file-stream</parameter></term>
 	          <listitem>
 		        <para>A file stream.</para>
@@ -618,5 +618,5 @@
 	      <variablelist>
 	        <varlistentry>
-	          <term>stream</term>
+	          <term><parameter>stream</parameter></term>
 
 	          <listitem>
@@ -626,5 +626,5 @@
 
 	        <varlistentry>
-	          <term>list</term>
+	          <term><parameter>list</parameter></term>
 
 	          <listitem>
@@ -636,5 +636,5 @@
 
 	        <varlistentry>
-	          <term>count</term>
+	          <term><parameter>count</parameter></term>
 
 	          <listitem>
@@ -677,5 +677,5 @@
 	      <variablelist>
 	        <varlistentry>
-	          <term>stream</term>
+	          <term><parameter>stream</parameter></term>
 
 	          <listitem>
@@ -685,5 +685,5 @@
 
 	        <varlistentry>
-	          <term>list</term>
+	          <term><parameter>list</parameter></term>
 
 	          <listitem>
@@ -695,5 +695,5 @@
 
 	        <varlistentry>
-	          <term>count</term>
+	          <term><parameter>count</parameter></term>
 
 	          <listitem>
@@ -735,5 +735,5 @@
 	      <variablelist>
 	        <varlistentry>
-	          <term>stream</term>
+	          <term><parameter>stream</parameter></term>
 
 	          <listitem>
@@ -743,5 +743,5 @@
 
 	        <varlistentry>
-	          <term>vector</term>
+	          <term><parameter>vector</parameter></term>
 
 	          <listitem>
@@ -753,5 +753,5 @@
 
 	        <varlistentry>
-	          <term>start</term>
+	          <term><parameter>start</parameter></term>
 
 	          <listitem>
@@ -764,5 +764,5 @@
 
 	        <varlistentry>
-	          <term>end</term>
+	          <term><parameter>end</parameter></term>
 
 	          <listitem>
@@ -808,5 +808,5 @@
 	      <variablelist>
 	        <varlistentry>
-	          <term>stream</term>
+	          <term><parameter>stream</parameter></term>
 
 	          <listitem>
@@ -816,5 +816,5 @@
 
 	        <varlistentry>
-	          <term>vector</term>
+	          <term><parameter>vector</parameter></term>
 
 	          <listitem>
@@ -826,5 +826,5 @@
 
 	        <varlistentry>
-	          <term>start</term>
+	          <term><parameter>start</parameter></term>
 
 	          <listitem>
@@ -837,5 +837,5 @@
 
 	        <varlistentry>
-	          <term>end</term>
+	          <term><parameter>end</parameter></term>
 
 	          <listitem>
@@ -878,6 +878,6 @@
 	      <title>Method Signatures</title>
 
-	      <synopsis><function>ccl::stream-device</function>
-	        (s stream) direction => fd</synopsis>
+	      <code><function>ccl::stream-device</function>
+	        (s stream) direction => fd</code>
 	    </refsect1>
 
@@ -887,5 +887,5 @@
 	      <variablelist>
 	        <varlistentry>
-	          <term>s</term>
+	          <term><parameter>s</parameter></term>
 	          <listitem>
 		        <para>a stream.</para>
@@ -893,5 +893,5 @@
 	        </varlistentry>
 	        <varlistentry>
-	          <term>direction</term>
+	          <term><parameter>direction</parameter></term>
 	          <listitem>
 		        <para>either :INPUT or :OUTPUT.</para>
@@ -899,11 +899,11 @@
 	        </varlistentry>
 	        <varlistentry>
-	          <term>fd</term>
+	          <term><parameter>fd</parameter></term>
 	          <listitem>
 		        <para>a file descriptor, which is a non-negative integer
 		          used by the OS to refer to an open file, socket, or similar
 		          I/O connection.  NIL if there is no file descriptor associated
-		          with <varname>s</varname> in the direction given by
-		          <varname>direction</varname>.</para>
+		          with <parameter>s</parameter> in the direction given by
+		          <parameter>direction</parameter>.</para>
 	          </listitem>
 	        </varlistentry>
@@ -915,7 +915,7 @@
 
 	      <para>Returns the file descriptor associated with
-	        <varname>s</varname> in the direction given by
-	        <varname>direction</varname>.  It is necessary to specify
-	        <varname>direction</varname> because the input and output
+	        <parameter>s</parameter> in the direction given by
+	        <parameter>direction</parameter>.  It is necessary to specify
+	        <parameter>direction</parameter> because the input and output
 	        file descriptors may be different; the most common case is when
 	        one of them has been redirected by the Unix shell.</para>
@@ -952,5 +952,5 @@
 	      <variablelist>
 	        <varlistentry>
-	          <term>stream</term>
+	          <term><parameter>stream</parameter></term>
 
 	          <listitem>
@@ -962,5 +962,5 @@
 
 	        <varlistentry>
-	          <term>ivector</term>
+	          <term><parameter>ivector</parameter></term>
 
 	          <listitem>
@@ -970,5 +970,5 @@
 
 	        <varlistentry>
-	          <term>start-octet</term>
+	          <term><parameter>start-octet</parameter></term>
 
 	          <listitem>
@@ -978,5 +978,5 @@
 
 	        <varlistentry>
-	          <term>max-octets</term>
+	          <term><parameter>max-octets</parameter></term>
 
 	          <listitem>
@@ -1017,5 +1017,5 @@
 	      <variablelist>
 	        <varlistentry>
-	          <term>stream</term>
+	          <term><parameter>stream</parameter></term>
 
 	          <listitem>
@@ -1027,5 +1027,5 @@
 
 	        <varlistentry>
-	          <term>ivector</term>
+	          <term><parameter>ivector</parameter></term>
 
 	          <listitem>
@@ -1035,5 +1035,5 @@
 
 	        <varlistentry>
-	          <term>start-octet</term>
+	          <term><parameter>start-octet</parameter></term>
 
 	          <listitem>
@@ -1043,5 +1043,5 @@
 
 	        <varlistentry>
-	          <term>max-octet</term>
+	          <term><parameter>max-octet</parameter></term>
 
 	          <listitem>
Index: /trunk/source/doc/src/threads.xml
===================================================================
--- /trunk/source/doc/src/threads.xml	(revision 16295)
+++ /trunk/source/doc/src/threads.xml	(revision 16296)
@@ -617,5 +617,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>a list of all lisp processes (threads)
@@ -673,5 +673,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>name</term>
+	        <term><parameter>name</parameter></term>
 	        
 	        <listitem>
@@ -681,5 +681,5 @@
 	      
 	      <varlistentry>
-	        <term>persistent</term>
+	        <term><parameter>persistent</parameter></term>
 	        
 	        <listitem>
@@ -692,5 +692,5 @@
 	      
 	      <varlistentry>
-	        <term>priority</term>
+	        <term><parameter>priority</parameter></term>
 	        
 	        <listitem>
@@ -702,5 +702,5 @@
 	      
 	      <varlistentry>
-	        <term>class</term>
+	        <term><parameter>class</parameter></term>
 	        
 	        <listitem>
@@ -712,5 +712,5 @@
 	      
 	      <varlistentry>
-	        <term>initargs</term>
+	        <term><parameter>initargs</parameter></term>
 	        
 	        <listitem>
@@ -720,5 +720,5 @@
 
 	      <varlistentry>
-	        <term>stack-size</term>
+	        <term><parameter>stack-size</parameter></term>
 	        
 	        <listitem>
@@ -731,5 +731,5 @@
 	      
 	      <varlistentry>
-	        <term>vstack-size</term>
+	        <term><parameter>vstack-size</parameter></term>
 	        
 	        <listitem>
@@ -742,5 +742,5 @@
 	      
 	      <varlistentry>
-	        <term>tstack-size</term>
+	        <term><parameter>tstack-size</parameter></term>
 	        
 	        <listitem>
@@ -752,5 +752,5 @@
 	      
 	      <varlistentry>
-	        <term>use-standard-initial-bindings</term>
+	        <term><parameter>use-standard-initial-bindings</parameter></term>
 	        
 	        <listitem>
@@ -768,13 +768,13 @@
 	      
 	      <varlistentry>
-	        <term>initial-bindings</term>
+	        <term><parameter>initial-bindings</parameter></term>
 	        
 	        <listitem>
-		      <para>an alist of (<varname>symbol</varname> .
-		        <varname>valueform</varname>) pairs, which can be
+		      <para>an alist of (<parameter>symbol</parameter> .
+		        <parameter>valueform</parameter>) pairs, which can be
 		        used to initialize special variable bindings in the new
-		        thread. Each <varname>valueform</varname> is used to
+		        thread. Each <parameter>valueform</parameter> is used to
 		        compute the value of a new binding of
-		        <varname>symbol</varname> in the execution environment of
+		        <parameter>symbol</parameter> in the execution environment of
 		        the newly-created thread.  The default is nil.</para>
 	        </listitem>
@@ -782,5 +782,5 @@
 	      
 	      <varlistentry>
-	        <term>process</term>
+	        <term><parameter>process</parameter></term>
 	        
 	        <listitem>
@@ -795,5 +795,5 @@
 
 	    <para>Creates and returns a new lisp process (thread) with the
-	      specified attributes. <varname>process</varname> will not begin
+	      specified attributes. <parameter>process</parameter> will not begin
 	      execution immediately; it will need to be
 	      <emphasis>preset</emphasis> (given
@@ -804,10 +804,10 @@
 	      before it&#39;s able to actually do anything.</para>
 
-	    <para>If <varname>valueform</varname> is a function, it is
+	    <para>If <parameter>valueform</parameter> is a function, it is
 	      called, with no arguments, in the execution environment of the
 	      newly-created thread; the primary value it returns is used for
-	      the binding of the corresponding <varname>symbol</varname>.</para>
-
-	    <para>Otherwise, <varname>valueform</varname> is evaluated in the
+	      the binding of the corresponding <parameter>symbol</parameter>.</para>
+
+	    <para>Otherwise, <parameter>valueform</parameter> is evaluated in the
 	      execution
 	      environment of the newly-created thread, and the resulting value
@@ -847,5 +847,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>process</term>
+	        <term><parameter>process</parameter></term>
 	        <listitem>
 		      <para>a lisp process (thread).</para>
@@ -853,9 +853,9 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
-	        <listitem>
-		      <para>T if <varname>process</varname> had been runnable
+	        <term><parameter>result</parameter></term>
+	        <listitem>
+		      <para>T if <parameter>process</parameter> had been runnable
 		        and is now suspended; NIL otherwise.  That is, T if
-		        <varname>process</varname>'s
+		        <parameter>process</parameter>'s
 		        <xref linkend="f_process-suspend-count"/>
 		        transitioned from 0 to 1.</para>
@@ -868,5 +868,5 @@
 	    <title>Description</title>
 
-	    <para>Suspends <varname>process</varname>, preventing it from
+	    <para>Suspends <parameter>process</parameter>, preventing it from
 	      running, and stopping it if it was already running. This is a fairly
 	      expensive operation, because it involves a few
@@ -879,8 +879,8 @@
 	      call to <function>process-suspend</function> must be reversed by
 	      a matching call to <xref linkend="f_process-resume"/>
-	      before <varname>process</varname> is able to run.  What
+	      before <parameter>process</parameter> is able to run.  What
 	      <function>process-suspend</function> actually does is increment
 	      the <xref linkend="f_process-suspend-count"/> of
-	      <varname>process</varname>.
+	      <parameter>process</parameter>.
 	    </para>
 
@@ -902,8 +902,8 @@
 	    <title>Notes</title>
 	    <para><function>process-suspend</function> was previously called
-	      <function>process-disable</function>.
+	      <code>process-disable</code>.
 	      <xref linkend="f_process-enable"/>
 	      now names a function for which there is no
-	      obvious inverse, so <function>process-disable</function>
+	      obvious inverse, so <code>process-disable</code>
 	      is no longer
 	      defined.</para>
@@ -933,5 +933,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>process</term>
+	        <term><parameter>process</parameter></term>
 	        <listitem>
 		      <para>a lisp process (thread).</para>
@@ -939,9 +939,9 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
-	        <listitem>
-		      <para>T if <varname>process</varname> had been suspended
+	        <term><parameter>result</parameter></term>
+	        <listitem>
+		      <para>T if <parameter>process</parameter> had been suspended
 		        and is now runnable; NIL otherwise.  That is, T if
-		        <varname>process</varname>'s
+		        <parameter>process</parameter>'s
 		        <xref linkend="f_process-suspend-count"/>
 		        transitioned from  to 0.
@@ -961,5 +961,5 @@
 	      <function>process-resume</function> actually does is decrement
 	      the <xref linkend="f_process-suspend-count"/> of
-	      <varname>process</varname>, to a minimum of 0.</para>
+	      <parameter>process</parameter>, to a minimum of 0.</para>
 	  </refsect1>
 
@@ -1008,5 +1008,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>process</term>
+	        <term><parameter>process</parameter></term>
 	        <listitem>
 		      <para>a lisp process (thread).</para>
@@ -1014,10 +1014,10 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>The number of "outstanding"
 		        <xref linkend="f_process-suspend"/> calls on
-		        <varname>process</varname>, or NIL if
-		        <varname>process</varname> has expired.
+		        <parameter>process</parameter>, or NIL if
+		        <parameter>process</parameter> has expired.
 		      </para>
 	        </listitem>
@@ -1076,5 +1076,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>process</term>
+	        <term><parameter>process</parameter></term>
 	        <listitem>
 		      <para>a lisp process (thread).</para>
@@ -1082,5 +1082,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>function</term>
+	        <term><parameter>function</parameter></term>
 	        <listitem>
 		      <para>a function, designated by itself or by a symbol
@@ -1090,12 +1090,12 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>args</term>
+	        <term><parameter>args</parameter></term>
 	        <listitem>
 		      <para>a list of values, appropriate as arguments to
-		        <varname>function</varname>.</para>
-	        </listitem>
-	      </varlistentry>
-	      <varlistentry>
-	        <term>result</term>
+		        <parameter>function</parameter>.</para>
+	        </listitem>
+	      </varlistentry>
+	      <varlistentry>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>undefined.</para>
@@ -1109,9 +1109,9 @@
 
 	    <para>Typically used to initialize a newly-created or newly-reset
-	      process, setting things up so that when <varname>process</varname>
+	      process, setting things up so that when <parameter>process</parameter>
 	      becomes enabled, it will begin execution by
-	      applying <varname>function</varname> to <varname>args</varname>.
+	      applying <parameter>function</parameter> to <parameter>args</parameter>.
 	      <function>process-preset</function> does not enable
-	      <varname>process</varname>,
+	      <parameter>process</parameter>,
 	      although a process must be <function>process-preset</function>
 	      before it can be enabled.  Processes are normally enabled by
@@ -1154,5 +1154,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>process</term>
+	        <term><parameter>process</parameter></term>
 	        <listitem>
 		      <para>a lisp process (thread).</para>
@@ -1160,5 +1160,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>timeout</term>
+	        <term><parameter>timeout</parameter></term>
 	        <listitem>
 		      <para>a time interval in seconds.  May be any
@@ -1168,5 +1168,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>undefined.</para>
@@ -1179,15 +1179,15 @@
 	    <title>Description</title>
 
-	    <para>Tries to begin the execution of <varname>process</varname>.
-	      An error is signaled if <varname>process</varname> has never
+	    <para>Tries to begin the execution of <parameter>process</parameter>.
+	      An error is signaled if <parameter>process</parameter> has never
 	      been <xref linkend="f_process-preset"/>.  Otherwise,
-	      <varname>process</varname> invokes its initial function.
+	      <parameter>process</parameter> invokes its initial function.
 	    </para>
 	    
 	    <para><function>process-enable</function> attempts to
-	      synchronize with <varname>process</varname>, which is presumed
+	      synchronize with <parameter>process</parameter>, which is presumed
 	      to be reset or in the act of resetting itself.  If this attempt
 	      is not successful within the time interval specified by
-	      <varname>timeout</varname>, a continuable error is signaled,
+	      <parameter>timeout</parameter>, a continuable error is signaled,
 	      which offers the opportunity to continue waiting.
 	    </para>
@@ -1237,21 +1237,21 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>process-specifier</term>
+	        <term><parameter>process-specifier</parameter></term>
 	        <listitem>
 		      <para>
-		        <varname>name</varname> | 
-		        (&key; <varname>name</varname>
-		        <varname>persistent</varname>
-		        <varname>priority</varname>
-		        <varname>class</varname>
-			<varname>initargs</varname>
-		        <varname>stack-size</varname>
-		        <varname>vstack-size</varname>
-		        <varname>tstack-size</varname>)
+		        <parameter>name</parameter> | 
+		        (&key; <parameter>name</parameter>
+		        <parameter>persistent</parameter>
+		        <parameter>priority</parameter>
+		        <parameter>class</parameter>
+			<parameter>initargs</parameter>
+		        <parameter>stack-size</parameter>
+		        <parameter>vstack-size</parameter>
+		        <parameter>tstack-size</parameter>)
 		      </para>
 	        </listitem>
 	      </varlistentry>
 	      <varlistentry>
-	        <term>name</term>
+	        <term><parameter>name</parameter></term>
 	        <listitem>
 		      <para>a string, used to identify the process.
@@ -1260,14 +1260,14 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>function</term>
+	        <term><parameter>function</parameter></term>
 	        <listitem>
 		      <para>a function, designated by itself or by a symbol
 		        which names it.  Passed to
-		        <function>preset-process</function>.
+		        <function>process-preset</function>.
 		      </para>
 	        </listitem>
 	      </varlistentry>
 	      <varlistentry>
-	        <term>persistent</term>
+	        <term><parameter>persistent</parameter></term>
 	        
 	        <listitem>
@@ -1278,5 +1278,5 @@
 	      
 	      <varlistentry>
-	        <term>priority</term>
+	        <term><parameter>priority</parameter></term>
 	        
 	        <listitem>
@@ -1286,5 +1286,5 @@
 	      
 	      <varlistentry>
-	        <term>class</term>
+	        <term><parameter>class</parameter></term>
 	        
 	        <listitem>
@@ -1295,5 +1295,5 @@
 	      
 	      <varlistentry>
-	        <term>initargs</term>
+	        <term><parameter>initargs</parameter></term>
 	        
 	        <listitem>
@@ -1304,5 +1304,5 @@
 
 	      <varlistentry>
-	        <term>stack-size</term>
+	        <term><parameter>stack-size</parameter></term>
 	        
 	        <listitem>
@@ -1313,5 +1313,5 @@
 	      
 	      <varlistentry>
-	        <term>vstack-size</term>
+	        <term><parameter>vstack-size</parameter></term>
 	        
 	        <listitem>
@@ -1322,5 +1322,5 @@
 	      
 	      <varlistentry>
-	        <term>tstack-size</term>
+	        <term><parameter>tstack-size</parameter></term>
 	        
 	        <listitem>
@@ -1331,5 +1331,5 @@
 
 	      <varlistentry>
-	        <term>process</term>
+	        <term><parameter>process</parameter></term>
 	        <listitem>
 		      <para>the newly-created process.</para>
@@ -1346,5 +1346,5 @@
 	      presets it via <xref linkend="f_process-preset"/>, and
 	      enables it via <xref linkend="f_process-enable"/>.  This means
-	      that <varname>process</varname> will immediately begin to
+	      that <parameter>process</parameter> will immediately begin to
 	      execute.
 	      <function>process-run-function</function> is
@@ -1387,5 +1387,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>process</term>
+	        <term><parameter>process</parameter></term>
 	        <listitem>
 		      <para>a lisp process (thread).</para>
@@ -1393,5 +1393,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>function</term>
+	        <term><parameter>function</parameter></term>
 	        <listitem>
 		      <para>a function.
@@ -1400,16 +1400,16 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>args</term>
+	        <term><parameter>args</parameter></term>
 	        <listitem>
 		      <para>a list of values, appropriate as arguments to
-		        <varname>function</varname>.</para>
-	        </listitem>
-	      </varlistentry>
-	      <varlistentry>
-	        <term>result</term>
-	        <listitem>
-		      <para>the result of applying <varname>function</varname>
-		        to <varname>args</varname> if <varname>process</varname>
-		        is the <function>current-process</function>, otherwise
+		        <parameter>function</parameter>.</para>
+	        </listitem>
+	      </varlistentry>
+	      <varlistentry>
+	        <term><parameter>result</parameter></term>
+	        <listitem>
+		      <para>the result of applying <parameter>function</parameter>
+		        to <parameter>args</parameter> if <parameter>process</parameter>
+		        is the <varname>*current-process*</varname>, otherwise
 		        NIL.</para>
 	        </listitem>
@@ -1421,13 +1421,13 @@
 	    <title>Description</title>
 
-	    <para>Arranges for <varname>process</varname>
-	      to apply <varname>function</varname> to <varname>args</varname> at
+	    <para>Arranges for <parameter>process</parameter>
+	      to apply <parameter>function</parameter> to <parameter>args</parameter> at
 	      some point in the near future (interrupting whatever
-	      <varname>process</varname>
-	      was doing.) If <varname>function</varname> returns normally,
-	      <varname>process</varname> resumes
+	      <parameter>process</parameter>
+	      was doing.) If <parameter>function</parameter> returns normally,
+	      <parameter>process</parameter> resumes
 	      execution at the point at which it was interrupted.</para>
 
-	    <para><varname>process</varname> must be in an enabled state in
+	    <para><parameter>process</parameter> must be in an enabled state in
 	      order to respond
 	      to a <function>process-interrupt</function> request.  It's
@@ -1465,5 +1465,5 @@
 	    <title>Notes</title>
 
-	    <para>It would probably be better for <varname>result</varname>
+	    <para>It would probably be better for <parameter>result</parameter>
 	      to always be NIL, since the present behavior is inconsistent.
 	    </para>
@@ -1544,5 +1544,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>process</term>
+	        <term><parameter>process</parameter></term>
 	        <listitem>
 		      <para>a lisp process (thread).</para>
@@ -1550,5 +1550,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>kill-option</term>
+	        <term><parameter>kill-option</parameter></term>
 	        <listitem>
 		      <para>an internal argument, must be nil.</para>
@@ -1556,5 +1556,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>undefined.</para>
@@ -1567,5 +1567,5 @@
 	    <title>Description</title>
 
-	    <para>Causes <varname>process</varname> to cleanly exit
+	    <para>Causes <parameter>process</parameter> to cleanly exit
 	      from any ongoing computation and enter a state where it can be
 	      <xref linkend="f_process-preset"/>. This
@@ -1574,5 +1574,5 @@
 	      attempting to handle conditions of this type.</para>
 
-            <para>The <varname>kill-option</varname> argument is for internal
+            <para>The <parameter>kill-option</parameter> argument is for internal
             use only and should not be specified by user code</para>
 
@@ -1580,5 +1580,5 @@
 
 	    <para>There is in general no way to know precisely when
-	      <varname>process</varname>
+	      <parameter>process</parameter>
 	      has completed the act of resetting or killing itself; a process
 	      which has either entered the limbo of the reset state or exited
@@ -1628,5 +1628,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>process</term>
+	        <term><parameter>process</parameter></term>
 	        <listitem>
 		      <para>a lisp process (thread), which
@@ -1635,5 +1635,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>undefined.</para>
@@ -1684,5 +1684,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>process</term>
+	        <term><parameter>process</parameter></term>
 	        <listitem>
 		      <para>a lisp process (thread).</para>
@@ -1690,5 +1690,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>undefined.</para>
@@ -1702,5 +1702,5 @@
 
 	    <para>
-	      Causes <varname>process</varname> to cleanly exit
+	      Causes <parameter>process</parameter> to cleanly exit
 	      from any ongoing computation, and then exit.
 	    </para>
@@ -1741,5 +1741,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>process</term>
+	        <term><parameter>process</parameter></term>
 	        <listitem>
 		      <para>a lisp process (thread).</para>
@@ -1747,5 +1747,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>condition</term>
+	        <term><parameter>condition</parameter></term>
 	        <listitem>
 		      <para>a lisp condition.  The default is NIL.</para>
@@ -1759,14 +1759,14 @@
 
 	    <para>Entirely equivalent to calling
-	      (<xref linkend="f_process-interrupt"/> <varname>process</varname>
+	      (<xref linkend="f_process-interrupt"/> <parameter>process</parameter>
 	      (<function>lambda</function> ()
-	      (<function>abort</function> <varname>condition</varname>))).
-	      Causes <varname>process</varname> to transfer control to the
+	      (<function>abort</function> <parameter>condition</parameter>))).
+	      Causes <parameter>process</parameter> to transfer control to the
 	      applicable handler or restart for <function>abort</function>.</para>
 
-	    <para>If <varname>condition</varname> is non-NIL,
+	    <para>If <parameter>condition</parameter> is non-NIL,
 	      <function>process-abort</function> does not consider any
 	      handlers which are explicitly bound to conditions other than
-	      <varname>condition</varname>.</para>
+	      <parameter>condition</parameter>.</para>
 	  </refsect1>
 
@@ -1848,5 +1848,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>process</term>
+	        <term><parameter>process</parameter></term>
 	        <listitem>
 		      <para>a lisp process (thread).</para>
@@ -1854,8 +1854,8 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>whostate</term>
+	        <term><parameter>whostate</parameter></term>
 	        <listitem>
 		      <para>a string which describes the "state" of
-		        <varname>process</varname>.</para>
+		        <parameter>process</parameter>.</para>
 	        </listitem>
 	      </varlistentry>
@@ -1863,6 +1863,6 @@
 
 	    <para>This information is primarily for the benefit of
-	      debugging tools.  <varname>whostate</varname> is a terse report
-	      on what <varname>process</varname> is doing, or not doing,
+	      debugging tools.  <parameter>whostate</parameter> is a terse report
+	      on what <parameter>process</parameter> is doing, or not doing,
 	      and why.</para>
 
@@ -1871,5 +1871,5 @@
 	      <xref linkend="f_process-wait-with-timeout"/>, its
 	      <function>process-whostate</function> will be the value
-	      which was passed to that function as <varname>whostate</varname>.
+	      which was passed to that function as <parameter>whostate</parameter>.
 	    </para>
 	  </refsect1>
@@ -1964,5 +1964,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>whostate</term>
+	        <term><parameter>whostate</parameter></term>
 
 	        <listitem>
@@ -1973,5 +1973,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>function</term>
+	        <term><parameter>function</parameter></term>
 	        <listitem>
 		      <para>a function, designated by itself or by a symbol
@@ -1981,12 +1981,12 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>args</term>
+	        <term><parameter>args</parameter></term>
 	        <listitem>
 		      <para>a list of values, appropriate as arguments to
-		        <varname>function</varname>.</para>
-	        </listitem>
-	      </varlistentry>
-	      <varlistentry>
-	        <term>result</term>
+		        <parameter>function</parameter>.</para>
+	        </listitem>
+	      </varlistentry>
+	      <varlistentry>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>NIL.</para>
@@ -2000,6 +2000,6 @@
 
 	    <para>Causes the current lisp process (thread) to repeatedly
-	      apply <varname>function</varname> to
-	      <varname>args</varname> until the call returns a true result, then
+	      apply <parameter>function</parameter> to
+	      <parameter>args</parameter> until the call returns a true result, then
 	      returns NIL. After
 	      each failed call, yields the CPU as if by
@@ -2053,5 +2053,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>whostate</term>
+	        <term><parameter>whostate</parameter></term>
 	        <listitem>
 		      <para>a string, which will be the value of
@@ -2061,5 +2061,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>ticks</term>
+	        <term><parameter>ticks</parameter></term>
 	        <listitem>
 		      <para>either a positive integer expressing a duration
@@ -2069,5 +2069,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>function</term>
+	        <term><parameter>function</parameter></term>
 	        <listitem>
 		      <para>a function, designated by itself or by a symbol
@@ -2076,17 +2076,17 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>args</term>
+	        <term><parameter>args</parameter></term>
 	        <listitem>
 		      <para>a list of values, appropriate as arguments to
-		        <varname>function</varname>.</para>
-	        </listitem>
-	      </varlistentry>
-	      <varlistentry>
-	        <term>result</term>
+		        <parameter>function</parameter>.</para>
+	        </listitem>
+	      </varlistentry>
+	      <varlistentry>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>T if <function>process-wait-with-timeout</function>
-		        returned because its <varname>function</varname> returned
+		        returned because its <parameter>function</parameter> returned
 		        true, or NIL if it returned because the duration
-		        <varname>ticks</varname> has been exceeded.</para>
+		        <parameter>ticks</parameter> has been exceeded.</para>
 	        </listitem>
 	      </varlistentry>
@@ -2097,11 +2097,11 @@
 	    <title>Description</title>
 
-	    <para>If <varname>ticks</varname> is NIL, behaves exactly like
+	    <para>If <parameter>ticks</parameter> is NIL, behaves exactly like
 	      <xref linkend="f_process-wait"/>, except for returning T.
-	      Otherwise, <varname>function</varname> will be tested repeatedly,
+	      Otherwise, <parameter>function</parameter> will be tested repeatedly,
 	      in the same
 	      kind of test/yield loop as in <xref linkend="f_process-wait"/>
-	      until either <varname>function</varname> returns true,
-	      or the duration <varname>ticks</varname> has been exceeded.
+	      until either <parameter>function</parameter> returns true,
+	      or the duration <parameter>ticks</parameter> has been exceeded.
 	    </para>
 
@@ -2152,5 +2152,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>body</term>
+	        <term><parameter>body</parameter></term>
 	        <listitem>
 		      <para>an implicit progn.</para>
@@ -2158,8 +2158,8 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>the primary value returned by
-		        <varname>body</varname>.</para>
+		        <parameter>body</parameter>.</para>
 	        </listitem>
 	      </varlistentry>
@@ -2170,5 +2170,5 @@
 	    <title>Description</title>
 
-	    <para>Executes <varname>body</varname>
+	    <para>Executes <parameter>body</parameter>
 	      in an environment in which <xref linkend="f_process-interrupt"/>
 	      requests are
@@ -2214,5 +2214,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>body</term>
+	        <term><parameter>body</parameter></term>
 	        <listitem>
 		      <para>an implicit progn.</para>
@@ -2220,8 +2220,8 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>the primary value returned by
-		        <varname>body</varname>.</para>
+		        <parameter>body</parameter>.</para>
 	        </listitem>
 	      </varlistentry>
@@ -2232,5 +2232,5 @@
 	    <title>Description</title>
 
-	    <para>Executes <varname>body</varname>
+	    <para>Executes <parameter>body</parameter>
 	      in an environment in which <xref linkend="f_process-interrupt"/>
 	      requests have immediate effect.
@@ -2261,15 +2261,15 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>name</term>
+	        <term><parameter>name</parameter></term>
 	        <listitem>
 		      <para>any lisp object; saved as part of
-		        <varname>lock</varname>.  Typically a string or symbol
+		        <parameter>lock</parameter>.  Typically a string or symbol
 		        which may appear in the <xref linkend="f_process-whostate"/>s
-		        of threads which are waiting for <varname>lock</varname>.
+		        of threads which are waiting for <parameter>lock</parameter>.
 		      </para>
 	        </listitem>
 	      </varlistentry>
 	      <varlistentry>
-	        <term>lock</term>
+	        <term><parameter>lock</parameter></term>
 	        <listitem>
 		      <para>a newly-allocated object of type CCL:LOCK.</para>
@@ -2284,5 +2284,5 @@
 	    <para>Creates and returns a lock object, which can
 	      be used to synchronize access to some shared resource.
-	      <varname>lock</varname> is
+	      <parameter>lock</parameter> is
 	      initially in a &#34;free&#34; state; a lock can also be
 	      &#34;owned&#34; by a
@@ -2329,5 +2329,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>lock</term>
+	        <term><parameter>lock</parameter></term>
 	        <listitem>
 		      <para>an object of type CCL:LOCK.</para>
@@ -2335,5 +2335,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>body</term>
+	        <term><parameter>body</parameter></term>
 	        <listitem>
 		      <para>an implicit progn.</para>
@@ -2341,8 +2341,8 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>the primary value returned by
-		        <varname>body</varname>.</para>
+		        <parameter>body</parameter>.</para>
 	        </listitem>
 	      </varlistentry>
@@ -2353,10 +2353,10 @@
 	    <title>Description</title>
 
-	    <para>Waits until <varname>lock</varname> is either free or
+	    <para>Waits until <parameter>lock</parameter> is either free or
 	      owned by the calling
-	      thread, then executes <varname>body</varname> with the
-	      lock owned by the calling thread. If <varname>lock</varname>
+	      thread, then executes <parameter>body</parameter> with the
+	      lock owned by the calling thread. If <parameter>lock</parameter>
 	      was free when <function>with-lock-grabbed</function> was called,
-	      it is restored to a free state after <varname>body</varname>
+	      it is restored to a free state after <parameter>body</parameter>
 	      is executed.</para>
 	  </refsect1>
@@ -2400,5 +2400,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>lock</term>
+	        <term><parameter>lock</parameter></term>
 	        <listitem>
 		      <para>an object of type CCL:LOCK.</para>
@@ -2411,5 +2411,5 @@
 	    <title>Description</title>
 
-	    <para>Blocks until <varname>lock</varname> is owned by the
+	    <para>Blocks until <parameter>lock</parameter> is owned by the
 	      calling thread.</para>
 
@@ -2458,5 +2458,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>lock</term>
+	        <term><parameter>lock</parameter></term>
 	        <listitem>
 		      <para>an object of type CCL:LOCK.</para>
@@ -2470,11 +2470,11 @@
 
 	    <para>Signals an error of type CCL:LOCK-NOT-OWNER if
-	      <varname>lock</varname>
+	      <parameter>lock</parameter>
 	      is not already owned by the calling thread; otherwise, undoes the
 	      effect of one previous 
 	      <xref linkend="f_grab-lock"/>.  If this means that
 	      <function>release-lock</function> has now been called on
-	      <varname>lock</varname> the same number of times as
-	      <xref linkend="f_grab-lock"/> has, <varname>lock</varname>
+	      <parameter>lock</parameter> the same number of times as
+	      <xref linkend="f_grab-lock"/> has, <parameter>lock</parameter>
 	      becomes free.</para>
 	  </refsect1>
@@ -2518,5 +2518,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>lock</term>
+	        <term><parameter>lock</parameter></term>
 	        <listitem>
 		      <para>an object of type CCL:LOCK.</para>
@@ -2524,7 +2524,7 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
-	        <listitem>
-		      <para>T if <varname>lock</varname> has been obtained,
+	        <term><parameter>result</parameter></term>
+	        <listitem>
+		      <para>T if <parameter>lock</parameter> has been obtained,
 		        or NIL if it has not.</para>
 	        </listitem>
@@ -2536,7 +2536,7 @@
 	    <title>Description</title>
 
-	    <para>Tests whether <varname>lock</varname>
+	    <para>Tests whether <parameter>lock</parameter>
 	      can be obtained without blocking - that is, either
-	      <varname>lock</varname> is already free, or it is already owned
+	      <parameter>lock</parameter> is already free, or it is already owned
 	      by <xref linkend="v_current-process"/>.  If it can,
 	      causes it to
@@ -2586,5 +2586,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>read-write-lock</term>
+	        <term><parameter>read-write-lock</parameter></term>
 	        <listitem>
 		      <para>a newly-allocated object of type
@@ -2603,5 +2603,5 @@
 	      belong to at most one process which acts as a "writer".  A
 	      read-write lock may never be held by a reader at the same time as
-	      a writer.  Initially, <varname>read-write-lock</varname> has
+	      a writer.  Initially, <parameter>read-write-lock</parameter> has
 	      no readers and no writers.</para>
 	  </refsect1>
@@ -2653,5 +2653,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>read-write-lock</term>
+	        <term><parameter>read-write-lock</parameter></term>
 	        <listitem>
 		      <para>an object of type
@@ -2660,5 +2660,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>body</term>
+	        <term><parameter>body</parameter></term>
 	        <listitem>
 		      <para>an implicit progn.</para>
@@ -2666,8 +2666,8 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>the primary value returned by
-		        <varname>body</varname>.</para>
+		        <parameter>body</parameter>.</para>
 	        </listitem>
 	      </varlistentry>
@@ -2678,13 +2678,13 @@
 	    <title>Description</title>
 
-	    <para>Waits until <varname>read-write-lock</varname> has no
+	    <para>Waits until <parameter>read-write-lock</parameter> has no
 	      writer,
 	      ensures that <xref linkend="v_current-process"/> is a
-	      reader of it, then executes <varname>body</varname>.
+	      reader of it, then executes <parameter>body</parameter>.
 	    </para>
 
-	    <para>After executing <varname>body</varname>, if
+	    <para>After executing <parameter>body</parameter>, if
 	      <xref linkend="v_current-process"/> was not a reader of
-	      <varname>read-write-lock</varname> before
+	      <parameter>read-write-lock</parameter> before
 	      <function>with-read-lock</function> was called, the lock is
 	      released.  If it was already a reader, it remains one.</para>
@@ -2728,5 +2728,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>read-write-lock</term>
+	        <term><parameter>read-write-lock</parameter></term>
 	        <listitem>
 		      <para>an object of type
@@ -2735,5 +2735,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>body</term>
+	        <term><parameter>body</parameter></term>
 	        <listitem>
 		      <para>an implicit progn.</para>
@@ -2741,8 +2741,8 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>the primary value returned by
-		        <varname>body</varname>.</para>
+		        <parameter>body</parameter>.</para>
 	        </listitem>
 	      </varlistentry>
@@ -2753,13 +2753,13 @@
 	    <title>Description</title>
 
-	    <para>Waits until <varname>read-write-lock</varname> has no
+	    <para>Waits until <parameter>read-write-lock</parameter> has no
 	      readers and no writer other than <xref linkend="v_current-process"/>,
 	      then ensures that <xref linkend="v_current-process"/> is the
-	      writer of it.  With the lock held, executes <varname>body</varname>.
+	      writer of it.  With the lock held, executes <parameter>body</parameter>.
 	    </para>
 
-	    <para>After executing <varname>body</varname>, if
+	    <para>After executing <parameter>body</parameter>, if
 	      <xref linkend="v_current-process"/> was not the writer of
-	      <varname>read-write-lock</varname> before
+	      <parameter>read-write-lock</parameter> before
 	      <function>with-write-lock</function> was called, the lock is
 	      released.  If it was already the writer, it remains the
@@ -2804,5 +2804,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>semaphore</term>
+	        <term><parameter>semaphore</parameter></term>
 	        <listitem>
 		      <para>a newly-allocated object of type CCL:SEMAPHORE.</para>
@@ -2819,5 +2819,5 @@
 	      and decremented atomically; incrementing it represents sending
 	      a signal, and decrementing it represents handling that signal.
-	      <varname>semaphore</varname> has an initial count of 0.</para>
+	      <parameter>semaphore</parameter> has an initial count of 0.</para>
 	  </refsect1>
 
@@ -2860,5 +2860,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>semaphore</term>
+	        <term><parameter>semaphore</parameter></term>
 	        <listitem>
 		      <para>an object of type CCL:SEMAPHORE.</para>
@@ -2866,5 +2866,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>an integer representing an error identifier
@@ -2878,5 +2878,5 @@
 	    <title>Description</title>
 
-	    <para>Atomically increments <varname>semaphore</varname>'s
+	    <para>Atomically increments <parameter>semaphore</parameter>'s
 	      "count" by 1; this
 	      may enable a waiting thread to resume execution.</para>
@@ -2901,5 +2901,5 @@
 	    <title>Notes</title>
 
-	    <para><varname>result</varname> should probably be interpreted
+	    <para><parameter>result</parameter> should probably be interpreted
 	      and acted on by <function>signal-semaphore</function>, because
 	      it is not likely to be meaningful to a lisp program, and the
@@ -2930,5 +2930,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>semaphore</term>
+	        <term><parameter>semaphore</parameter></term>
 	        <listitem>
 		      <para>an object of type CCL:SEMAPHORE.</para>
@@ -2936,5 +2936,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>an integer representing an error identifier
@@ -2948,5 +2948,5 @@
 	    <title>Description</title>
 
-	    <para>Waits until <varname>semaphore</varname>
+	    <para>Waits until <parameter>semaphore</parameter>
 	      has a positive count that can be
 	      atomically decremented; this will succeed exactly once for each
@@ -2972,5 +2972,5 @@
 	    <title>Notes</title>
 
-	    <para><varname>result</varname> should probably be interpreted
+	    <para><parameter>result</parameter> should probably be interpreted
 	      and acted on by <function>wait-on-semaphore</function>, because
 	      it is not likely to be meaningful to a lisp program, and the
@@ -3002,5 +3002,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>semaphore</term>
+	        <term><parameter>semaphore</parameter></term>
 	        <listitem>
 		      <para>An object of type CCL:SEMAPHORE.</para>
@@ -3008,5 +3008,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>timeout</term>
+	        <term><parameter>timeout</parameter></term>
 	        <listitem>
 		      <para>a time interval in seconds.  May be any
@@ -3016,10 +3016,10 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>T if <function>timed-wait-on-semaphore</function>
 		        returned because it was able to decrement the count of
-		        <varname>semaphore</varname>; NIL if it returned because
-		        the duration <varname>timeout</varname> has been
+		        <parameter>semaphore</parameter>; NIL if it returned because
+		        the duration <parameter>timeout</parameter> has been
 		        exceeded.</para>
 	        </listitem>
@@ -3031,8 +3031,8 @@
 	    <title>Description</title>
 
-	    <para>Waits until <varname>semaphore</varname>
+	    <para>Waits until <parameter>semaphore</parameter>
 	      has a positive count that can be
 	      atomically decremented, or until the duration
-	      <varname>timeout</varname> has
+	      <parameter>timeout</parameter> has
 	      elapsed.</para>
 	  </refsect1>
@@ -3075,5 +3075,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>fd</term>
+	        <term><parameter>fd</parameter></term>
 	        <listitem>
 		      <para>a file descriptor, which is a non-negative integer
@@ -3083,5 +3083,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>timeout</term>
+	        <term><parameter>timeout</parameter></term>
 	        <listitem>
 		      <para>either NIL or a time interval in milliseconds.  Must be a non-negative integer.  The default is NIL.</para>
@@ -3094,5 +3094,5 @@
 	    <title>Description</title>
 
-	    <para>Wait until input is available on <varname>fd</varname>.
+	    <para>Wait until input is available on <parameter>fd</parameter>.
 	      This uses the <function>select()</function> system call, and is
 	      generally a fairly
@@ -3100,5 +3100,5 @@
 	      accurately, <function>process-input-wait</function>
 	      waits until it&#39;s possible to read
-	      from fd without blocking, or until <varname>timeout</varname>, if
+	      from fd without blocking, or until <parameter>timeout</parameter>, if
 	      it is not NIL, has been exceeded.</para>
 
@@ -3155,5 +3155,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>fd</term>
+	        <term><parameter>fd</parameter></term>
 	        <listitem>
 		      <para>a file descriptor, which is a non-negative integer
@@ -3163,5 +3163,5 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>timeout</term>
+	        <term><parameter>timeout</parameter></term>
 	        <listitem>
 		      <para>either NIL or a time interval in milliseconds.  Must be a non-negative integer.  The default is NIL.</para>
@@ -3174,5 +3174,5 @@
 	    <title>Description</title>
 
-	    <para>Wait until output is possible on <varname>fd</varname> or until <varname>timeout</varname>, if
+	    <para>Wait until output is possible on <parameter>fd</parameter> or until <parameter>timeout</parameter>, if
 	      it is not NIL, has been exceeded.
 	      This uses the <function>select()</function> system call, and is
@@ -3232,5 +3232,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>body</term>
+	        <term><parameter>body</parameter></term>
 	        <listitem>
 		      <para>an implicit progn.</para>
@@ -3238,8 +3238,8 @@
 	      </varlistentry>
 	      <varlistentry>
-	        <term>result</term>
+	        <term><parameter>result</parameter></term>
 	        <listitem>
 		      <para>the primary value returned by
-		        <varname>body</varname>.</para>
+		        <parameter>body</parameter>.</para>
 	        </listitem>
 	      </varlistentry>
@@ -3252,5 +3252,5 @@
 	    <para>Requests exclusive read access to the standard terminal
 	      stream, <varname>*terminal-io*</varname>.  Executes
-	      <varname>body</varname> in an environment with that access.
+	      <parameter>body</parameter> in an environment with that access.
 	    </para>
 	  </refsect1>
@@ -3345,5 +3345,5 @@
 	    <variablelist>
 	      <varlistentry>
-	        <term>p</term>
+	        <term><parameter>p</parameter></term>
 	        <listitem>
 		      <para>a lisp process (thread), designated either by
@@ -3365,5 +3365,5 @@
 
 	    <para>The command yields control of terminal input to the
-	      process <varname>p</varname>, which must have used
+	      process <parameter>p</parameter>, which must have used
 	      <xref linkend="m_with-terminal-input"/> to request access to the
 	      terminal input stream.</para>
@@ -3409,5 +3409,5 @@
 	<variablelist>
 	  <varlistentry>
-	    <term>process</term>
+	    <term><parameter>process</parameter></term>
 	    <listitem>
 	      <para>a process, typically created by <xref
@@ -3417,5 +3417,5 @@
 	  </varlistentry>
 	  <varlistentry>
-	    <term>default</term>
+	    <term><parameter>default</parameter></term>
 	    <listitem>
 	      <para>A default value to be returned if the specified
@@ -3424,5 +3424,5 @@
 	  </varlistentry>
 	  <varlistentry>
-	    <term>values</term>
+	    <term><parameter>values</parameter></term>
 	    <listitem>
 	      <para>The values returned by the specified process's
Index: /trunk/source/doc/src/using.xml
===================================================================
--- /trunk/source/doc/src/using.xml	(revision 16295)
+++ /trunk/source/doc/src/using.xml	(revision 16296)
@@ -32,18 +32,19 @@
     <para>
       &CCL;'s tracing facility is invoked by an extended version of the Common Lisp
-      <varname>trace</varname> macro.  Extensions allow tracing of methods, as well as finer control
+      <code>trace</code> macro.  Extensions allow tracing of methods, as well as finer control
       over tracing actions.
     </para>
 
-    <para>
-      <indexterm zone="trace"/>
-      <command><varname id="trace">TRACE</varname> {<replaceable>keyword</replaceable>
-        <replaceable>global-value</replaceable>}* {<replaceable>spec</replaceable> |
-        (<replaceable>spec</replaceable> {<replaceable>keyword</replaceable>
-        <replaceable>local-value</replaceable>}*)}* [Macro]</command>
-    </para>
-
-    <para>
-      The <varname>trace</varname> macro encapsulates the functions named by
+      <refentry id="m_trace"><indexterm zone="m_trace"><primary>trace</primary></indexterm>
+        <refnamediv><refname>TRACE</refname><refpurpose></refpurpose><refclass>Macro</refclass></refnamediv>
+        <refsynopsisdiv><synopsis><function>TRACE</function> {<replaceable>keyword </replaceable> 
+         <replaceable>global-value</replaceable>}* {<replaceable>spec</replaceable> |
+        (<replaceable>spec</replaceable> {<replaceable>keyword </replaceable>
+        <replaceable>local-value</replaceable>}*)}*</synopsis></refsynopsisdiv>
+   <refsect1>
+    <title>Description</title>
+
+    <para>
+      The <code>trace</code> macro encapsulates the functions named by
       <replaceable>spec</replaceable>s, causing trace actions to take place on entry and
       exit from each function.  The default actions print a message on function entry and
@@ -53,14 +54,14 @@
 
     <para>
-      Invoking <varname>(trace)</varname> without arguments returns a list of functions being traced.
+      Invoking <code>(trace)</code> without arguments returns a list of functions being traced.
     </para>
     
     <para>
       A <replaceable>spec</replaceable> is either a symbol that is the name of a function, or an
-      expression of the form <varname>(setf <replaceable>symbol</replaceable>)</varname>, or a
-      specific method of a generic function in the form <varname>(:method
+      expression of the form <code>(setf <replaceable>symbol</replaceable>)</code>, or a
+      specific method of a generic function in the form <code>(:method
         <replaceable>gf-name</replaceable> {<replaceable>qualifier</replaceable>}*
-        ({<replaceable>specializer</replaceable>}*))</varname>, where a
-      <replaceable>specializer</replaceable> can be the name of a class or an <varname>EQL</varname>
+        ({<replaceable>specializer</replaceable>}*))</code>, where a
+      <replaceable>specializer</replaceable> can be the name of a class or an <code>EQL</code>
       specializer.
     </para>
@@ -68,5 +69,5 @@
     <para>
       A <replaceable>spec</replaceable> can also be a string naming a package, or equivalently a
-      list <varname>(:package <replaceable>package-name</replaceable>)</varname>, in order to
+      list <code>(:package <replaceable>package-name</replaceable>)</code>, in order to
       request that all functions in the package to be traced.
     </para>
@@ -85,5 +86,5 @@
 
       <varlistentry>
-	    <term><varname>:methods {T | nil}</varname></term>
+	    <term><code>:methods {T | nil}</code></term>
 	    <listitem>
 	      <para> If true, and if applied to a <replaceable>spec</replaceable> naming a generic
@@ -95,6 +96,6 @@
 
       <varlistentry>
-	    <term><varname>:inside <replaceable>outside-spec</replaceable>
-	        | ({<replaceable>outside-spec</replaceable>}*)</varname></term>
+	    <term><code>:inside <replaceable>outside-spec</replaceable>
+	        | ({<replaceable>outside-spec</replaceable>}*)</code></term>
 	    <listitem>
 	      <para>Inhibits all trace actions unless the current
@@ -109,12 +110,12 @@
 
       <varlistentry>
-	    <term><varname>:if <replaceable>form</replaceable></varname></term>
-	    <term><varname>:condition <replaceable>form</replaceable></varname></term>
+	    <term><code>:if <replaceable>form</replaceable></code></term>
+	    <term><code>:condition <replaceable>form</replaceable></code></term>
 	    <listitem>
 	      <para> Evaluates <replaceable>form</replaceable> whenever the function being traced is
 	        about to be entered, and inhibits all trace actions if <replaceable>form</replaceable>
-	        returns nil. The form may reference the lexical variable <varname>ccl::args</varname>,
-	        which is a list of the arguments in this call. <varname>:condition</varname> is just a
-	        synonym for <varname>:if</varname>, though if both are specified, both must return non-nil.
+	        returns nil. The form may reference the lexical variable <code>ccl::args</code>,
+	        which is a list of the arguments in this call. <code>:condition</code> is just a
+	        synonym for <code>:if</code>, though if both are specified, both must return non-nil.
 	      </para>
 	    </listitem>
@@ -122,11 +123,11 @@
 
       <varlistentry>
-	    <term><varname>:before-if <replaceable>form</replaceable></varname></term>
+	    <term><code>:before-if <replaceable>form</replaceable></code></term>
 	    <listitem>
 	      <para> Evaluates <replaceable>form</replaceable> whenever the function being traced is
 	        about to be entered, and inhibits the entry trace actions if
 	        <replaceable>form</replaceable> returns nil.  The form may reference the lexical variable
-	        <varname>ccl::args</varname>, which is a list of the arguments in this call. If both
-	        <varname>:if</varname> and <varname>:before-if</varname> are specified, both must return
+	        <code>ccl::args</code>, which is a list of the arguments in this call. If both
+	        <code>:if</code> and <code>:before-if</code> are specified, both must return
 	        non-nil in order for the before entry actions to happen.
 	      </para>
@@ -135,11 +136,11 @@
 
       <varlistentry>
-	    <term><varname>:after-if <replaceable>form</replaceable></varname></term>
+	    <term><code>:after-if <replaceable>form</replaceable></code></term>
 	    <listitem>
 	      <para> Evaluates <replaceable>form</replaceable> whenever the function being traced has
 	        just exited, and inhibits the exit trace actions if <replaceable>form</replaceable>
-	        returns nil.  The form may reference the lexical variable <varname>ccl::vals</varname>,
-	        which is a list of values returned by this call. If both <varname>:if</varname> and
-	        <varname>:after-if</varname> are specified, both must return non-nil in order for the
+	        returns nil.  The form may reference the lexical variable <code>ccl::vals</code>,
+	        which is a list of values returned by this call. If both <code>:if</code> and
+	        <code>:after-if</code> are specified, both must return non-nil in order for the
 	        after exit actions to happen.
 	      </para>
@@ -148,11 +149,11 @@
 
       <varlistentry>
-	    <term><varname>:print-before <replaceable>form</replaceable></varname></term>
+	    <term><code>:print-before <replaceable>form</replaceable></code></term>
 	    <listitem>
 	      <para> Evaluates <replaceable>form</replaceable> whenever the function being traced is
 	        about to be entered, and prints the result before printing the standard entry message.
-	        The form may reference the lexical variable <varname>ccl::args</varname>, which is a list
-	        of the arguments in this call.  To see multiple forms, use <varname>values</varname>:
-	        <varname>:print-before (values (one-thing) (another-thing))</varname>.
+	        The form may reference the lexical variable <code>ccl::args</code>, which is a list
+	        of the arguments in this call.  To see multiple forms, use <code>values</code>:
+	        <code>:print-before (values (one-thing) (another-thing))</code>.
 	      </para>
 	    </listitem>
@@ -160,11 +161,11 @@
 
       <varlistentry>
-	    <term><varname>:print-after <replaceable>form</replaceable></varname></term>
+	    <term><code>:print-after <replaceable>form</replaceable></code></term>
 	    <listitem>
 	      <para> Evaluates <replaceable>form</replaceable> whenever the function being traced has
 	        just exited, and prints the result after printing the standard exit message.  The form may
-	        reference the lexical variable <varname>ccl::vals</varname>, which is a list of values
-	        returned by this call. To see multiple forms, use <varname>values</varname>:
-	        <varname>:print-after (values (one-thing) (another-thing))</varname>.
+	        reference the lexical variable <code>ccl::vals</code>, which is a list of values
+	        returned by this call. To see multiple forms, use <code>values</code>:
+	        <code>:print-after (values (one-thing) (another-thing))</code>.
 	      </para>
 	    </listitem>
@@ -172,7 +173,7 @@
 
       <varlistentry>
-	    <term><varname>:print <replaceable>form</replaceable></varname></term>
+	    <term><code>:print <replaceable>form</replaceable></code></term>
 	    <listitem>
-	      <para>Equivalent to <varname>:print-before <replaceable>form</replaceable> :print-after <replaceable>form</replaceable></varname>.
+	      <para>Equivalent to <code>:print-before <replaceable>form</replaceable> :print-after <replaceable>form</replaceable></code>.
 	      </para>
 	    </listitem>
@@ -180,9 +181,9 @@
 
       <varlistentry>
-	    <term><varname>:eval-before <replaceable>form</replaceable></varname></term>
+	    <term><code>:eval-before <replaceable>form</replaceable></code></term>
 	    <listitem>
 	      <para>Evaluates <replaceable>form</replaceable> whenever the function being traced is
 	        about to be entered.  The form may reference the lexical variable
-	        <varname>ccl::args</varname>, which is a list of the arguments in this call.
+	        <code>ccl::args</code>, which is a list of the arguments in this call.
 	      </para>
 	    </listitem>
@@ -190,8 +191,8 @@
 
       <varlistentry>
-	    <term><varname>:eval-after <replaceable>form</replaceable></varname></term>
+	    <term><code>:eval-after <replaceable>form</replaceable></code></term>
 	    <listitem>
 	      <para>Evaluates <replaceable>form</replaceable> whenever the function being has just
-	        exited.  The form may reference the lexical variable <varname>ccl::vals</varname>, which
+	        exited.  The form may reference the lexical variable <code>ccl::vals</code>, which
 	        is a list of values returned by this call.
 	      </para>
@@ -200,8 +201,8 @@
 
       <varlistentry>
-	    <term><varname>:eval <replaceable>form</replaceable></varname></term>
+	    <term><code>:eval <replaceable>form</replaceable></code></term>
 	    <listitem>
-	      <para>Equivalent to <varname>:eval-before <replaceable>form</replaceable>
-	          :eval-after <replaceable>form</replaceable></varname>.
+	      <para>Equivalent to <code>:eval-before <replaceable>form</replaceable>
+	          :eval-after <replaceable>form</replaceable></code>.
 	      </para>
 	    </listitem>
@@ -209,9 +210,9 @@
 
       <varlistentry>
-	    <term><varname>:break-before <replaceable>form</replaceable></varname></term>
+	    <term><code>:break-before <replaceable>form</replaceable></code></term>
 	    <listitem>
 	      <para>Evaluates <replaceable>form</replaceable> whenever the function being traced is
 	        about to be entered, and if the result is non-nil, enters a debugger break loop.  The form
-	        may reference the lexical variable <varname>ccl::args</varname>, which is a list of the
+	        may reference the lexical variable <code>ccl::args</code>, which is a list of the
 	        arguments in this call.
 	      </para>
@@ -220,9 +221,9 @@
 
       <varlistentry>
-	    <term><varname>:break-after <replaceable>form</replaceable></varname></term>
+	    <term><code>:break-after <replaceable>form</replaceable></code></term>
 	    <listitem>
 	      <para>Evaluates <replaceable>form</replaceable> whenever the function being traced has
 	        just exited, and if the result is non-nil, enters a debugger break loop. The form may
-	        reference the lexical variable <varname>ccl::vals</varname>, which is a list of values
+	        reference the lexical variable <code>ccl::vals</code>, which is a list of values
 	        returned by this call.
 	      </para>
@@ -231,7 +232,7 @@
 
       <varlistentry>
-	    <term><varname>:break <replaceable>form</replaceable></varname></term>
+	    <term><code>:break <replaceable>form</replaceable></code></term>
 	    <listitem>
-	      <para>Equivalent to <varname>:break-before <replaceable>form</replaceable> :break-after <replaceable>form</replaceable></varname>.
+	      <para>Equivalent to <code>:break-before <replaceable>form</replaceable> :break-after <replaceable>form</replaceable></code>.
 	      </para>
 	    </listitem>
@@ -239,10 +240,10 @@
 
       <varlistentry>
-	    <term><varname>:backtrace-before <replaceable>form</replaceable></varname></term>
-	    <term><varname>:backtrace <replaceable>form</replaceable></varname></term>
+	    <term><code>:backtrace-before <replaceable>form</replaceable></code></term>
+	    <term><code>:backtrace <replaceable>form</replaceable></code></term>
 	    <listitem>
 	      <para>Evaluates <replaceable>form</replaceable> whenever the function being traced is
 	        about to be entered.  The form may reference the lexical variable
-	        <varname>ccl::args</varname>, which is a list of the arguments in this call. The value
+	        <code>ccl::args</code>, which is a list of the arguments in this call. The value
 	        returned by <replaceable>form</replaceable> is intepreted as follows:
 	      </para>
@@ -251,10 +252,10 @@
 
 	        <varlistentry>
-	          <term><varname>nil</varname></term>
+	          <term><code>nil</code></term>
 	          <listitem><para>does nothing</para></listitem>
 	        </varlistentry>
 
 	        <varlistentry>
-	          <term><varname>:detailed</varname></term>
+	          <term><code>:detailed</code></term>
 	          <listitem><para>prints a detailed backtrace to
 	              <varname>*trace-output*</varname>.</para></listitem>
@@ -262,5 +263,5 @@
 
 	        <varlistentry>
-	          <term><varname>(:detailed <replaceable>integer</replaceable>)</varname></term>
+	          <term><code>(:detailed <replaceable>integer</replaceable>)</code></term>
 	          <listitem><para>prints the top <replaceable>integer</replaceable> frames of detailed
 	              backtrace to <varname>*trace-output*</varname>.
@@ -282,6 +283,6 @@
 	      </variablelist>
 	      <para>
-	        Note that unlike with the other options, <varname>:backtrace</varname> is equivalent to
-	        <varname>:backtrace-before</varname> only, not both before and after, since it's usually
+	        Note that unlike with the other options, <code>:backtrace</code> is equivalent to
+	        <code>:backtrace-before</code> only, not both before and after, since it's usually
 	        not helpful to print the same backtrace both before and after the function call.
 	      </para>
@@ -290,8 +291,8 @@
 
       <varlistentry>
-	    <term><varname>:backtrace-after <replaceable>form</replaceable></varname></term>
+	    <term><code>:backtrace-after <replaceable>form</replaceable></code></term>
 	    <listitem>
 	      <para>Evaluates <replaceable>form</replaceable> whenever the function being traced has
-	        just exited.  The form may reference the lexical variable <varname>ccl::vals</varname>,
+	        just exited.  The form may reference the lexical variable <code>ccl::vals</code>,
 	        which is a list of values returned by this call. The value returned by
 	        <replaceable>form</replaceable> is intepreted as follows:
@@ -301,10 +302,10 @@
 
 	        <varlistentry>
-	          <term><varname>nil</varname></term>
+	          <term><code>nil</code></term>
 	          <listitem><para>does nothing</para></listitem>
 	        </varlistentry>
 
 	        <varlistentry>
-	          <term><varname>:detailed</varname></term>
+	          <term><code>:detailed</code></term>
 	          <listitem><para>prints a detailed backtrace to
 	              <varname>*trace-output*</varname>.</para></listitem>
@@ -312,5 +313,5 @@
 
 	        <varlistentry>
-	          <term><varname>(:detailed <replaceable>integer</replaceable>)</varname></term>
+	          <term><code>(:detailed <replaceable>integer</replaceable>)</code></term>
 	          <listitem><para>prints the top <replaceable>integer</replaceable> frames of detailed
 	              backtrace to <varname>*trace-output*</varname>.
@@ -335,5 +336,5 @@
 
       <varlistentry>
-        <term><varname>:before</varname> <replaceable>action</replaceable></term>
+        <term><code>:before</code> <replaceable>action</replaceable></term>
         <listitem>
 	      <para>specifies the action to be taken just before the traced function is entered.  <replaceable>action</replaceable> is one of:</para>
@@ -341,5 +342,5 @@
 	      <variablelist>
 	        <varlistentry>
-	          <term><varname>:print</varname></term>
+	          <term><code>:print</code></term>
 	          <listitem>
 		        <para>The default, prints a short indented message showing the function name and the invocation arguments</para>
@@ -348,14 +349,14 @@
 
 	        <varlistentry>
-	          <term><varname>:break</varname></term>
+	          <term><code>:break</code></term>
 	          <listitem>
-		        <para>Equivalent to <varname>:before :print :break-before t</varname></para>
+		        <para>Equivalent to <code>:before :print :break-before t</code></para>
 	          </listitem>
 	        </varlistentry>
 
 	        <varlistentry>
-	          <term><varname>:backtrace</varname></term>
+	          <term><code>:backtrace</code></term>
 	          <listitem>
-		        <para>Equivalent to <varname>:before :print :backtrace-before t</varname></para>
+		        <para>Equivalent to <code>:before :print :backtrace-before t</code></para>
 	          </listitem>
 	        </varlistentry>
@@ -380,5 +381,5 @@
       <varlistentry>
 
-        <term><varname>:after</varname> <replaceable>action</replaceable></term>
+        <term><code>:after</code> <replaceable>action</replaceable></term>
         <listitem>
 
@@ -387,5 +388,5 @@
 	      <variablelist>
 	        <varlistentry>
-	          <term><varname>:print</varname></term>
+	          <term><code>:print</code></term>
 	          <listitem>
 	            <para>The default, prints a short indented message showing the function name and the
@@ -395,14 +396,14 @@
 
 	        <varlistentry>
-	          <term><varname>:break</varname></term>
+	          <term><code>:break</code></term>
 	          <listitem>
-	            <para>Equivalent to <varname>:after :print :break-after t</varname></para>
+	            <para>Equivalent to <code>:after :print :break-after t</code></para>
 	          </listitem>
 	        </varlistentry>
 
 		    <varlistentry>
-		      <term><varname>:backtrace</varname></term>
+		      <term><code>:backtrace</code></term>
 		      <listitem>
-		        <para>Equivalent to <varname>:after :print :backtrace-after t</varname></para>
+		        <para>Equivalent to <code>:after :print :backtrace-after t</code></para>
 		      </listitem>
 		    </varlistentry>
@@ -426,58 +427,78 @@
 
     </variablelist>
-
-
-    <para>
-      <indexterm zone="trace-level"/>
-      <command><varname id="trace-level">CCL:*TRACE-LEVEL*</varname>    [Variable]</command>
-    </para>
+   </refsect1>
+   </refentry>
+
+    <refentry id="v_trace-level"><indexterm zone="v_trace-level"><primary>*trace-level*</primary></indexterm>
+      <refnamediv><refname>*TRACE-LEVEL*</refname><refpurpose></refpurpose><refclass>Variable</refclass></refnamediv>
+       <refsynopsisdiv><synopsis><varname>CCL:*TRACE-LEVEL*</varname></synopsis></refsynopsisdiv>
+    <refsect1><title>Description</title>
 
     <para>Variable bound to the current nesting level during execution of before and after trace actions.  The default printing actions use it to determine the amount of indentation.</para>
-
-    <para>
-      <indexterm zone="trace-max-indent"/>
-      <command><varname id="trace-max-indent">CCL:*TRACE-MAX-INDENT*</varname>    [Variable]</command>
-    </para>
+   </refsect1>
+   </refentry>
+
+    <refentry id="v_trace-max-indent"><indexterm zone="v_trace-max-indent"><primary>*trace-max-indent*</primary></indexterm>
+      <refnamediv><refname>*TRACE-MAX-INDENT*</refname><refpurpose></refpurpose><refclass>Variable</refclass></refnamediv>
+       <refsynopsisdiv><synopsis><varname id="v_trace-max-ident">CCL:*TRACE-MAX-INDENT*</varname></synopsis></refsynopsisdiv>
+    <refsect1><title>Description</title>
 
     <para>The default before and after print actions will not indent by more than the value of <varname>ccl:*trace-max-indent*</varname> regardless of the current trace level.</para>
-
-    <para>
-      <indexterm zone="trace-function"/>
-      <command><varname id="trace-function">CCL:TRACE-FUNCTION</varname> <replaceable>spec</replaceable> &key; {<replaceable>keyword</replaceable> <replaceable>value</replaceable>}*    [Function]</command>
-    </para>
-    
+   </refsect1>
+   </refentry>
+
+
+    <refentry id="f_trace-function"><indexterm zone="f_trace-function"><primary>trace-function</primary></indexterm>
+      <refnamediv><refname>TRACE-FUNCTION</refname><refpurpose></refpurpose><refclass>Function</refclass></refnamediv>
+       <refsynopsisdiv><synopsis><function>CCL:TRACE-FUNCTION</function> <replaceable>spec</replaceable> &key; {<replaceable>keyword</replaceable> <replaceable>value</replaceable>}*</synopsis></refsynopsisdiv>
+    <refsect1><title>Description</title>
+
     <para>
       This is a functional version of the TRACE macro.  <replaceable>spec</replaceable> and
       <replaceable>keyword</replaceable>s are as for TRACE, except that all arguments are evaluated.
     </para>
-
-    <para>
-      <indexterm zone="trace-print-level"/>
-      <command><varname id="trace-print-level">CCL:*TRACE-PRINT-LEVEL*</varname>   [Variable]</command>
-    </para>
+   </refsect1>
+   </refentry>
+
+
+    <refentry id="v_trace-print-level"><indexterm zone="v_trace-print-level"><primary>*trace-print-level*</primary></indexterm>
+      <refnamediv><refname>*TRACE-PRINT-LEVEL*</refname><refpurpose></refpurpose><refclass>Variable</refclass></refnamediv>
+       <refsynopsisdiv><synopsis><varname>CCL:*TRACE-PRINT-LEVEL*</varname></synopsis></refsynopsisdiv>
+    <refsect1><title>Description</title>
 
     <para>The default print actions bind <varname>CL:*PRINT-LEVEL*</varname> to this value while
       printing. Note that this rebinding is only in effect during the default entry and exit messages.
-      It does not apply to printing of <varname>:print-before/:print-after</varname> forms or any
+      It does not apply to printing of <code>:print-before/:print-after</code> forms or any
       explicit printing done by user code.</para>
 
-    <para>
-      <indexterm zone="trace-print-length"/>
-      <command><varname id="trace-print-length">CCL:*TRACE-PRINT-LENGTH*</varname>    [Variable]</command>
-    </para>
+   </refsect1>
+   </refentry>
+
+
+    <refentry id="v_trace-print-length"><indexterm zone="v_trace-print-length"><primary>*trace-print-length*</primary></indexterm>
+      <refnamediv><refname>*TRACE-PRINT-LENGTH*</refname><refpurpose></refpurpose><refclass>Variable</refclass></refnamediv>
+       <refsynopsisdiv><synopsis><varname>CCL:*TRACE-PRINT-LENGTH*</varname></synopsis></refsynopsisdiv>
+    <refsect1><title>Description</title>
     
     <para>The default print actions bind <varname>CL:*PRINT-LENGTH*</varname> to this value while
       printing. Note that this rebinding is only in effect during the default entry and exit messages.
-      It does not apply to printing of <varname>:print-before/:print-after</varname> forms or any
+      It does not apply to printing of <code>:print-before/:print-after</code> forms or any
       explicit printing done by user code.</para>
 
-    <para>
-      <indexterm zone="trace-bar-frequency"/>
-      <command><varname id="trace-bar-frequency">CCL:*TRACE-BAR-FREQUENCY*</varname>    [Variable]</command>
-    </para>
+   </refsect1>
+   </refentry>
+
+    <refentry id="v_trace-bar-frequency"><indexterm zone="v_trace-bar-frequency"><primary>*trace-bar-frequency*</primary></indexterm>
+      <refnamediv><refname>*TRACE-BAR-FREQUENCY*</refname><refpurpose></refpurpose><refclass>Variable</refclass></refnamediv>
+       <refsynopsisdiv><synopsis><varname>CCL:*TRACE-BAR-FREQUENCY*</varname></synopsis></refsynopsisdiv>
+    <refsect1><title>Description</title>
 
     <para>By default, this is nil. If non-nil it should be a integer,
     and the default entry and exit messages will print a | instead of
     space every this many levels of indentation.</para>
+
+   </refsect1>
+   </refentry>
+
 
 
@@ -513,6 +534,6 @@
       <refpurpose>
 	Add a piece of advice to the function or method specified by
-	<varname>spec</varname> according to
-	<varname>form</varname>.
+	<parameter>spec</parameter> according to
+	<parameter>form</parameter>.
       </refpurpose>
       <refclass>Macro</refclass>
@@ -527,5 +548,5 @@
       <variablelist>
 	<varlistentry>
-	  <term>spec</term>
+	  <term><parameter>spec</parameter></term>
 	  <listitem>
 	    <para>
@@ -540,5 +561,5 @@
 	</varlistentry>
 	<varlistentry>
-	  <term>form</term>
+	  <term><parameter>form</parameter></term>
 	  <listitem>
 	    <para>
@@ -552,5 +573,5 @@
 	</varlistentry>
 	<varlistentry>
-	  <term>name</term>
+	  <term><parameter>name</parameter></term>
 	  <listitem>
 	    <para>
@@ -560,5 +581,5 @@
 	</varlistentry>
 	<varlistentry>
-	  <term>when</term>
+	  <term><parameter>when</parameter></term>
 	  <listitem>
 	    <para>
@@ -614,6 +635,6 @@
       <refname>UNADVISE</refname>
       <refpurpose>
-	Remove the piece or pieces of advice matching <varname>spec</varname>,
-	<varname>when</varname>, and <varname>name</varname>.
+	Remove the piece or pieces of advice matching <parameter>spec</parameter>,
+	<parameter>when</parameter>, and <parameter>name</parameter>.
       </refpurpose>
       <refclass>Macro</refclass>
@@ -655,6 +676,6 @@
       <refname>ADVISEDP</refname>
       <refpurpose>
-	Return a list of the pieces of advice matching <varname>spec</varname>,
-	<varname>when</varname>, and <varname>name</varname>.
+	Return a list of the pieces of advice matching <parameter>spec</parameter>,
+	<parameter>when</parameter>, and <parameter>name</parameter>.
       </refpurpose>
       <refclass>Macro</refclass>
@@ -688,9 +709,9 @@
 
   <sect1 id="Directory"><title>Directory</title>
-  <para>&CCL;'s <varname>DIRECTORY</varname> function accepts the following
+  <para>&CCL;'s <function>DIRECTORY</function> function accepts the following
 implementation-dependent keyword arguments:</para>
   <variablelist>
   <varlistentry>
-     <term><varname>:files</varname> <replaceable>boolean</replaceable></term>
+     <term><code>:files</code> <replaceable>boolean</replaceable></term>
      <listitem>
        <para> If true, includes regular (non-directory) files in DIRECTORY's output.  Defaults to T.</para>
@@ -698,5 +719,5 @@
   </varlistentry>
   <varlistentry>
-     <term><varname>:directories</varname> <replaceable>boolean</replaceable></term>
+     <term><code>:directories</code> <replaceable>boolean</replaceable></term>
      <listitem>
        <para> If true, includes directories in DIRECTORY's output.  Defaults to NIL.</para>
@@ -704,5 +725,5 @@
   </varlistentry>
   <varlistentry>
-     <term><varname>:all</varname> <replaceable>boolean</replaceable></term>
+     <term><code>:all</code> <replaceable>boolean</replaceable></term>
      <listitem>
        <para> If true, includes files and directories whose names start with a dot character in DIRECTORY's output.  (Entries whose name is "." or ".." are never included.) Defaults to T.</para>
@@ -710,5 +731,5 @@
   </varlistentry>
   <varlistentry>
-     <term><varname>:follow-links</varname> <replaceable>boolean</replaceable></term>
+     <term><code>:follow-links</code> <replaceable>boolean</replaceable></term>
      <listitem>
        <para> If true, includes the TRUENAMEs of symbolic or hard links in DIRECTORY's output; if false, includes the link filenames without attempting to resolve them. Defaults to T.</para>
@@ -889,5 +910,5 @@
 	<variablelist>
 	  <varlistentry>
-	    <term>domain</term>
+	    <term><parameter>domain</parameter></term>
 	    <listitem>
 	      <para>This is used to indicate where the external
@@ -905,5 +926,5 @@
 	  </varlistentry>
 	  <varlistentry>
-	    <term>character-encoding</term>
+	    <term><parameter>character-encoding</parameter></term>
 	    <listitem>
 	      <para>A keyword that specifies the character encoding
@@ -924,5 +945,5 @@
 	  </varlistentry>
 	  <varlistentry>
-	    <term>line-termination</term>
+	    <term><parameter>line-termination</parameter></term>
 	    <listitem>
 	      <para>A keyword that indicates a line termination
@@ -934,5 +955,5 @@
 	  </varlistentry>
 	  <varlistentry>
-	    <term>external-format</term>
+	    <term><parameter>external-format</parameter></term>
 	    <listitem>
 	      <para>An external-format object as described above.</para>
@@ -1448,7 +1469,7 @@
   <para>
     Returns the number of characters that would be produced by
-    decoding <varname>vector</varname> (or the subsequence thereof
-    delimited by <varname>start</varname> and <varname>end</varname>)
-    according to <varname>external-format</varname>.
+    decoding <parameter>vector</parameter> (or the subsequence thereof
+    delimited by <parameter>start</parameter> and <parameter>end</parameter>)
+    according to <parameter>external-format</parameter>.
   </para>
   </refsect1>
@@ -1481,23 +1502,23 @@
   <refsect1><title>Description</title>
   <para>
-    Decodes the octets in <varname>vector</varname> (or the subsequence
-    of it delimited by <varname>start</varname> and
-    <varname>end</varname>) into a string according
-    to <varname>external-format</varname>.
+    Decodes the octets in <parameter>vector</parameter> (or the subsequence
+    of it delimited by <parameter>start</parameter> and
+    <parameter>end</parameter>) into a string according
+    to <parameter>external-format</parameter>.
   </para>
   <para>
-    If <varname>string</varname> is supplied, output will be written into it.
-    It must be large enough to hold the decoded characters.  If <varname>
-    string</varname> is not supplied, a new string will be allocated to
+    If <parameter>string</parameter> is supplied, output will be written into it.
+    It must be large enough to hold the decoded characters.  If <parameter>
+    string</parameter> is not supplied, a new string will be allocated to
     hold the decoded characters.
   </para>
   <para>
     Returns, as multiple values, the decoded string and the position in
-    <varname>vector</varname> where the decoding ended.
+    <parameter>vector</parameter> where the decoding ended.
   </para>
   <para>
-    Sequences of octets in <varname>vector</varname> that cannot be
+    Sequences of octets in <parameter>vector</parameter> that cannot be
     decoded into characters according to
-    <varname>external-format</varname> will be decoded as
+    <parameter>external-format</parameter> will be decoded as
     #\Replacement_Character.
   </para>
@@ -1533,16 +1554,16 @@
   <refsect1><title>Description</title>
   <para>
-    Encodes <varname>string</varname> (or the substring delimited by
-    <varname>start</varname> and <varname>end</varname>)
-    into <varname>external-format</varname> and returns, as multiple
+    Encodes <parameter>string</parameter> (or the substring delimited by
+    <parameter>start</parameter> and <parameter>end</parameter>)
+    into <parameter>external-format</parameter> and returns, as multiple
     values, a vector of octets containing the encoded data and an integer
     that specifies the offset into the vector where the encoded data ends.
   </para>
   <para>
-    When <varname>use-byte-order-mark</varname> is true, a byte-order mark
+    When <parameter>use-byte-order-mark</parameter> is true, a byte-order mark
     will be included in the encoded data.
   </para>
   <para>
-    If <varname>vector</varname> is supplied, output will be written
+    If <parameter>vector</parameter> is supplied, output will be written
     to it.  It must be of type (simple-array (unsigned-byte 8)) and be
     large enough to hold the encoded data.  If it is not supplied, the function
@@ -1550,10 +1571,10 @@
   </para>
   <para>
-    If <varname>vector-offset</varname> is supplied, data will be written
+    If <parameter>vector-offset</parameter> is supplied, data will be written
     into the output vector starting at that offset.
   </para>
   <para>
-    Characters in <varname>string</varname> that cannot be encoded
-    into <varname>external-format</varname> will be replaced with an
+    Characters in <parameter>string</parameter> that cannot be encoded
+    into <parameter>external-format</parameter> will be replaced with an
     encoding-dependent replacement character
     (#\Replacement_Character or #\Sub) before being encoded and written
@@ -1590,10 +1611,10 @@
   <para>
     Returns the number of octets required to encode
-    <varname>string</varname> (or the substring delimited by
-    <varname>start</varname> and <varname>end</varname>) into
-    <varname>external-format</varname>.
+    <parameter>string</parameter> (or the substring delimited by
+    <parameter>start</parameter> and <parameter>end</parameter>) into
+    <parameter>external-format</parameter>.
   </para>
   <para>
-    When <varname>use-byte-order-mark</varname> is true, the returned
+    When <parameter>use-byte-order-mark</parameter> is true, the returned
     size will include space for a byte-order marker.
   </para>
@@ -1626,14 +1647,13 @@
       <para>&CCL; sets up logical pathname translations for logical hosts:  <literal>ccl</literal> and <literal>home</literal></para>
 
-      <indexterm><primary>CCL Logical Host</primary></indexterm>
-      <para>The <literal>CCL</literal> logical host should point to the
-        <literal>ccl</literal> directory.  It is used for a variety of
+      <para>The <filename>CCL</filename> logical host should point to the
+        <filename>ccl</filename> directory.  It is used for a variety of
         purposes by &CCL; including: locating &CCL; source code,
         <literal>require</literal> and <literal>provide</literal>, accessing
         foreign function information, and the &CCL; build process. It
         is set to the value of the environment variable
-        <varname>CCL_DEFAULT_DIRECTORY</varname>, which is set by the
+        <filename>CCL_DEFAULT_DIRECTORY</filename>, which is set by the
         openmcl shell script <xref linkend="The-ccl-Shell-Script"/>.  If
-        <varname>CCL_DEFAULT_DIRECTORY</varname> is not set, then it is set
+        <filename>CCL_DEFAULT_DIRECTORY</filename> is not set, then it is set
         to the directory containing the current heap image.</para>
     </sect2>
@@ -1703,5 +1723,5 @@
 	</para>
 	<para>
-	  For example, suppose that <varname>p</varname> is a pathname made
+	  For example, suppose that <parameter>p</parameter> is a pathname made
 	  by <literal>(make-pathname :name "a.b" :type "c")</literal>.
 	  Then, <literal>(native-translated-namestring p)</literal> evaluates
@@ -1731,6 +1751,6 @@
 	<refsect1><title>Description</title>
 	<para>
-	  Executes <varname>forms</varname> in an environemt in which each
-	  <varname>var</varname> is bound to a stack-allocated foreign
+	  Executes <parameter>forms</parameter> in an environemt in which each
+	  <parameter>var</parameter> is bound to a stack-allocated foreign
 	  pointer which refers to a C-style string suitable for passing
 	  to foreign code which expects a filename argument.
@@ -1766,6 +1786,6 @@
       <para>Pathname strings are treated as null-terminated strings
         coded in the encoding named by the value returned by the function
-      <varname>CCL:PATHNAME-ENCODING-NAME</varname>.  This value may be changed
-      with <varname>SETF</varname>.</para>
+      <function>CCL:PATHNAME-ENCODING-NAME</function>.  This value may be changed
+      with <function>SETF</function>.</para>
     </sect2>
     <sect2 id="pathnames-on-freebsd">
@@ -1794,6 +1814,6 @@
 
     <para>&CCL; provides the
-      functions <varname>CCL:MAP-FILE-TO-IVECTOR</varname>
-      and <varname>CCL:MAP-FILE-TO-OCTET-VECTOR</varname> to support
+      functions <function>CCL:MAP-FILE-TO-IVECTOR</function>
+      and <function>CCL:MAP-FILE-TO-OCTET-VECTOR</function> to support
       memory-mapping. These functions return vectors whose contents are
       the contents of memory-mapped files. Reading an element of such a
@@ -1819,31 +1839,29 @@
       directly, without copying them into memory first.</para>
 
-    <para>The vectors returned by <varname>CCL:MAP-FILE-TO-IVECTOR</varname>
-      and <varname>CCL:MAP-FILE-TO-OCTET-VECTOR</varname> are read-only; any
+    <para>The vectors returned by <function>CCL:MAP-FILE-TO-IVECTOR</function>
+      and <function>CCL:MAP-FILE-TO-OCTET-VECTOR</function> are read-only; any
       attempt to change an element of a vector returned by these
       functions results in a memory-access error. &CCL; does not
       currently support writing data to memory-mapped files.</para>
 
-    <para>Vectors created by <varname>CCL:MAP-FILE-TO-IVECTOR</varname>
-      and <varname>CCL:MAP-FILE-TO-OCTET-VECTOR</varname> are required to
+    <para>Vectors created by <function>CCL:MAP-FILE-TO-IVECTOR</function>
+      and <function>CCL:MAP-FILE-TO-OCTET-VECTOR</function> are required to
       respect &CCL;'s limit on the total size of an array. That means
       that you cannot use these functions to create a vector longer
       than <varname>ARRAY-TOTAL-SIZE-LIMIT</varname>, even if the filesystem
       supports file sizes that are larger. The value
-      of <varname>ARRAY-TOTAL-SIZE-LIMIT</varname> is <varname>(EXPT 2 24)</varname>
-      on 32-but platforms; and <varname>(EXPT 2 56)</varname> on 64-bit
+      of <varname>ARRAY-TOTAL-SIZE-LIMIT</varname> is <code>(EXPT 2 24)</code>
+      on 32-but platforms; and <code>(EXPT 2 56)</code> on 64-bit
       platforms.</para>
 
-    <para>
-      <indexterm zone="map-file-to-ivector"/>
-      <command><varname id="map-file-to-ivector">CCL:MAP-FILE-TO-IVECTOR</varname>
-        <parameter>pathname</parameter>
-        <parameter>element-type</parameter>
-        [Function]</command>
-    </para>
+
+      <refentry id="f_map-file-to-ivector"><indexterm zone="m_map-file-to-ivector"><primary>map-file-to-ivector</primary></indexterm>
+        <refnamediv><refname>MAP-FILE-TO-IVECTOR</refname><refpurpose></refpurpose><refclass>Function</refclass></refnamediv>
+        <refsynopsisdiv><synopsis><function>CCL:MAP-FILE-TO-IVECTOR</function> <parameter>pathname</parameter> <parameter>element-type</parameter></synopsis></refsynopsisdiv>
+     <refsect1><title>Description</title>
 
     <variablelist>
       <varlistentry>
-        <term><varname>pathname</varname></term>
+        <term><parameter>pathname</parameter></term>
         <listitem>
           <para>The pathname of the file to be memory-mapped.</para>
@@ -1852,11 +1870,11 @@
       
       <varlistentry>
-        <term><varname>element-type</varname></term>
+        <term><parameter>element-type</parameter></term>
         <listitem>
           <para>The element-type of the vector to be
             created. Specified as
             a <glossterm linkend="type-specifier">type-specifier</glossterm>
-            that names a subtype of either <varname>SIGNED-BYTE</varname>
-            or <varname>UNSIGNED-BYTE</varname>.</para>
+            that names a subtype of either <code>SIGNED-BYTE</code>
+            or <code>UNSIGNED-BYTE</code>.</para>
         </listitem>
       </varlistentry>
@@ -1865,5 +1883,5 @@
 
     <para>
-      The <varname>map-file-to-ivector</varname> function tries to
+      The <function>map-file-to-ivector</function> function tries to
       open the file at <parameter>pathname</parameter> for reading. If
       successful, the function maps the file's contents to a range of
@@ -1876,7 +1894,7 @@
     <para>The returned vector is
       a <glossterm linkend="displaced-array">displaced-array</glossterm>
-      whose element-type is <varname>(UPGRADED-ARRAY-ELEMENT-TYPE
-        element-type)</varname>. The target of the displaced array is a
-      vector of type <varname>(SIMPLE-ARRAY element-type (*))</varname> whose
+      whose element-type is <code>(UPGRADED-ARRAY-ELEMENT-TYPE
+        element-type)</code>. The target of the displaced array is a
+      vector of type <code>(SIMPLE-ARRAY element-type (*))</code> whose
       elements are the contents of the memory-mapped file.</para>
 
@@ -1884,9 +1902,9 @@
       start a few bytes (4 bytes on 32-bit platforms, 8 bytes on
       64-bit platforms) into the vector. The displaced array returned
-      by <varname>CCL:MAP-FILE-TO-IVECTOR</varname> hides this overhead, but
+      by <function>CCL:MAP-FILE-TO-IVECTOR</function> hides this overhead, but
       it's usually more efficient to operate on the underlying simple
       1-dimensional array.  Given a displaced array (like the value
-      returned by <varname>CCL:MAP-FILE-TO-IVECTOR</varname>), the function
-      <varname>ARRAY-DISPLACEMENT</varname> returns the underlying array and
+      returned by <function>CCL:MAP-FILE-TO-IVECTOR</function>), the function
+      <function>ARRAY-DISPLACEMENT</function> returns the underlying array and
       the displacement index in elements.
     </para>
@@ -1894,42 +1912,51 @@
     <para>Currently, &CCL; supports only read operations on
       memory-mapped files. If you try to change the contents of an array
-      returned by <varname>map-file-to-ivector</varname>, &CCL; signals
+      returned by <function>map-file-to-ivector</function>, &CCL; signals
       a memory error.</para>
 
-    <para>
-      <indexterm zone="unmap-ivector"/>
-      <command><varname id="unmap-ivector">CCL:UNMAP-IVECTOR</varname>
-        <parameter>displaced-array</parameter>
-        [Function]</command>
-    </para>
+    </refsect1>
+    </refentry>
+
+      <refentry id="f_unmap-ivector"><indexterm zone="f_unmap-ivector"><primary>unmap-ivector</primary></indexterm>
+        <refnamediv><refname>UNMAP-IVECTOR</refname><refpurpose></refpurpose><refclass>Function</refclass></refnamediv>
+        <refsynopsisdiv><synopsis><function>CCL:UNMAP-IVECTOR</function> <parameter>displaced-array</parameter>
+         </synopsis></refsynopsisdiv>
+     <refsect1><title>Description</title>
 
     <para>If the argument is a displaced-array returned
-      by <varname>map-file-to-ivector</varname>, and if it has not yet
+      by <function>map-file-to-ivector</function>, and if it has not yet
       been unmapped by this function,
-      then <varname>unmap-ivector</varname> undoes the memory mapping,
+      then <function>unmap-ivector</function> undoes the memory mapping,
       closes the mapped file, and changes the displaced-array so that its
       target is an empty vector (of length zero).</para>
 
-    <para>
-      <indexterm zone="map-file-to-octet-vector"/>
-      <command><varname id="map-file-to-octet-vector">CCL:MAP-FILE-TO-OCTET-VECTOR</varname>
-        <parameter>pathname</parameter>
-        [Function]</command>
-    </para>
-
-    <para>This function is a synonym for <varname>(CCL:MAP-FILE-TO-IVECTOR
-        pathname '(UNSIGNED-BYTE 8))</varname> It is provided as a convenience
+    </refsect1>
+    </refentry>
+
+      <refentry id="f_map-file-to-octet-vector"><indexterm zone="f_map-file-to-octet-vector"><primary>map-file-to-octet-vector</primary></indexterm>
+        <refnamediv><refname>MAP-FILE-TO-OCTET-VECTOR</refname><refpurpose></refpurpose><refclass>Function</refclass></refnamediv>
+        <refsynopsisdiv><synopsis><function>CCL:MAP-FILE-TO-OCTET-VECTOR</function> <parameter>displaced-array</parameter>
+         </synopsis></refsynopsisdiv>
+     <refsect1><title>Description</title>
+
+    <para>This function is a synonym for <code>(CCL:MAP-FILE-TO-IVECTOR
+        pathname '(UNSIGNED-BYTE 8))</code> It is provided as a convenience
       for the common case of memory-mapping a file as a vector of
       bytes.</para>
 
-    <para>
-      <indexterm zone="unmap-octet-vector"/>
-      <command><varname id="unmap-octet-vector">CCL:UNMAP-OCTET-VECTOR</varname>
-        <parameter>displaced-array</parameter>
-        [Function]</command>
-    </para>
+    </refsect1>
+    </refentry>
+
+      <refentry id="f_unmap-octet-vector"><indexterm zone="f_unmap-octet-vector"><primary>unmap-octet-vector</primary></indexterm>
+        <refnamediv><refname>UNMAP-OCTET-VECTOR</refname><refpurpose></refpurpose><refclass>Function</refclass></refnamediv>
+        <refsynopsisdiv><synopsis><function>CCL:UNMAP-OCTET-VECTOR</function> <parameter>displaced-array</parameter>
+         </synopsis></refsynopsisdiv>
+     <refsect1><title>Description</title>
 
     <para>This function is a synonym
-      for <varname>(CCL:UNMAP-IVECTOR)</varname></para>
+      for <function>CCL:UNMAP-IVECTOR</function></para>
+    </refsect1>
+    </refentry>
+
   </sect1>
 
@@ -1946,6 +1973,6 @@
 
     <para>Attempting to dynamically rebind a static variable (for
-      instance, by using <varname>LET</varname>, or using the variable name as
-      a parameter in a <varname>LAMBDA</varname> form) signals an
+      instance, by using <code>LET</code>, or using the variable name as
+      a parameter in a <code>LAMBDA</code> form) signals an
       error. Static variables are shared global resources; a dynamic
       binding is private to a single thread.</para>
@@ -1964,17 +1991,17 @@
       static.</para>
 
-    <para>
-      <indexterm zone="defstatic"/>
-      <command><varname id="defstatic">DEFSTATIC</varname>
-        <parameter>var</parameter>
+
+      <refentry id="m_defstatic"><indexterm zone="m_defstatic"><primary>defstatic</primary></indexterm>
+        <refnamediv><refname>DEFSTATIC</refname><refpurpose></refpurpose><refclass>Macro</refclass></refnamediv>
+        <refsynopsisdiv><synopsis><function>DEFSTATIC</function> <parameter>var</parameter>
         <parameter>value</parameter>
         &key;
         <parameter>doc-string</parameter>
-        [Macro]</command>
-    </para>
-    
+         </synopsis></refsynopsisdiv>
+     <refsect1><title>Description</title>
+
     <variablelist>
       <varlistentry>
-        <term><varname>var</varname></term>
+        <term><parameter>var</parameter></term>
         <listitem>
           <para>The name of the new static variable.</para>
@@ -1983,5 +2010,5 @@
       
       <varlistentry>
-        <term><varname>value</varname></term>
+        <term><parameter>value</parameter></term>
         <listitem>
           <para>The initial value of the new static variable.</para>
@@ -1990,5 +2017,5 @@
       
       <varlistentry>
-        <term><varname>doc-string</varname></term>
+        <term><parameter>doc-string</parameter></term>
         <listitem>
           <para>A documentation string that is assigned to the new
@@ -2001,9 +2028,13 @@
       variable <glossterm linkend="special_variable">special</glossterm>,
       assigns the variable the supplied value, and assigns
-      the <varname>doc-string</varname> to the
-      variable's <varname>VARIABLE</varname> documentation. Marks the
+      the <parameter>doc-string</parameter> to the
+      variable's <code>VARIABLE</code> documentation. Marks the
       variable static, preventing any attempt to dynamically rebind
-      it. Any attempt to dynamically rebind <varname>var</varname>
+      it. Any attempt to dynamically rebind <parameter>var</parameter>
       signals an error.</para>
+    </refsect1>
+    </refentry>
+
+
   </sect1>
 
@@ -2120,8 +2151,11 @@
       or <literal>ccl64</literal> script.</para>
 
-    <para>
-      <indexterm zone="save-application"/>
-      <command><varname id="save-application">SAVE-APPLICATION</varname>
-        <parameter>filename</parameter>
+
+
+
+
+      <refentry id="f_save-application"><indexterm zone="f_save-application"><primary>save-application</primary></indexterm>
+        <refnamediv><refname>SAVE-APPLICATION</refname><refpurpose></refpurpose><refclass>Function</refclass></refnamediv>
+        <refsynopsisdiv><synopsis><function>SAVE-APPLICATION</function>         <parameter>filename</parameter>
         &key;
         <parameter>toplevel-function</parameter>
@@ -2135,10 +2169,10 @@
         <parameter>prepend-kernel</parameter>
         <parameter>native</parameter>
-        [Function]</command>
-    </para>
+         </synopsis></refsynopsisdiv>
+     <refsect1><title>Description</title>
     
     <variablelist>
       <varlistentry>
-        <term><varname>filename</varname></term>
+        <term><parameter>filename</parameter></term>
         <listitem>
           <para>The pathname of the file to be created when &CCL;
@@ -2148,5 +2182,5 @@
       
       <varlistentry>
-        <term><varname>toplevel-function</varname></term>
+        <term><parameter>toplevel-function</parameter></term>
         <listitem>
           <para>The function to be executed after startup is
@@ -2162,5 +2196,5 @@
 
       <varlistentry>
-        <term><varname>init-file</varname></term>
+        <term><parameter>init-file</parameter></term>
         <listitem>
           <para>The pathname of a Lisp file to be loaded when the
@@ -2172,5 +2206,5 @@
       
       <varlistentry>
-        <term><varname>error-handler</varname></term>
+        <term><parameter>error-handler</parameter></term>
         <listitem>
           <para>The error-handling mode for the saved image. The
@@ -2188,5 +2222,5 @@
 
       <varlistentry>
-        <term><varname>application-class</varname></term>
+        <term><parameter>application-class</parameter></term>
         <listitem>
           <para>The CLOS class that represents the saved Lisp
@@ -2201,5 +2235,5 @@
       
       <varlistentry>
-        <term><varname>clear-clos-caches</varname></term>
+        <term><parameter>clear-clos-caches</parameter></term>
         <listitem>
           <para>If true, ensures that CLOS caches are emptied before
@@ -2211,5 +2245,5 @@
      </varlistentry>
      <varlistentry>
-        <term><varname>purify</varname></term>
+        <term><parameter>purify</parameter></term>
         <listitem>
           <para>
@@ -2224,5 +2258,5 @@
 
      <varlistentry>
-        <term><varname>impurify</varname></term>
+        <term><parameter>impurify</parameter></term>
         <listitem>
           <para>
@@ -2241,5 +2275,5 @@
 
      <varlistentry>
-        <term><varname>mode</varname></term>
+        <term><parameter>mode</parameter></term>
         <listitem>
           <para>
@@ -2250,5 +2284,5 @@
 
      <varlistentry>
-        <term><varname>prepend-kernel</varname></term>
+        <term><parameter>prepend-kernel</parameter></term>
         <listitem>
           <para>Specifies the file to prepend to the saved heap
@@ -2271,5 +2305,5 @@
       </varlistentry>
      <varlistentry>
-        <term><varname>native</varname></term>
+        <term><parameter>native</parameter></term>
         <listitem>
           <para>If true, saves the image as a native (ELF, Mach-O, PE)
@@ -2282,4 +2316,7 @@
       
     </variablelist>
+
+    </refsect1>
+    </refentry>
 
     <para></para>
@@ -2312,5 +2349,5 @@
       <variablelist>
 	<varlistentry>
-	  <term>out-file</term>
+	  <term><parameter>out-file</parameter></term>
 	  <listitem>
 	    <para>
@@ -2320,5 +2357,5 @@
 	</varlistentry>
 	<varlistentry>
-	  <term>fasl-files</term>
+	  <term><parameter>fasl-files</parameter></term>
 	  <listitem>
 	    <para>
@@ -2328,5 +2365,5 @@
 	</varlistentry>
 	<varlistentry>
-	  <term>:if-exists</term>
+	  <term><parameter>if-exists</parameter></term>
 	  <listitem>
 	    <para>
@@ -2375,6 +2412,6 @@
     default, threads start up with overflow, division-by-zero, and
     invalid enabled, and the rounding mode is set to nearest. The
-    functions <varname>SET-FPU-MODE</varname> and
-    <varname>GET-FPU-MODE</varname> provide user control over
+    functions <function>SET-FPU-MODE</function> and
+    <function>GET-FPU-MODE</function> provide user control over
     floating-point behavior.
   </para>
@@ -2402,5 +2439,5 @@
       <variablelist>
 	<varlistentry>
-	  <term>mode</term>
+	  <term><parameter>mode</parameter></term>
 	  <listitem>
 	    <para>
@@ -2416,5 +2453,5 @@
       <title>Description</title>
       <para>
-	If <varname>mode</varname> is supplied, returns the value of
+	If <parameter>mode</parameter> is supplied, returns the value of
 	the corresponding control flag for the current thread.
       </para>
@@ -2471,5 +2508,5 @@
       <variablelist>
 	<varlistentry>
-	  <term>rounding-mode</term>
+	  <term><parameter>rounding-mode</parameter></term>
 	  <listitem>
 	    <para>
@@ -2480,5 +2517,5 @@
 	</varlistentry>
 	<varlistentry>
-	  <term>overflow, underflow, division-by-zero, invalid, inexact</term>
+	  <term><parameter>overflow</parameter>, <parameter>underflow</parameter>, <parameter>division-by-zero</parameter>, <parameter>invalid</parameter>, <parameter>inexact</parameter></term>
 	  <listitem>
 	    <para>NIL to mask the exception, T to signal it.</para>
@@ -2530,5 +2567,5 @@
       <variablelist>
 	<varlistentry>
-	  <term>object</term>
+	  <term><parameter>object</parameter></term>
 	  <listitem>
 	    <para>
@@ -3022,5 +3059,5 @@
   <variablelist>
     <varlistentry>
-      <term>output-file</term>
+      <term><parameter>output-file</parameter></term>
       <listitem>
 	<para>
@@ -3031,9 +3068,9 @@
     
     <varlistentry>
-      <term>html</term>
+      <term><parameter>html</parameter></term>
       <listitem>
 	<para>
 	  If non-nil (the default), this will generate an HTML report, consisting of
-	  an index file in <varname>output-file</varname> and, in the same directory,
+	  an index file in <parameter>output-file</parameter> and, in the same directory,
           one html file for each instrumented source file that has been loaded in the
           current session.
@@ -3042,5 +3079,5 @@
     </varlistentry>
     <varlistentry>
-      <term>tags</term>
+      <term><parameter>tags</parameter></term>
       <listitem>
 	<para>
@@ -3052,5 +3089,5 @@
     </varlistentry>
     <varlistentry>
-      <term>external-format</term>
+      <term><parameter>external-format</parameter></term>
       <listitem>
 	<para>
@@ -3060,5 +3097,5 @@
     </varlistentry>
     <varlistentry>
-      <term>statistics</term>
+      <term><parameter>statistics</parameter></term>
       <listitem>
 	<para>
@@ -3066,5 +3103,5 @@
 	  generated with the summary of statistics. You can specify a
 	  filename for the statistics argument, otherwise
-	  "statistics.csv" is created in the directory of <varname>output-file</varname>.
+	  "statistics.csv" is created in the directory of <parameter>output-file</parameter>.
           See documentation of coverage-statistics below for a
 	  description of the values in the statistics file.
@@ -3352,5 +3389,5 @@
       Returns a sequence of <literal>ccl:coverage-statistics</literal> objects, one for each
       source file, containing the same information as that written to
-      the statistics file by <literal>ccl:report-coverage</literal>. The following
+      the statistics file by <function>ccl:report-coverage</function>. The following
       accessors are defined for <literal>ccl:coverage-statistics</literal> objects:
       <variablelist>
@@ -3510,5 +3547,5 @@
       coverage uses an abbreviated format
       and is missing some of the information in a full snapshot, and therefore cannot be passed to
-      functions documented to accept a <varname>snapshot</varname>, only to functions
+      functions documented to accept a <parameter>snapshot</parameter>, only to functions
       specifically documented to accept incremental coverage deltas.
      </para>
@@ -3537,5 +3574,5 @@
   <variablelist>
     <varlistentry>
-      <term>collection</term>
+      <term><parameter>collection</parameter></term>
        <listitem>
          <para>
@@ -3546,5 +3583,5 @@
     </varlistentry>
     <varlistentry>
-      <term>sources</term>
+      <term><parameter>sources</parameter></term>
        <listitem>
          <para>
@@ -3595,5 +3632,5 @@
   <variablelist>
     <varlistentry>
-      <term>collection</term>
+      <term><parameter>collection</parameter></term>
        <listitem>
          <para>
@@ -3604,5 +3641,5 @@
     </varlistentry>
     <varlistentry>
-      <term>directory</term>
+      <term><parameter>directory</parameter></term>
        <listitem>
          <para>
@@ -3612,5 +3649,5 @@
     </varlistentry>
     <varlistentry>
-      <term>revision</term>
+      <term><parameter>revision</parameter></term>
        <listitem>
          <para>
