diff -uNr samba-docs/Makefile samba-docs.build/Makefile
--- samba-docs/Makefile	2005-03-31 19:25:36 +0400
+++ samba-docs.build/Makefile	2005-04-17 20:23:45 +0400
@@ -230,7 +230,7 @@
 # Manpages
 $(MANPAGEDIR)/smb.conf.5.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
 
-$(SMBDOTCONFDOC)/parameters.all.xml: $(shell find $(SMBDOTCONFDOC) -type f -name '*.xml' -mindepth 2 | sort -t/ -k3 | xargs) $(SMBDOTCONFDOC)/generate-file-list.sh
+$(SMBDOTCONFDOC)/parameters.all.xml: $(shell find $(SMBDOTCONFDOC) -mindepth 2  -type f -name '*.xml' | sort -t/ -k3 | xargs) $(SMBDOTCONFDOC)/generate-file-list.sh
 	$(SMBDOTCONFDOC)/generate-file-list.sh $(SMBDOTCONFDOC) > $@
 
 $(SMBDOTCONFDOC)/parameters.global.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/generate-context.xsl
@@ -241,7 +241,8 @@
 
 $(MANDIR)/%: $(DOCBOOKDIR)/%.xml xslt/man.xsl
 	mkdir -p $(@D)
-	$(XSLTPROC) --output $@ xslt/man.xsl $<
+	$(XSLTPROC) --stringparam noreference 1 --xinclude --output man-tmp-file.xml xslt/expand-sambadoc.xsl $<
+	$(XSLTPROC) --output $@ xslt/man.xsl man-tmp-file.xml
 
 # Individual smb.conf parameters
 smb.conf-chunks: $(patsubst $(SMBDOTCONFDOC)/%.xml,$(HTMLDIR)/smb.conf/%.html,$(wildcard $(SMBDOTCONFDOC)/*/*.xml))
@@ -304,4 +305,4 @@
 
 # Always keep intermediate files if we can
 .SECONDARY:
-.PHONY: clean clobber archive release everything all
+.PHONY: clean clobber archive release everything all $(TARGETS)
diff -uNr samba-docs/Samba-HOWTO-Collection/index.xml samba-docs.build/Samba-HOWTO-Collection/index.xml
--- samba-docs/Samba-HOWTO-Collection/index.xml	2005-04-13 13:23:53 +0400
+++ samba-docs.build/Samba-HOWTO-Collection/index.xml	2005-04-17 16:46:28 +0400
@@ -21,11 +21,11 @@
 	</xi:include>
 
 	<?latex \cleardoublepage ?>
-
+<!--
 	<xi:include href="TOSHARG-preface.xml"/>
 
 	<?latex \cleardoublepage ?>
-
+-->
 	<xi:include href="TOSHARG-foreword-tridge.xml"/>
 
 	<?latex \cleardoublepage ?>
diff -uNr samba-docs/smbdotconf/filename/maxstatcachesize.xml samba-docs.build/smbdotconf/filename/maxstatcachesize.xml
--- samba-docs/smbdotconf/filename/maxstatcachesize.xml	2005-04-12 10:31:38 +0400
+++ samba-docs.build/smbdotconf/filename/maxstatcachesize.xml	2005-04-17 19:30:28 +0400
@@ -1,4 +1,4 @@
-<samba:parameter name="stat cache"
+<samba:parameter name="max stat cache size"
                  context="G"
                  developer="1"
 		 type="integer"
diff -uNr samba-docs/smbdotconf/generate-file-list.sh samba-docs.build/smbdotconf/generate-file-list.sh
--- samba-docs/smbdotconf/generate-file-list.sh	2004-07-04 12:18:10 +0400
+++ samba-docs.build/smbdotconf/generate-file-list.sh	2005-04-17 19:37:13 +0400
@@ -9,7 +9,7 @@
 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 -uNr samba-docs/xslt/latex.xsl samba-docs.build/xslt/latex.xsl
--- samba-docs/xslt/latex.xsl	2004-07-04 12:17:58 +0400
+++ samba-docs.build/xslt/latex.xsl	2005-04-17 21:50:38 +0400
@@ -93,6 +93,50 @@
 <xsl:param name="latex.babel.language">english</xsl:param>
 <xsl:param name="ulink.url">1</xsl:param>
 
+	<xsl:template match="book">
+		<!-- book:1: generate.latex.book.preamble -->
+		<xsl:call-template name="generate.latex.book.preamble"/>
+		<!-- book:2: output title information     -->
+		<xsl:text>\title{</xsl:text>
+			<xsl:apply-templates select="title"/>
+			<xsl:apply-templates select="subtitle"/>
+		<xsl:text>}&#10;</xsl:text>
+		<!-- book:3: output author information     -->
+		<xsl:text>\author{</xsl:text>
+		<xsl:choose>
+			<xsl:when test="bookinfo/authorgroup">
+				<xsl:apply-templates select="bookinfo/authorgroup"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:for-each select="bookinfo">
+					<xsl:call-template name="authorgroup"/>
+				</xsl:for-each>
+			</xsl:otherwise>
+		</xsl:choose>
+		<xsl:text>}&#10;</xsl:text>
+		<!-- book:4: dump any preamble after author  -->
+		<xsl:value-of select="$latex.book.afterauthor"/>
+		<!-- book:5: set some counters  -->
+		<xsl:text>&#10;\setcounter{tocdepth}{</xsl:text><xsl:value-of select="$toc.section.depth"/><xsl:text>}&#10;</xsl:text>
+		<xsl:text>&#10;\setcounter{secnumdepth}{</xsl:text><xsl:value-of select="$section.depth"/><xsl:text>}&#10;</xsl:text>
+		<!-- book:6: dump the begin document command  -->
+		<xsl:value-of select="$latex.book.begindocument"/>
+		<!-- book:7: include external Cover page if specified -->
+		<xsl:if test="$latex.titlepage.file != ''">
+			<xsl:text>&#10;\InputIfFileExists{</xsl:text><xsl:value-of select="$latex.titlepage.file"/>
+			<xsl:text>}{\typeout{WARNING: Using cover page </xsl:text>
+			<xsl:value-of select="$latex.titlepage.file"/>
+			<xsl:text>}}</xsl:text>
+		</xsl:if>
+		<!-- book:7b: maketitle and set up pagestyle -->
+		<xsl:value-of select="$latex.maketitle"/>
+		<!-- book:8: - APPLY TEMPLATES -->
+		<xsl:apply-templates select="bookinfo"/>
+		<xsl:call-template name="content-templates-rootid"/>
+		<!-- book:9:  call map.end -->
+		<xsl:call-template name="map.end"/>
+	</xsl:template>
+
 <xsl:template match="//title/filename|//title/command|//title/parameter|//title/constant">
   <xsl:variable name="content">
     <xsl:apply-templates/>
@@ -102,6 +146,5 @@
   </xsl:if>
 </xsl:template>
 
-
 </xsl:stylesheet>
 
diff -uNr samba-docs/xslt/man.xsl samba-docs.build/xslt/man.xsl
--- samba-docs/xslt/man.xsl	2004-05-17 22:46:16 +0400
+++ samba-docs.build/xslt/man.xsl	2005-04-17 20:43:56 +0400
@@ -122,10 +122,10 @@
   </xsl:call-template>
 </xsl:template>
 
-<xsl:template match="informalexample|screen|programlisting">
-  <xsl:text>.nf&#10;</xsl:text>
+<xsl:template match="example|informalexample|screen|programlisting">
+  <xsl:text>&#10;.nf&#10;</xsl:text>
   <xsl:apply-templates/>
-  <xsl:text>.fi&#10;</xsl:text>
+  <xsl:text>&#10;.fi&#10;</xsl:text>
 </xsl:template>
 
 <xsl:template match="//emphasis">
@@ -140,7 +140,7 @@
   </xsl:variable>
   <xsl:choose match="node()">
     <!-- Don't normalize-space() for verbatim paragraphs        -->
-    <xsl:when test="informalexample|screen|programlisting">
+    <xsl:when test="example|informalexample|screen|programlisting">
       <xsl:value-of select="$foo"/>
     </xsl:when>
     <xsl:otherwise>