Index: /trunk/doc/manual/docbook2latex.xsl
===================================================================
--- /trunk/doc/manual/docbook2latex.xsl	(revision 76080)
+++ /trunk/doc/manual/docbook2latex.xsl	(revision 76081)
@@ -893,5 +893,5 @@
   <xsl:template match="replaceable">
     <xsl:choose>
-      <xsl:when test="not(ancestor::cmdsynopsis) or ancestor::arg">
+      <xsl:when test="(not(ancestor::cmdsynopsis) and not(ancestor::option)) or ancestor::arg">
         <xsl:text>\texttt{\textit{</xsl:text>
         <xsl:apply-templates />
@@ -936,5 +936,5 @@
         <xsl:variable name="subst2">
           <xsl:call-template name="str:subst">
-            <xsl:with-param name="text" select="$subst1" />
+            <xsl:with-param name="text" select="translate(normalize-space(concat('&#x7F;',$subst1,'&#x7F;')),'&#x7F;','')" />
             <xsl:with-param name="replace" select="'--'" />
             <xsl:with-param name="with" select="'-{}-'" />
