Final update. Links work now as well

(This used to be commit 336483342c4b6a2ff2579e7b903362f408385b09)

18 files changed, 92 insertions, 104 deletions

diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in
index 556e9f9cc1..e3538db578 100644
--- a/docs/docbook/Makefile.in
+++ b/docs/docbook/Makefile.in
@@ -85,10 +85,10 @@ ps: $(PSDIR) $(PSDIR)/Samba-HOWTO-Collection.ps $(PSDIR)/Samba-Developers-Guide.
 txt: $(TXTDIR) $(TXTDIR)/Samba-HOWTO-Collection.txt $(TXTDIR)/Samba-Developers-Guide.txt
 htmlman: $(HTMLDIR) $(MANPAGES_HTML) CSS
 htmlfaq: $(HTMLDIR) CSS
-	@$(XSLTPROC) --stringparam base.dir "$(FAQDIR)/" --stringparam root.filename samba-faq xslt/html-chunk.xsl $(FAQPROJDOC)/sambafaq.xml
+	$(XSLTPROC) --stringparam base.dir "$(FAQDIR)/" --stringparam root.filename samba-faq xslt/html-chunk.xsl $(FAQPROJDOC)/sambafaq.xml
 html-single: $(HTMLDIR) CSS $(HTMLDIR)/Samba-HOWTO-Collection.html  $(HTMLDIR)/Samba-Developers-Guide.html
 html: $(HTMLDIR) CSS Samba-HOWTO-Collection.xml
-	@$(XSLTPROC) -o $(HTMLDIR) xslt/html-chunk.xsl Samba-HOWTO-Collection.xml
+	$(XSLTPROC) -o $(HTMLDIR) xslt/html-chunk.xsl Samba-HOWTO-Collection.xml
 manpages: $(MANDIR) $(MANPAGES)
 tex: Samba-HOWTO-Collection.tex Samba-Developers-Guide.tex
 
@@ -100,32 +100,28 @@ Samba-Developers-Guide.xml: $(DEVDOC)/dev-doc.xml $(DEVDOC_DEPS)
 
 $(PROJDOC)/attributions.xml: $(PROJDOC)/samba-doc.xml
 	@echo > $@ # Make sure we don't get recursive dependencies, etc!
-	@echo "Generating attributions page"
-	@$(XSLTPROC) --output $@ xslt/generate-attributions.xsl $<
+	$(XSLTPROC) --output $@ xslt/generate-attributions.xsl $<
 
 $(DEVDOC)/attributions.xml: $(DEVDOC)/dev-doc.xml
 	@echo > $@ # Make sure we don't get recursive dependencies, etc!
