Merge over book changes into 3_0 CVS

(This used to be commit d8fe4a81fb0d4972b2331b3d5fc4890244b44c33)

3 files changed, 18 insertions, 19 deletions

diff --git a/docs/docbook/xslt/expand-sambadoc.xsl b/docs/docbook/xslt/expand-sambadoc.xsl
index 4030c8b6e6..48240f38d7 100644
--- a/docs/docbook/xslt/expand-sambadoc.xsl
+++ b/docs/docbook/xslt/expand-sambadoc.xsl
@@ -58,10 +58,10 @@
 	<!ENTITY % globalentities SYSTEM 'global.ent'> %globalentities;
  ]>
 </xsl:text>
-<xsl:element name="book"><!-- This shouldn't be book, but something more general, a variable -FIXME-->
+<xsl:copy>
     <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
     <xsl:apply-templates/>
-</xsl:element>
+</xsl:copy>
 </xsl:template>
 
 
@@ -113,10 +113,11 @@
 	</xsl:element>
   </xsl:element>
 		
+<!-- FIXME: Do this only when smb.conf is included 
   <xsl:element name="link">
 	  <xsl:attribute name="linkend">
 	  	<xsl:value-of select="translate(translate(string(name),' ',''),'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
-	  </xsl:attribute>
+	  </xsl:attribute>-->
 
 	  <xsl:element name="parameter">
 	    <xsl:attribute name="moreinfo">
@@ -131,7 +132,8 @@
 			<xsl:value-of select="value"/>
 		</xsl:when>
 	  </xsl:choose>
-  </xsl:element>
+	  <!--
+  </xsl:element>-->
 </xsl:template>
 
 <!-- FIXME: Needs extension sometime -->
@@ -283,16 +285,6 @@
 		<xsl:apply-templates/>
 		
 	</xsl:element>
-	<xsl:if test="$duplicate_ulinks='brackets' and @noescape=''">
-		<xsl:text> (</xsl:text>
-		<xsl:value-of select="@url"/>
-		<xsl:text>)</xsl:text>
-	</xsl:if>
-	<xsl:if test="$duplicate_ulinks='footnote' and @noescape=''">
-		<xsl:element name="footnote">
-			<xsl:value-of select="@url"/>
-		</xsl:element>
-	</xsl:if>
 </xsl:template>
 
 
diff --git a/docs/docbook/xslt/latex.xsl b/docs/docbook/xslt/latex.xsl
index 8fafd5d140..dc8861b561 100644
--- a/docs/docbook/xslt/latex.xsl
+++ b/docs/docbook/xslt/latex.xsl
@@ -1,18 +1,21 @@
 <?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="db2latex/docbook.xsl"/>
-<xsl:import href="table.mod.xsl"/>
-<xsl:import href="lists.mod.xsl"/>
 
 <xsl:output method="text" encoding="ISO-8859-1" indent="yes"/>
-<xsl:variable name="latex.documentclass">xslt/latex/sambadoc</xsl:variable>
-<xsl:variable name="latex.documentclass.common">english,final,titlepage,parskip</xsl:variable>
+<xsl:variable name="l10n.gentext.language">en</xsl:variable>
+<xsl:variable name="latex.documentclass">sambadoc</xsl:variable>
+<xsl:variable name="latex.documentclass.common">english,final,titlepage,parskip,<xsl:value-of select="$papersize"/>,<xsl:value-of select="$fontsize"/>pt</xsl:variable>
 <xsl:variable name="latex.documentclass.book"></xsl:variable>
+<xsl:variable name="latex.generate.indexterm">1</xsl:variable>
 <xsl:variable name="latex.hyperref.param.pdftex">hyperfigures,hyperindex,citecolor=blue,urlcolor=blue</xsl:variable>
 <xsl:variable name="latex.document.font">default</xsl:variable>
 <xsl:variable name="latex.admonition.path">xslt/figures</xsl:variable>
 <xsl:variable name="latex.hyphenation.tttricks">1</xsl:variable>
 <xsl:variable name="latex.use.tabularx">1</xsl:variable>
+<xsl:template name="latex.thead.row.entry">
+<xsl:text>{\bfseries </xsl:text><xsl:apply-templates/><xsl:text>}</xsl:text>
+</xsl:template>
 <xsl:param name="latex.babel.language">english</xsl:param>
 <xsl:param name="ulink.url">1</xsl:param>
 
@@ -31,5 +34,9 @@
   </xsl:if>
 </xsl:template>
 
+<xsl:template name="latex.thead.row.entry">
+<xsl:text>{\bfseries </xsl:text><xsl:apply-templates/><xsl:text>}</xsl:text>
+</xsl:template>
+
 </xsl:stylesheet>
 
diff --git a/docs/docbook/xslt/latex/sambadoc.cls b/docs/docbook/xslt/latex/sambadoc.cls
index 9f3caa5482..fcea11992f 100644
--- a/docs/docbook/xslt/latex/sambadoc.cls
+++ b/docs/docbook/xslt/latex/sambadoc.cls
@@ -2,7 +2,7 @@
 %%-- RC Thesis 
 %%---------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{xslt/latex/sambadoc}
+\ProvidesClass{sambadoc}
 
 %%---------------------------------------------------
 %%-- Load the base class and modify current macros.