6 files changed, 54 insertions, 46 deletions
diff --git a/docs/Makefile b/docs/Makefile
index f0bd5bec2a..de00a6ace5 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -119,7 +119,7 @@ $(TXTDIR)/%.txt: $(HTMLDIR)/%.html
 # Tex files
 %.tex: %/index.xml xslt/latex.xsl
 	mkdir -p $(@D)
-	$(XSLTPROC) --stringparam latex.imagebasedir "$*/" --xinclude --output $@ xslt/latex.xsl $<
+	$(XSLTPROC) $(DB2LATEX_ARGS) --stringparam latex.imagebasedir "$*/" --xinclude --output $@ xslt/latex.xsl $<
 
 latexfigures: $(LATEX_FIGURES)
 
diff --git a/docs/Makefile.settings.in b/docs/Makefile.settings.in
index ee67fd1133..ce83a1a28f 100644
--- a/docs/Makefile.settings.in
+++ b/docs/Makefile.settings.in
@@ -44,5 +44,6 @@ PEARSONDIR = $(OUTPUTDIR)/pearson
 TXTDIR = $(OUTPUTDIR)/textdocs
 HTMLDIR=$(OUTPUTDIR)/htmldocs
 PLUCKERDIR=$(OUTPUTDIR)/plucker
+DB2LATEX_ARGS = --stringparam latex.documentclass.book @LATEX_DOCUMENTCLASS_OPTIONS@
 
 TARGETS = @TARGETS@
diff --git a/docs/configure.in b/docs/configure.in
index 69dd067e2e..67a8d1aab4 100644
--- a/docs/configure.in
+++ b/docs/configure.in
@@ -4,6 +4,12 @@ AC_ARG_WITH(samba-sources,
 [ --with-samba-sources=DIR Specify path to Samba sources],
 [ test "$withval" && SPECIFIED_SOURCEDIR="$withval" ])
 
+LATEX_DOCUMENTCLASS_OPTIONS="letterpaper,11pt,openright,twoside"
+AC_ARG_ENABLE(prentice-hall,
+[ --enable-prentice-hall     Produce Prentice-Hall compatible output],
+[ test "$enableval" && LATEX_DOCUMENTCLASS_OPTIONS="$LATEX_DOCUMENTCLASS_OPTIONS,ph" ])
+AC_SUBST(LATEX_DOCUMENTCLASS_OPTIONS)
+
 DOC_BUILD_DATE=`date '+%d-%m-%Y'`
 AC_SUBST(DOC_BUILD_DATE)
 AC_SUBST(SAMBASOURCEDIR)
diff --git a/docs/smbdotconf/generate-file-list.sh b/docs/smbdotconf/generate-file-list.sh
index 0897332463..b7aa767fcd 100755
--- a/docs/smbdotconf/generate-file-list.sh
+++ b/docs/smbdotconf/generate-file-list.sh
@@ -9,7 +9,7 @@ OLD=`pwd`
 cd $DIR
 
 echo "<variablelist xmlns:xi=\"http://www.w3.org/2003/XInclude\">"
-for I in `find . -type f -name '*.xml' -mindepth 2 | sort -t/ -k3 | xargs`
+for I in `find -mindepth 2 . -type f -name '*.xml' | sort -t/ -k3 | xargs`
 do 
 	echo "<xi:include href='$I' parse='xml'/>"
 done
diff --git a/docs/xslt/latex.xsl b/docs/xslt/latex.xsl
index 9aed8c5ea0..a5b731dc32 100644
--- a/docs/xslt/latex.xsl
+++ b/docs/xslt/latex.xsl
@@ -44,23 +44,23 @@
 </xsl:template>
 
 <xsl:output method="text" encoding="ISO-8859-1" indent="yes"/>
-<xsl:param name="l10n.gentext.default.language" select="'en'"/>
-<xsl:param name="latex.example.caption.style"></xsl:param>
+<xsl:variable name="l10n.gentext.default.language" select="'en'"/>
+<xsl:variable name="latex.document.font">default</xsl:variable>
+<xsl:variable name="latex.example.caption.style"></xsl:variable>
 <xsl:variable name="latex.hyperref.param.pdftex">hyperfigures,hyperindex,citecolor=black,urlcolor=black,filecolor=black,linkcolor=black,menucolor=red,pagecolor=black</xsl:variable>
 <xsl:variable name="admon.graphics.path">xslt/figures</xsl:variable>
 <xsl:variable name="latex.use.tabularx">1</xsl:variable>
 <xsl:variable name="latex.fancyhdr.lh"></xsl:variable>
 <xsl:variable name="latex.use.fancyhdr"></xsl:variable>
 <xsl:variable name="latex.use.parskip">1</xsl:variable>
