Add some updates necessary to build the 3.0 docs (forgot them last night).

(This used to be commit 72434db17a86a8c277ca989ac858cb54cbc815dc)

7 files changed, 61 insertions, 19 deletions

diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in
index 7169cc90c4..030729cec4 100644
--- a/docs/docbook/Makefile.in
+++ b/docs/docbook/Makefile.in
@@ -126,18 +126,18 @@ $(TXTDIR)/%.txt: %.xml
 	
 # Adobe PDF files
 $(PDFDIR)/%.pdf: %.tex
-	$(PDFLATEX) $<
-	$(PDFLATEX) $<
-	$(PDFLATEX) $<
+	-$(PDFLATEX) $<
+	-$(PDFLATEX) $<
+	-$(PDFLATEX) $<
 	mv $(patsubst %.tex,%.pdf,$<) $@
 
 epsimages: $(PROJDOC_IMAGES_EPS)
 
 # DVI files
 $(DVIDIR)/%.dvi: %.tex epsimages
-	$(LATEX) $<
-	$(LATEX) $< 
-	$(LATEX) $< 
+	-$(LATEX) $<
+	-$(LATEX) $< 
+	-$(LATEX) $< 
 	mv $(patsubst %.tex,%.dvi,$<) $@
 
 %.eps: %.png
diff --git a/docs/docbook/projdoc/AccessControls.xml b/docs/docbook/projdoc/AccessControls.xml
index 72348d44cd..6d3e494226 100644
--- a/docs/docbook/projdoc/AccessControls.xml
+++ b/docs/docbook/projdoc/AccessControls.xml
@@ -346,7 +346,7 @@ drwsrwsrwx    2 maryo   gnomes       48 2003-05-12 22:29 muchado08
 	</para>
 
 	<para>
-	An overview of the permissions field can be found in <link linkend="access1"/>.
+		An overview of the permissions field can be found in <link linkend="access1">the image below</link>.
 	</para>
 
 	<image id="access1" scale="40"><imagedescription>Overview of UNIX permissions field.</imagedescription><imagefile>access1</imagefile></image>
@@ -429,7 +429,7 @@ Before using any of the following options, please refer to the man page for &smb
 	</para>
 
 	<para>
-	<link linkend="ugbc"/> enumerates these controls.
+		<link linkend="ugbc">The table below</link> enumerates these controls.
 	</para>
 
 	<table frame='all' pgwide='0' id="ugbc"><title>User and Group Based Controls</title>
@@ -527,7 +527,7 @@ Before using any of the following options, please refer to the man page for &smb
 	</para>
 
 	<para>
-	Refer to <link linkend="fdpbc"/> for information regarding the parameters that may be used to affect file and
+		Refer to <link linkend="fdpbc">the table below</link> for information regarding the parameters that may be used to affect file and
 	directory permission-based access controls.
 	</para>
 
@@ -619,7 +619,7 @@ Before using any of the following options, please refer to the man page for &smb
 
 	<para>
 	The following are documented because of the prevalence of administrators creating inadvertent barriers to file
-	access by not understanding the full implications of &smb.conf; file settings. See <link linkend="mcoc"/>.
+	access by not understanding the full implications of &smb.conf; file settings. See <link linkend="mcoc">the table below</link>.
 	</para>
 
 	<table frame='all' id="mcoc"><title>Other Controls</title>
diff --git a/docs/docbook/projdoc/Bugs.xml b/docs/docbook/projdoc/Bugs.xml
index 15bd14ac1a..a5149342a0 100644
--- a/docs/docbook/projdoc/Bugs.xml
+++ b/docs/docbook/projdoc/Bugs.xml
@@ -55,7 +55,7 @@ file for correct syntax.
 </para>
 
 <para>
-Have you looked through <link linkend="diagnosis"/>? This is extremely important.
+	Have you looked through <link linkend="diagnosis">diagnosis</link>? This is extremely important.
 </para>
 
 <para>
diff --git a/docs/docbook/projdoc/CUPS-printing.xml b/docs/docbook/projdoc/CUPS-printing.xml
index 5a8e9f5846..ece3b2acd1 100644
--- a/docs/docbook/projdoc/CUPS-printing.xml
+++ b/docs/docbook/projdoc/CUPS-printing.xml
@@ -151,7 +151,7 @@ libcups.so.2 =&gt; /usr/lib/libcups.so.2 (0x40123000)
 		<title>Simple &smb.conf; Settings for CUPS</title>
 
 		<para>
-		To summarize, <link linkend="cups-exam-simple"/> shows simplest printing-related setup for &smb.conf; to enable basic CUPS support:
+			To summarize, <link linkend="cups-exam-simple">the example below</link> shows simplest printing-related setup for &smb.conf; to enable basic CUPS support:
 		</para>
 
 		<para><smbconfexample id="cups-exam-simple">
@@ -195,7 +195,7 @@ libcups.so.2 =&gt; /usr/lib/libcups.so.2 (0x40123000)
 	<title>More Complex CUPS &smb.conf; Settings</title>
 
 	<para>
-	<link linkend="overridesettings"/> is a slightly more complex printing-related setup
+		<link linkend="overridesettings">The example below</link> is a slightly more complex printing-related setup
 	for &smb.conf;. It enables general CUPS printing
 	support for all printers, but defines one printer share, which is set
 	up differently. 
