From d92c22d393779bf507f9a685165704afb435450f Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Wed, 14 Oct 2015 14:58:12 -0700
Subject: [PATCH] [v9_9] remove unneeded xsl code, fix a link in ARM

---
 doc/arm/Bv9ARM-book.xml |  4 ++--
 doc/xsl/arm-param.xsl   | 16 ++--------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 071d271c5a..5ddf29cded 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -7643,7 +7643,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
@@ -14626,7 +14626,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 97f5efbd56..c406530258 100644
--- 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/>