-	@echo "Generating attributions page"
-	@$(XSLTPROC) --output $@ xslt/generate-attributions.xsl $<
+	$(XSLTPROC) --output $@ xslt/generate-attributions.xsl $<
 
 clean: 
 	@rm -f *.xml $(MANPAGES) $(TXTDIR)/*.txt $(PSDIR)/*.ps $(PDFDIR)/*.pdf 
 	@rm -f $(SMBDOTCONFDOC)/parameters.*.xml $(DVIDIR)/*.dvi
 	@rm -f samba-doc.* dev-doc.* $(PROJDOC)/attributions.xml $(DEVDOC)/attributions.xml
-	@rm -f $(IMAGEPROJDIR)/*.eps $(MANPROJDIR)/smb.conf.5.xml
+	@rm -f $(IMAGEPROJDIR)/*.eps $(MANPROJDOC)/smb.conf.5.xml
 
 # Text files
 $(TXTDIR):
 	mkdir $(TXTDIR)
 
 $(TXTDIR)/%.txt: %.xml
-	@echo "Converting $< to plain text..."
-	@$(XMLTO) txt -o $(TXTDIR) $< > $@
+	$(XMLTO) txt -o $(TXTDIR) $< > $@
 
 # Tex files
 %.tex: %.xml
-	@echo "Converting $< to LaTeX..."
-	@$(XSLTPROC) --output $@ xslt/latex.xsl $<
+	$(XSLTPROC) --output $@ xslt/latex.xsl $<
 	
 # Adobe PDF files
 $(PDFDIR)/%.pdf: %.tex
@@ -144,7 +140,7 @@ $(DVIDIR)/%.dvi: %.tex epsimages
 	mv $(patsubst %.tex,%.dvi,$<) $@
 
 %.eps: %.png
-	@$(PNGTOPNM) $< | $(PNMTOPS) > $@
+	$(PNGTOPNM) $< | $(PNMTOPS) > $@
 
 # PostScript files
 $(PSDIR)/%.ps: $(DVIDIR)/%.dvi
@@ -153,20 +149,20 @@ $(PSDIR)/%.ps: $(DVIDIR)/%.dvi
 # Single large HTML files
 
 $(HTMLDIR):
-	@mkdir $(HTMLDIR)
+	mkdir $(HTMLDIR)
 
 CSS: $(HTMLDIR) xslt/html/samba.css
-	@cp xslt/html/samba.css $(HTMLDIR)/
+	cp xslt/html/samba.css $(HTMLDIR)/
 
 $(HTMLDIR)/Samba-HOWTO-Collection.html: Samba-HOWTO-Collection.xml $(PROJDOC_DEPS) $(PROJDOC_IMAGES_PNG)
-	@$(XSLTPROC) --output $@ xslt/html.xsl $<
+	$(XSLTPROC) --output $@ xslt/html.xsl $<
 
 $(HTMLDIR)/Samba-Developers-Guide.html: Samba-Developers-Guide.xml $(DEVDOC_DEPS)
-	@$(XSLTPROC) --output $@ xslt/html.xsl $<
+	$(XSLTPROC) --output $@ xslt/html.xsl $<
 
 
 $(HTMLDIR)/%.html: $(MANPROJDOC)/%.xml
-	@$(XSLTPROC) --output $@ xslt/html.xsl $<
+	$(XSLTPROC) xslt/expand-sambadoc.xsl $< | $(XSLTPROC) --output $@ xslt/html.xsl -
 
 # Manpages
 $(SMBDOTCONFDOC)/parameters.all.xml: $(SMBDOTCONFDOC)/generate-file-list.sh
@@ -190,21 +186,16 @@ $(SMBDOTCONFDOC)/parameters.service.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(S
 	generate-context.xsl parameters.all.xml && \
 	cd ..
 
-smb.conf.5.xml: $(SMBDOTCONFDOC)/smb.conf.5.xml $(SMBDOTCONFDOC)/parameters.all.xml \
+$(MANPROJDOC)/smb.conf.5.xml: $(SMBDOTCONFDOC)/smb.conf.5.xml $(SMBDOTCONFDOC)/parameters.all.xml \
  			$(SMBDOTCONFDOC)/parameters.global.xml $(SMBDOTCONFDOC)/parameters.service.xml 
-	@$(XSLTPROC) --xinclude --output $@ xslt/expand-sambadoc.xsl $<
-
-$(MANPROJDIR)/smb.conf.5.xml: smb.conf.5.xml
-	@cp $< $@
+	$(XSLTPROC) --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+	-ln -s global.ent $(MANPROJDOC)/global.ent
 
 $(MANDIR): 
 	mkdir $(MANDIR)
 
 $(MANDIR)/%: $(MANPROJDOC)/%.xml
-	@$(XSLTPROC) xslt/expand-sambadoc.xsl $< | $(XSLTPROC) xslt/man.xsl - > $@
-
-$(MANDIR)/smb.conf.5: smb.conf.5.xml
-	@$(XSLTPROC) xslt/man.xsl $< > $@
+	$(XSLTPROC) xslt/expand-sambadoc.xsl $< | $(XSLTPROC) xslt/man.xsl - > $@
 
 undocumented: $(SMBDOTCONFDOC)/parameters.all.xml
 	$(PERL) scripts/find_missing_doc.pl ../..
diff --git a/docs/docbook/devdoc/dev-doc.xml b/docs/docbook/devdoc/dev-doc.xml
index 9236b18986..7000d09c98 100644
--- a/docs/docbook/devdoc/dev-doc.xml
+++ b/docs/docbook/devdoc/dev-doc.xml
@@ -27,10 +27,6 @@
 <title>SAMBA Developers Guide</title>
 
 <bookinfo>
-	<author>
-		<surname>SAMBA Team</surname>
-	</author>
-	<address><email>samba@samba.org</email></address>
 <abstract>
 <para>
 <emphasis>Last Update</emphasis> : Fri Jun  6 00:45:54 CEST 2003
@@ -56,18 +52,13 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
 
 </abstract>
 
-<legalnotice>
-
-<formalpara>
+</bookinfo>
+<preface>
 	<title>Attributions</title>
 
-	<para>
 	&attributions-dev;
-	</para>
-</formalpara>
+</preface>
 	
-</legalnotice>
-</bookinfo>
 
 <!-- Contents -->
 <toc/>
diff --git a/docs/docbook/projdoc/AccessControls.xml b/docs/docbook/projdoc/AccessControls.xml
index 9789711c0e..344e51e5c0 100644
--- a/docs/docbook/projdoc/AccessControls.xml
+++ b/docs/docbook/projdoc/AccessControls.xml
@@ -322,7 +322,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 scale="40"><imagedescription>Overview of unix permissions field</imagedescription><imagefile>access1</imagefile></image>
diff --git a/docs/docbook/projdoc/CUPS-printing.xml b/docs/docbook/projdoc/CUPS-printing.xml
index 258132ddd9..945092d413 100644
--- a/docs/docbook/projdoc/CUPS-printing.xml
+++ b/docs/docbook/projdoc/CUPS-printing.xml
@@ -1836,7 +1836,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 image below</link>.
 </para>
 
 <image><imagefile>pdftosocket</imagefile><imagedescription>PDF to socket chain</imagedescription></image>
@@ -1883,7 +1883,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 image below</link>.
 </para>
 
 <image><imagefile>pdftoepsonusb</imagefile><imagedescription>PDF to USB chain</imagedescription></image>
@@ -2715,7 +2715,7 @@ Administrator privileges to do this.
 <indexterm><primary>rpcclient</primary><secondary>setdriver</secondary></indexterm>
 Once you have successfully downloaded the CUPS PostScript driver to a
 client, you can easily switch all printers to this one by proceeding
-as described in <link linkend="printing"/>: either change
+as described in <link linkend="printing">the printing chapter</link>: either change
 a driver for an existing printer by running the "Printer Properties"
 dialog, or use <command>rpcclient</command> with the
 <command>setdriver</command> sub-command.
diff --git a/docs/docbook/projdoc/DOMAIN_MEMBER.xml b/docs/docbook/projdoc/DOMAIN_MEMBER.xml
index 9a7f2c1628..df0711058f 100644
--- a/docs/docbook/projdoc/DOMAIN_MEMBER.xml
+++ b/docs/docbook/projdoc/DOMAIN_MEMBER.xml
@@ -431,7 +431,7 @@ with the version of Windows:
 	<title>Samba</title>
 
 	<para>Joining a Samba client to a domain is documented in 
-	<link linkend="domain-member-server"></link>.
+		<link linkend="domain-member-server">the domain member chapter</link>.
 	</para>
 </sect3>
 
@@ -460,7 +460,7 @@ Server, etc.
 </para>
 
 <para>
-Please refer to <link linkend="samba-pdc"></link>
+Please refer to <link linkend="samba-pdc">the chapter on setting up a PDC</link>
 for more information regarding how to create a domain
 machine account for a domain member server as well as for information
 regarding how to enable the Samba domain member machine to join the domain and
@@ -644,7 +644,7 @@ NT server in the same way as a Windows 95 or Windows 98 server would.
 </para>
 
 <para>
-Please refer to <link linkend="winbind"></link> for information on a system
+	Please refer to <link linkend="winbind">the chapter on winbind</link> for information on a system
 to automatically assign UNIX uids and gids to Windows NT Domain users and groups.
 </para>
 
diff --git a/docs/docbook/projdoc/Integrating-with-Windows.xml b/docs/docbook/projdoc/Integrating-with-Windows.xml
index da606789d9..6beebfb892 100644
--- a/docs/docbook/projdoc/Integrating-with-Windows.xml
+++ b/docs/docbook/projdoc/Integrating-with-Windows.xml
@@ -595,7 +595,7 @@ of the WINS server.
 </para>
 
 <para>For information about setting up Samba as a WINS server, read 
-<link linkend="NetworkBrowsing"/>.</para>
+	<link linkend="NetworkBrowsing">the chapter on network browsing</link>.</para>
 
 </sect2>
 </sect1>
diff --git a/docs/docbook/projdoc/NetworkBrowsing.xml b/docs/docbook/projdoc/NetworkBrowsing.xml
index b5d226efed..2db154be33 100644
--- a/docs/docbook/projdoc/NetworkBrowsing.xml
+++ b/docs/docbook/projdoc/NetworkBrowsing.xml
@@ -1289,7 +1289,7 @@ Samba is capable of cross subnet browsing when configured correctly.
 </para>
 
 <para>
-	Consider a network set up as <link linkend="browsing1"/>.
+	Consider a network set up as <link linkend="browsing1">in the diagram below</link>.
 </para>
 
 <image><imagedescription>Cross subnet browsing example</imagedescription><imagefile>browsing1</imagefile></image>
diff --git a/docs/docbook/projdoc/Samba-BDC-HOWTO.xml b/docs/docbook/projdoc/Samba-BDC-HOWTO.xml
index b1ce4660be..9800c508d5 100644
--- a/docs/docbook/projdoc/Samba-BDC-HOWTO.xml
+++ b/docs/docbook/projdoc/Samba-BDC-HOWTO.xml
@@ -9,7 +9,7 @@
 
 <para>
 Before you continue reading in this section, please make sure that you are comfortable
-with configuring a Samba Domain Controller as described in <link linkend="samba-pdc"></link>.
+with configuring a Samba Domain Controller as described in <link linkend="samba-pdc">chapter on setting up Samba as a PDC</link>.
 </para>
 
 <sect1>
@@ -239,7 +239,7 @@ parameters in the <smbconfsection>[global]</smbconfsection>-section of the &smb.
 Several other things like a <smbconfsection>[homes]</smbconfsection> and a
 <smbconfsection>[netlogon]</smbconfsection> share also need to be set along with
 settings for the profile path, the users home drive, etc.. This will not be covered in this
-chapter, for more information please refer to <link linkend="samba-pdc"></link>.
+chapter, for more information please refer to <link linkend="samba-pdc">the chapter about samba as a PDC</link>.
 </para>
 
 </sect3>
diff --git a/docs/docbook/projdoc/Samba-PDC-HOWTO.xml b/docs/docbook/projdoc/Samba-PDC-HOWTO.xml
index ae440a4ee6..78a875792c 100644
--- a/docs/docbook/projdoc/Samba-PDC-HOWTO.xml
+++ b/docs/docbook/projdoc/Samba-PDC-HOWTO.xml
@@ -98,7 +98,7 @@ Network clients of an MS Windows Domain security environment must be Domain memb
 able to gain access to the advanced features provided. Domain membership involves more than just
 setting the workgroup name to the Domain name. It requires the creation of a Domain trust account
 for the workstation (called a machine account). Please refer to the chapter on 
-<link linkend="domain-member"></link> for more information.
+<link linkend="domain-member">setting up samba as a domain member</link> for more information.
 </para></note>
 
 <para>
@@ -165,15 +165,15 @@ in Samba since approximately the Samba-1.9.15 series.
 <para>
 Samba-3 has an implementation of group mapping between Windows NT groups
 and UNIX groups (this is really quite complicated to explain in a short space). This is 
-discussed more fully in <link linkend="groupmapping"></link>.
+discussed more fully in <link linkend="groupmapping">the chapter on group mapping</link>.
 </para>
 
 <para>
 Samba-3, like an MS Windows NT4 PDC or a Windows 200x Active Directory, needs to store
 user and machine trust account information in a suitable backend data store. 
-Refer <link linkend="machine-trust-accounts"></link>. With Samba-3 there can be multiple
+Refer <link linkend="machine-trust-accounts">to the section on machine trust accounts</link>. With Samba-3 there can be multiple
 back-ends for this. A complete discussion of account database backends can be found in
-<link linkend="passdb"></link>.
+<link linkend="passdb">the chapter on Account Information Databases</link>.
 </para>
 
 </sect1>
@@ -224,7 +224,7 @@ LDAP based user and machine account back end.
 <para>
 New to Samba-3 is the ability to use a back-end database that holds the same type of data as
 the NT4 style SAM (Security Account Manager) database (one of the registry files).
-<footnote><para>See also <link linkend="passdb"/>.</para></footnote>
+<footnote><para>See also <link linkend="passdb">the chapter on Account Information Databases</link>.</para></footnote>
 </para>
 
 <para>
@@ -315,7 +315,7 @@ Domain it triggers a machine password change.
 When running a Domain all MS Windows NT / 200x / XP Professional clients should be configured
 as full Domain Members - IF A SECURE NETWORK IS WANTED. If the machine is NOT made a member of the
 Domain, then it will operate like a workgroup (stand-alone) machine. Please refer to 
-<link linkend="domain-member"></link> for information regarding HOW to make your MS Windows clients Domain members.
+<link linkend="domain-member">the chapter on domain membership</link> for information regarding HOW to make your MS Windows clients Domain members.
 </para></note>
 
 <para>
@@ -326,8 +326,8 @@ NT4 / 200x / XP clients.
 <itemizedlist>
 	<listitem><para>Configuration of basic TCP/IP and MS Windows Networking</para></listitem>
 	<listitem><para>Correct designation of the Server Role (<smbconfoption><name>security</name><value>user</value></smbconfoption>)</para></listitem>
-	<listitem><para>Consistent configuration of Name Resolution (See chapter on <link linkend="NetworkBrowsing"></link> and on
-	<link linkend="integrate-ms-networks"></link>)</para></listitem>
+	<listitem><para>Consistent configuration of Name Resolution (See chapter on <link linkend="NetworkBrowsing">Network Browsing</link> and on
+	<link linkend="integrate-ms-networks">Integrating Unix into Windows networks</link>)</para></listitem>
 	<listitem><para>Domain logons for Windows NT4 / 200x / XP Professional clients</para></listitem>
 	<listitem><para>Configuration of Roaming Profiles or explicit configuration to force local profile usage</para></listitem>
 	<listitem><para>Configuration of Network/System Policies</para></listitem>
@@ -355,8 +355,8 @@ The following provisions are required to serve MS Windows 9x / Me Clients:
 
 <note><para>
 Roaming Profiles and System/Network policies are advanced network administration topics
-that are covered in the <link linkend="ProfileMgmt"></link> and 
-<link linkend="PolicyMgmt"></link> chapters of this document.  However, these are not
+that are covered in the <link linkend="ProfileMgmt">Profile Management</link> and 
+<link linkend="PolicyMgmt">Policy Management</link> chapters of this document.  However, these are not
 necessarily specific to a Samba PDC as much as they are related to Windows NT networking concepts.
 </para></note>
 
@@ -388,7 +388,7 @@ A Domain Controller is an SMB/CIFS server that:
 For Samba to provide these is rather easy to configure. Each Samba Domain Controller must provide
 the NETLOGON service which Samba calls the <smbconfoption><name>domain logons</name></smbconfoption> functionality
 (after the name of the parameter in the &smb.conf; file). Additionally, one (1) server in a Samba-3
-Domain must advertise itself as the domain master browser<footnote><para>See also <link linkend="NetworkBrowsing"/></para></footnote>. This causes the Primary Domain Controller
+Domain must advertise itself as the domain master browser<footnote><para>See also <link linkend="NetworkBrowsing">the chapter about network browsing</link></para></footnote>. This causes the Primary Domain Controller
 to claim domain specific NetBIOS name that identifies it as a domain master browser for its given
 domain/workgroup. Local master browsers in the same domain/workgroup on broadcast-isolated subnets
 then ask for a complete copy of the browse list for the whole wide area network. Browser clients
@@ -404,8 +404,8 @@ instead of just the list for their broadcast-isolated subnet.
 
 <para>
 The first step in creating a working Samba PDC is to understand the parameters necessary
-in &smb.conf;.  An example &smb.conf; for acting as a PDC can be found in example
-<link linkend="pdc-example"/>. 
+in &smb.conf;.  An example &smb.conf; for acting as a PDC can be found in the example
+<link linkend="pdc-example">for being a PDC</link>. 
 </para>
 
 <para>
@@ -468,7 +468,7 @@ The basic options shown above are explained as follows:
 		must be the domain master browser, must be set in <emphasis>user</emphasis> mode security,
 		must support Microsoft compatible encrypted passwords, and must provide the network logon
 		service (domain logons). Encrypted passwords must be enabled, for more details on how 
-		to do this, refer to <link linkend="passdb"></link>.
+		to do this, refer to <link linkend="passdb">the chapter on account information databases</link>.
 		</para></listitem>
 	</varlistentry>
 	<varlistentry><term>Environment Parameters</term>
@@ -771,7 +771,7 @@ are two distinctly different functions), it is not a good idea to do
 so.  You should remember that the DC must register the DOMAIN&lt;#1b&gt; NetBIOS 
 name.  This is the name used by Windows clients to locate the DC.
 Windows clients do not distinguish between the DC and the DMB.
-A DMB is a Domain Master Browser - see <link linkend="DMB"></link>.
+A DMB is a Domain Master Browser - see <link linkend="DMB">Domain Master Browser</link>.
 For this reason, it is very wise to configure the Samba DC as the DMB.
 </para>
 
diff --git a/docs/docbook/projdoc/ServerType.xml b/docs/docbook/projdoc/ServerType.xml
index 64b8f48444..32a5103150 100644
--- a/docs/docbook/projdoc/ServerType.xml
+++ b/docs/docbook/projdoc/ServerType.xml
@@ -321,11 +321,11 @@ MS Windows through means such as setting an invalid shell in the
 
 <para>
 An alternative to assigning UIDs to Windows users on a Samba member server is
-presented in <link linkend="winbind"></link>.
+presented in <link linkend="winbind">the chapter about winbind</link>.
 </para>
 
 <para>
-For more information of being a domain member, see <link linkend="domain-member"></link>.
+	For more information of being a domain member, see <link linkend="domain-member">the chapter about domain membership</link>.
 </para>
 
 </sect3>
@@ -369,7 +369,7 @@ The following parameter may be required:
 </smbconfblock></para>
 
 <para>
-Please refer to <link linkend="domain-member"></link> and <link linkend="ads-member"></link>
+Please refer to <link linkend="domain-member">the chapter on domain membership</link>
 for more information regarding this configuration option.
 </para>
 
@@ -606,7 +606,7 @@ as a Domain Controller! This setting means we want Samba to be a domain member!
 <para>
 Guess! So many others do. But whatever you do, do NOT think that <smbconfoption><name>security</name><value>user</value></smbconfoption>
 makes Samba act as a domain member. Read the manufacturers manual before the warranty expires! See 
-<link linkend="domain-member"></link> for more information.
+<link linkend="domain-member">the chapter about domain membership</link> for more information.
 </para>
 
 </sect2>
diff --git a/docs/docbook/projdoc/StandAloneServer.xml b/docs/docbook/projdoc/StandAloneServer.xml
index bb59f2d57b..ec4f9f2693 100644
--- a/docs/docbook/projdoc/StandAloneServer.xml
+++ b/docs/docbook/projdoc/StandAloneServer.xml
@@ -141,7 +141,7 @@ on your system.
 
 	<listitem><para>
 	The print spooling and processing system on our print server will be CUPS.
-	(Please refer to <link linkend="CUPS-printing"></link> for more information).
+	(Please refer to <link linkend="CUPS-printing">the chapter about CUPS</link> for more information).
 	</para></listitem>
 
 	<listitem><para>
diff --git a/docs/docbook/projdoc/UNIX_INSTALL.xml b/docs/docbook/projdoc/UNIX_INSTALL.xml
index 86fedb387b..6a38e60c0e 100644
--- a/docs/docbook/projdoc/UNIX_INSTALL.xml
+++ b/docs/docbook/projdoc/UNIX_INSTALL.xml
@@ -20,7 +20,7 @@
 	</para>
 
 	<para>If you need to compile samba from source, check 
-	<link linkend="compiling"></link>.</para>
+		<link linkend="compiling">the chapter about compiling samba from scratch</link>.</para>
 
 	<para>If you have already installed samba, or if your operating system
 	was pre-installed with samba, then you may not need to bother with this
@@ -80,7 +80,7 @@
 	<para>
 	For more information about security settings for the 
 	<smbconfsection>[homes]</smbconfsection> share please refer to 
-	<link linkend="securing-samba"></link>.
+	<link linkend="securing-samba">"Securing Samba"</link>.
 	</para>
 
 <sect3>
@@ -199,8 +199,8 @@
 <sect1>
 	<title>What If Things Don't Work?</title>
 	
-	<para>Then you might read the file chapter <link linkend="diagnosis"></link>
-	and the FAQ. If you are still stuck then refer to <link linkend="problems"></link>.
+	<para>Then you might read the file chapter <link linkend="diagnosis">diagnosis</link>
+	and the FAQ. If you are still stuck then refer to <link linkend="problems">"Analysing and solving problems"</link>.
 	Samba has been successfully installed at thousands of sites worldwide,
 	so maybe someone else has hit your problem and has overcome it.</para>
 
diff --git a/docs/docbook/projdoc/passdb.xml b/docs/docbook/projdoc/passdb.xml
index 5edfba7343..32de096b07 100644
--- a/docs/docbook/projdoc/passdb.xml
+++ b/docs/docbook/projdoc/passdb.xml
@@ -1532,7 +1532,7 @@ Refer to the <command>logon home</command> parameter in the &smb.conf; man page
 
 		<para><quote>I've installed samba, but now I can't log on with my unix account!</quote></para>
 
-		<para>Make sure your user has been added to the current samba <smbconfoption><name>passdb backend</name></smbconfoption>. Read the section <link linkend="acctmgmttools"/> for details.</para>
+		<para>Make sure your user has been added to the current samba <smbconfoption><name>passdb backend</name></smbconfoption>. Read the section <link linkend="acctmgmttools">Account Management Tools</link> for details.</para>
 
 	</sect2>
 
diff --git a/docs/docbook/projdoc/printer_driver2.xml b/docs/docbook/projdoc/printer_driver2.xml
index 4c2b77cf5b..0d0dbb0188 100644
--- a/docs/docbook/projdoc/printer_driver2.xml
+++ b/docs/docbook/projdoc/printer_driver2.xml
@@ -474,7 +474,7 @@ that will be ignored, and a default value used instead.]
 <title>Extended Sample Configuration to Print</title>
 
 <para>
-	In <link linkend="extbsdpr"/> we show a more verbose example configuration for print related
+	In <link linkend="extbsdpr">the extended BSD configuration example</link> we show a more verbose example configuration for print related
 	settings in BSD-printing style environment . Below is a discussion
 and explanation of the various parameters. We chose to use BSD-style
 printing here, because we guess it is still the most commonly used
diff --git a/docs/docbook/projdoc/samba-doc.xml b/docs/docbook/projdoc/samba-doc.xml
index 91002c9133..a04ab6adee 100644
--- a/docs/docbook/projdoc/samba-doc.xml
+++ b/docs/docbook/projdoc/samba-doc.xml
@@ -39,23 +39,22 @@ application knowledge that is most to be desired by many Samba users and adminis
 </para>
 
 </abstract>
-<legalnotice>
+</bookinfo>
+
+<preface>
+	<title>Legal Notice</title>
 <para>
 This documentation is distributed under the GNU General Public License (GPL) 
 version 2.  A copy of the license is included with the Samba source
 distribution.  A copy can be found on-line at <ulink 
 url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</ulink>
 </para>
+</preface>
 
-<formalpara>
+<preface>
 	<title>Attributions</title>
-	<para>
 		&attributions;
-	</para>
-</formalpara>
-
-</legalnotice>
-</bookinfo>
+</preface>
 
 <!-- Contents -->
 <toc/>
@@ -131,15 +130,16 @@ Samba has several features that you might want or might not want to use. The cha
 
 <part id="troubleshooting">
 <title>Troubleshooting</title>
+
 &Diagnosis;
 &problems;
 &BUGS;
 </part>
 
 <part id="Appendixes">
-<title>Appendixes</title>
+	<title>Appendixes</title>
 &Compiling;
-&Portability;
+	&Portability;
 &Other-Clients;
 &SPEED;
 &DNS-DHCP-Configuration;
diff --git a/docs/docbook/projdoc/upgrading-to-3.0.xml b/docs/docbook/projdoc/upgrading-to-3.0.xml
index b5b2a4bf0a..74af0cbb9e 100644
--- a/docs/docbook/projdoc/upgrading-to-3.0.xml
+++ b/docs/docbook/projdoc/upgrading-to-3.0.xml
@@ -408,7 +408,7 @@ complete descriptions of new or modified parameters.
 	storage backends 
 	(<smbconfoption><name>passdb backend</name></smbconfoption>). 
 	Please refer to the &smb.conf;
-	man page and <link linkend="passdb"/> for details.  While both parameters assume sane default
+	man page and <link linkend="passdb">the chapter about account information databases</link> for details.  While both parameters assume sane default
 	values, it is likely that you will need to understand what the
 	values actually mean in order to ensure Samba operates correctly.
 	</para>
diff --git a/docs/docbook/xslt/generate-attributions.xsl b/docs/docbook/xslt/generate-attributions.xsl
index c781a77cc4..29683b1921 100644
--- a/docs/docbook/xslt/generate-attributions.xsl
+++ b/docs/docbook/xslt/generate-attributions.xsl
@@ -12,38 +12,39 @@
    <xsl:apply-templates select="@*|node()"/>
 </xsl:template>
 
-<xsl:template match="book">
-	<xsl:element name="variablelist">
-	<xsl:apply-templates/>
-	</xsl:element>
-</xsl:template>
-
 <xsl:template match="chapter">
-	<xsl:element name="varlistentry">
-		<xsl:element name="term">
-			<xsl:element name="link">
-				<xsl:attribute name="linkend"><xsl:value-of select="@id"/></xsl:attribute>
-				<xsl:value-of select="title"/>
-			</xsl:element>
-		</xsl:element>
-		<xsl:element name="listitem">
+	<xsl:choose>
+		<xsl:when test="chapterinfo/author != ''">
 			<xsl:element name="para">
+				<xsl:element name="link">
+					<xsl:attribute name="linkend"><xsl:value-of select="@id"/></xsl:attribute>
+					<xsl:value-of select="title"/>
+				</xsl:element>
 				<xsl:element name="itemizedlist">
-				<xsl:apply-templates/>
+					<xsl:apply-templates/>
 				</xsl:element>
 			</xsl:element>
-		</xsl:element>
-	</xsl:element>
+		</xsl:when>
+	</xsl:choose>
 </xsl:template>
 
 <xsl:template match="author">
 	<xsl:element name="listitem">
 		<xsl:element name="para">
-			<xsl:value-of select="firstname"/><xsl:text> </xsl:text><xsl:value-of select="surname"/>
+			<xsl:value-of select="firstname"/>
+			<xsl:if test="othername != ''">
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="othername"/>
+				<xsl:text> </xsl:text>
+			</xsl:if>
+			<xsl:text> </xsl:text><xsl:value-of select="surname"/>
 			<xsl:choose>
 				<xsl:when test="affiliation/address/email != ''">
 					<xsl:text> &lt;</xsl:text>
 					<xsl:element name="ulink">
+						<xsl:attribute name="noescape">
+						<xsl:text>1</xsl:text>
+						</xsl:attribute>
 						<xsl:attribute name="url">
 							<xsl:text>mailto:</xsl:text>
 							<xsl:value-of select="affiliation/address/email"/>
@@ -62,6 +63,8 @@
 			</xsl:choose>
 		</xsl:element>
 	</xsl:element>
+	<xsl:text>
+	</xsl:text>
 </xsl:template>
 
 </xsl:stylesheet>
diff --git a/docs/docbook/xslt/html-common.xsl b/docs/docbook/xslt/html-common.xsl
index ecb8a08662..dce900ef67 100644
--- a/docs/docbook/xslt/html-common.xsl
+++ b/docs/docbook/xslt/html-common.xsl
@@ -19,4 +19,7 @@
   <xsl:value-of select="refentrytitle"/><xsl:text>.</xsl:text><xsl:value-of select="manvolnum"/><xsl:text>.html</xsl:text>
 </xsl:template>
 
+<xsl:template match="author">
+</xsl:template>
+
 </xsl:stylesheet>