@@ -1232,7 +1232,7 @@ that generates PostScript from image formats. The <parameter>imagetoraster</para
 filter is used to convert directly from image to raster, without the
 intermediate PostScript stage. It is used more often than the above
 mentioned pre-filters. A summarizing flowchart of image file
-filtering is shown in <link linkend="small8"/>.
+filtering is shown in <link linkend="small8">the figure below</link>.
 </para>
 
 <para>
@@ -1656,7 +1656,7 @@ output device.
 CUPS by default ships only a few generic PPDs, but they are good for
 several hundred printer models. You may not be able to control
 different paper trays, or you may get larger margins than your
-specific model supports. See <link linkend="cups-ppds"/> for summary information.
+specific model supports. See <link linkend="cups-ppds">the figure below</link> for summary information.
 </para>
 
 <table frame="all" id="cups-ppds">
@@ -1773,7 +1773,7 @@ installation. Therefore the printfile bypasses the <parameter>pstoraster</parame
 (and also bypasses the CUPS-raster-drivers
 <parameter>rastertosomething</parameter>). After Ghostscript finished its rasterization,
 <parameter>cupsomatic</parameter> hands the rendered file directly to the CUPS backend. The
-flowchart in <link linkend="cupsomatic-dia"/> illustrates the difference between native CUPS
+flowchart in <link linkend="cupsomatic-dia">the image below</link> illustrates the difference between native CUPS
 rendering and the <parameter>Foomatic/cupsomatic</parameter> method.
 </para>
 </sect2>
@@ -1817,7 +1817,7 @@ backend, which transfers the job to the printers.</para></listitem>
 </itemizedlist>
 
 <para>
-	The resulting filter chain, therefore, is as drawn in <link linkend="pdftosocket"/>.
+	The resulting filter chain, therefore, is as drawn in <link linkend="pdftosocket">the figure below</link>.
 </para>
 
 <image id="pdftosocket"><imagefile>pdftosocket</imagefile><imagedescription>PDF to socket chain.</imagedescription></image>
@@ -1866,7 +1866,7 @@ which transfers the job to the printers.</para></listitem>
 </itemizedlist>
 
 <para>
-The resulting filter chain therefore is as drawn in <link linkend="pdftoepsonusb"/>.
+	The resulting filter chain therefore is as drawn in <link linkend="pdftoepsonusb">the figure below</link>.
 </para>
 
 <image id="pdftoepsonusb"><imagefile>pdftoepsonusb</imagefile><imagedescription>PDF to USB chain.</imagedescription></image>
@@ -1994,7 +1994,7 @@ output.</para></listitem>
 </itemizedlist>
 
 <para>
-Both print paths are shown in the flowcharts in <link linkend="small11"/> and <link linkend="small12"/>.
+	Both print paths are shown in the flowcharts in the figures below.
 </para>
 </sect2>
 
diff --git a/docs/docbook/xslt/expand-sambadoc.xsl b/docs/docbook/xslt/expand-sambadoc.xsl
index 2749fdf3e9..098512ce1d 100644
--- a/docs/docbook/xslt/expand-sambadoc.xsl
+++ b/docs/docbook/xslt/expand-sambadoc.xsl
@@ -301,4 +301,11 @@
 </xsl:template>
 
 
+<xsl:template match="filterline">
+	<xsl:element name="programlisting">
+		<xsl:apply-templates/>
+	</xsl:element>
+</xsl:template>
+
+
 </xsl:stylesheet>
diff --git a/docs/docbook/xslt/html-common.xsl b/docs/docbook/xslt/html-common.xsl
index dce900ef67..eeb7d5d6b4 100644
--- a/docs/docbook/xslt/html-common.xsl
+++ b/docs/docbook/xslt/html-common.xsl
@@ -3,6 +3,40 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
+	<xsl:template match="ulink">
+	<xsl:element name="ulink">
+		<xsl:attribute name="url">
+			<xsl:value-of select="@url"/>
+		</xsl:attribute>
+		<xsl:choose>
+			<xsl:when test=". != ''">
+				<xsl:value-of select="."/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="@url"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:element>
+</xsl:template>
+
+
+
+<xsl:template match="link">
+	<xsl:element name="link">
+		<xsl:attribute name="linkend">
+			<xsl:value-of select="@linkend"/>
+		</xsl:attribute>
+		<xsl:choose>
+			<xsl:when test=". != ''">
+				<xsl:value-of select="."/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="@linkend"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:element>
+</xsl:template>
+
 <xsl:param name="base.dir" select="'../htmldocs/'"/>
 <xsl:param name="bridgehead.in.toc" select="1"/>
 <xsl:param name="citerefentry.link" select="'1'"/>
diff --git a/docs/docbook/xslt/html.xsl b/docs/docbook/xslt/html.xsl
index 8481a86d24..1a5fe1bc65 100644
--- a/docs/docbook/xslt/html.xsl
+++ b/docs/docbook/xslt/html.xsl
@@ -6,4 +6,5 @@
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
 <xsl:import href="html-common.xsl"/>
 
+
 </xsl:stylesheet>