- Fix a couple of LaTeX escaping bugs.

- Fix urls in footnotes.
- Cleanup developers docs.
(This used to be commit d55b9f72ffbd0421cbde67915d9f275cc8956ed7)

8 files changed, 13 insertions, 29 deletions

diff --git a/docs/xslt/docbook2pearson.xsl b/docs/xslt/docbook2pearson.xsl
index 4a4158fa40..ebe2a955a2 100644
--- a/docs/xslt/docbook2pearson.xsl
+++ b/docs/xslt/docbook2pearson.xsl
@@ -10,8 +10,6 @@
 	exclude-result-prefixes="doc"
 	version="1.1">
 
-	<xsl:import href="../settings.xsl"/>
-
 	<!-- TODO <entry></entry> -> <entry><p/></entry> -->
 
 	<xsl:output method="xml"
diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl
index 37e70cca5a..e118a3255b 100644
--- a/docs/xslt/expand-sambadoc.xsl
+++ b/docs/xslt/expand-sambadoc.xsl
@@ -9,7 +9,6 @@
 	xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"
 	version="1.1">
 
-	<xsl:import href="../settings.xsl"/>
 	<xsl:import href="strip-references.xsl"/>
 	<xsl:import href="expand-smbconfdoc.xsl"/>
 
@@ -117,7 +116,7 @@
 				<xsl:attribute name="role"><xsl:text>html</xsl:text></xsl:attribute>
 				<xsl:element name="imagedata">
 					<xsl:attribute name="fileref">
-						<xsl:text>images/</xsl:text><xsl:value-of select="imagefile"/><xsl:text>.png</xsl:text></xsl:attribute>
+						<xsl:text>images/</xsl:text><xsl:value-of select="text()"/><xsl:text>.png</xsl:text></xsl:attribute>
 					<xsl:attribute name="scale">
 						<xsl:choose>
 							<xsl:when test="@scale != ''">
@@ -135,7 +134,7 @@
 			<xsl:element name="imageobject">
 				<xsl:element name="imagedata">
 					<xsl:attribute name="fileref">
-						<xsl:text>images/</xsl:text><xsl:value-of select="imagefile"/><xsl:text>.png</xsl:text></xsl:attribute>
+						<xsl:text>images/</xsl:text><xsl:value-of select="text()"/><xsl:text>.png</xsl:text></xsl:attribute>
 					<xsl:attribute name="scale">
 						<xsl:choose>
 							<xsl:when test="@scale != ''">
diff --git a/docs/xslt/fo.xsl b/docs/xslt/fo.xsl
index f9a78395da..f095f5df8f 100644
--- a/docs/xslt/fo.xsl
+++ b/docs/xslt/fo.xsl
@@ -3,19 +3,6 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version='1.0'>
 
-<xsl:import href="../settings.xsl"/>
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/>
 
-<xsl:param name="paper.type">
-  <xsl:choose>
-	<xsl:when test="$papersize = 'a4paper'">
-	  <xsl:text>A4</xsl:text>
-	</xsl:when>
-	<xsl:when test="$papersize = 'letter'">
-	  <xsl:text>USletter</xsl:text>
-	</xsl:when>
-  </xsl:choose>
-</xsl:param>
-
-
 </xsl:stylesheet>
diff --git a/docs/xslt/html-chunk.xsl b/docs/xslt/html-chunk.xsl
index e98a3df8dc..00b310610a 100644
--- a/docs/xslt/html-chunk.xsl
+++ b/docs/xslt/html-chunk.xsl
@@ -3,8 +3,6 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:import href="../settings.xsl"/>
-
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/>
 <xsl:import href="html-common.xsl"/>
 <xsl:param name="chunk.first.sections" select="1"/>
diff --git a/docs/xslt/html.xsl b/docs/xslt/html.xsl
index bb07516ad2..8481a86d24 100644
--- a/docs/xslt/html.xsl
+++ b/docs/xslt/html.xsl
@@ -3,8 +3,6 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:import href="../settings.xsl"/>
-
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
 <xsl:import href="html-common.xsl"/>
 
diff --git a/docs/xslt/latex.xsl b/docs/xslt/latex.xsl
index cc817427de..0e2574de20 100644
--- a/docs/xslt/latex.xsl
+++ b/docs/xslt/latex.xsl
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
-<xsl:import href="../settings.xsl"/>
 <xsl:import href="http://db2latex.sourceforge.net/xsl/docbook.xsl"/>
 <xsl:import href="strip-references.xsl"/>
 
@@ -62,6 +61,8 @@
 <xsl:param name="latex.documentclass">sambadoc</xsl:param>
 <xsl:param name="latex.documentclass.book">openright,twoside</xsl:param>
 <xsl:param name="latex.babel.language">english</xsl:param>
+<xsl:variable name="ulink.footnotes" select="1"/>
+<xsl:variable name="ulink.show" select="0"/>
 
 <xsl:template match="smbconfblock/smbconfoption">
 	<xsl:value-of select="@name"/>
@@ -85,13 +86,17 @@
 
 <xsl:template match="smbconfoption">
 	<xsl:text>\smbconfoption{</xsl:text>
-	<xsl:value-of select="@name"/>
+	<xsl:call-template name="scape">
+		<xsl:with-param name="string" select="@name"/>
+	</xsl:call-template>
 	<xsl:text>}</xsl:text>
 
 	<xsl:choose>
 		<xsl:when test="text() != ''">
 			<xsl:text> = </xsl:text>
-			<xsl:value-of select="text()"/>
+			<xsl:call-template name="scape">
+				<xsl:with-param name="string" select="text()"/>
+			</xsl:call-template>
 		</xsl:when>
 	</xsl:choose>
 </xsl:template>
@@ -104,7 +109,9 @@
 
 <xsl:template match="smbconfsection">
 	<xsl:text>\smbconfsection{</xsl:text>
-		<xsl:value-of select="translate(@name, '$','x')"/>
+	<xsl:call-template name="scape">
+		<xsl:with-param name="string" select="@name"/>
+	</xsl:call-template>
 	<xsl:text>}</xsl:text>
 </xsl:template>
 
diff --git a/docs/xslt/man.xsl b/docs/xslt/man.xsl
index 94bb646ee4..91e6ebc9a8 100644
--- a/docs/xslt/man.xsl
+++ b/docs/xslt/man.xsl
@@ -3,8 +3,6 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version='1.0'>
 
-<xsl:import href="../settings.xsl"/>
-
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
 
 <xsl:param name="chunk.section.depth" select="0"/>
diff --git a/docs/xslt/smb.conf-html.xsl b/docs/xslt/smb.conf-html.xsl
index dd28553d4f..ebf07d9161 100644
--- a/docs/xslt/smb.conf-html.xsl
+++ b/docs/xslt/smb.conf-html.xsl
@@ -11,7 +11,6 @@
 	version="1.1"
 	extension-element-prefixes="exsl">
 
-	<xsl:import href="../settings.xsl"/>
 	<xsl:import href="html-common.xsl"/>
 
 	<xsl:output method="xml" encoding="UTF-8" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" indent="yes" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>