-<!--<xsl:variable name="latex.use.ltxtable">1</xsl:variable>-->
+<xsl:variable name="latex.book.varsets" select="''"/>
 <xsl:variable name="latex.hyphenation.tttricks">1</xsl:variable>
 <xsl:variable name="latex.titlepage.file"></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.documentclass">sambadoc</xsl:param>
-<xsl:param name="latex.documentclass.book">letterpaper,10.5pt,openright,twoside</xsl:param>
-<xsl:param name="latex.babel.language">english</xsl:param>
+<xsl:variable name="latex.documentclass">sambadoc</xsl:variable>
+<xsl:variable name="latex.babel.language">english</xsl:variable>
 <xsl:variable name="ulink.footnotes" select="1"/>
 <xsl:variable name="ulink.show" select="0"/>
 
diff --git a/docs/xslt/latex/sambadoc.cls b/docs/xslt/latex/sambadoc.cls
index 37ade5d501..ad88f5d2d5 100644
--- a/docs/xslt/latex/sambadoc.cls
+++ b/docs/xslt/latex/sambadoc.cls
@@ -1,14 +1,15 @@
 %
-% $Id: sambadoc.cls,v 1.4 2003/12/11 19:30:50 jelmer Exp $
+% $Id$
 %
 
 % phstyle.cls -- Macros for formatting Prentice-Hall Books
 %               -- Compiled by J.K. Shultis, Dec. 1993
 % 		-- Modified and enhanced for LaTeX2e mdh/rlm 1997/02
 %       -- Style Modifications Lori Hughes June 2002 
+%       -- Modifications for Samba by Jelmer Vernooij 2003-2005
 
 \NeedsTeXFormat{LaTeX2e}%
-\ProvidesClass{sambadoc}[1997/02/20 Prentice Hall Book Class, February 1997]
+\ProvidesClass{sambadoc}[2005/06/13 Samba Documentation class]
 
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}}
 
@@ -458,46 +459,12 @@ page \thepage \space undefined}}%
 
 \def\l@example{\noindent\@dottedtocline{1}{0em}{3.5em}}
 
-\parskip 1.5ex
-\parindent 0pt
-
 \renewcommand\listfigurename{\uppercase{List Of Figures}}
 \renewcommand\listtablename{\uppercase{List Of Tables}}
 
-\setlength{\emergencystretch}{0cm}
-\cleardoublepage
-\pagenumbering{roman}
-
-\setcounter{page}{2}
-\setcounter{totalnumber}{8}
-\setcounter{bottomnumber}{3}
-\setcounter{topnumber}{3}
-\renewcommand{\textfraction}{0.1}
-\renewcommand{\topfraction}{1.0}
-\renewcommand{\bottomfraction}{1.0}
-
-\usepackage[twoside]{geometry}
-
-
-\geometry{%
-paperwidth=7in,
-paperheight=9.25in,
-lmargin=.75in,
-rmargin=.75in,
-bmargin=.625in,
-tmargin=.625in,
-width=5.5in,
-height=7.525in, %7.3
-marginparwidth=0.35in,
-headheight=0.2in,
-headsep=.25in,
-footskip=.025in}
-
-\setlength{\headwidth}{\textwidth}
-
 % smb.conf syntax highlighting
-\usepackage{listings}
-\usepackage{xcolor}
+\RequirePackage{listings}
+\RequirePackage{xcolor}
 
 \lstdefinelanguage{smbconf}{
 	morecomment=[l]{\#},
@@ -516,3 +483,37 @@ footskip=.025in}
 
 \newcommand{\smbconfsection}[1]{\emph{#1}}
 \newcommand{\smbconfoption}[1]{\index{#1}\emph{#1}}
+
+\setlength{\emergencystretch}{0cm}
+
+\ifStr@ph
+	\PassOptionsToPackage{%
+	twoside,dvips,
+	paperwidth=7in,
+	paperheight=9.25in,
+	lmargin=.75in,
+	rmargin=.75in,
+	bmargin=.625in,
+	tmargin=.625in,
+	width=5.5in,
+	height=7.525in, %7.3
+	marginparwidth=0.35in,
+	headheight=0.2in,
+	headsep=.25in,
+	footskip=.025in}{geometry}
+\fi
+
+\setlength{\headwidth}{\textwidth}
+
+\cleardoublepage
+\pagenumbering{roman}
+
+\setcounter{page}{2}
+\setcounter{totalnumber}{8}
+\setcounter{bottomnumber}{3}
+\setcounter{topnumber}{3}
+\renewcommand{\textfraction}{0.1}
+\renewcommand{\topfraction}{1.0}
+\renewcommand{\bottomfraction}{1.0}
+
+%