[master] remove unneeded xsl code, fix a link in ARM

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 6a686593a2efd9809650eba3c4377a11966f3830..803aeacdee00d5bac197da4c096739ba18e9399f 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -8284,7 +8284,7 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
            </varlistentry>
 
            <varlistentry xml:id="clients-per-query">
-             <term><command>clients-per-query</command></term>
+             <term xml:id="cpq_term"><command>clients-per-query</command></term>
              <term><command>max-clients-per-query</command></term>
              <listitem>
                <para>These set the
@@ -15834,7 +15834,7 @@ HOST-127.EXAMPLE. MX 0 .
                        <command>max-clients-per-query</command>
                        options
                        (see the description about
-                       <xref linkend="clients-per-query"/>.)
+                       <xref endterm="cpq_term" linkend="clients-per-query"/>.)
                        This corresponds to the
                        <command>dropped</command> counter
                        of previous versions of

diff --git a/doc/xsl/arm-param.xsl b/doc/xsl/arm-param.xsl
index 97f5efbd56fb1a668dcf8933e770680414c471fa..c406530258d8405a4f4481a8b241c3fb256716ba 100644 (file)
--- a/doc/xsl/arm-param.xsl
+++ b/doc/xsl/arm-param.xsl
@@ -75,7 +75,8 @@
   <!-- the blue boxes won't show up in print, but change to black and the boxes
   disappeared -->
   <!-- urlcolor=black is for email addresses etc -->
-  <xsl:param name="latex.class.options">nohyperlink,colorlinks,linkcolor=black,urlcolor=black</xsl:param>
+  <!-- this is for a black-and-white PDF, no hyperlinks or URL colors -->
+  <!-- xsl:param name="latex.class.options">nohyperlink,colorlinks,linkcolor=black,urlcolor=black</xsl:param> -->
 
   <!-- Variable list terms on line by themselves -->
   <xsl:param name="term.breakline">1</xsl:param>
@@ -86,19 +87,6 @@
   <!-- set latex secnumdepth, choose level of subsections to number -->
   <xsl:param name="doc.section.depth">1</xsl:param>
 
-  <!-- custom for menu labels -->
-  <!-- I don't use guisubmenu -->
-  <!-- TODO: guimenu and guimenuitem not doing anything here -->
-  <xsl:template match="guimenu|guimenuitem">
-   <xsl:call-template name="inline.sansserifseq"/>
-  </xsl:template>
-  <xsl:template match="guibutton">
-   <xsl:call-template name="inline.sansserifseq"/>
-  </xsl:template>
-  <xsl:template match="guilabel">
-   <xsl:call-template name="inline.sansserifseq"/>
-  </xsl:template>
-
   <xsl:template name="inline.sansserifseq">
     <xsl:param name="content">
       <xsl:apply-templates/>