Update from HEAD.

(This used to be commit 69b1055d9d1d2ef428e57da90fe3b08168a88a3a)

8 files changed, 60 insertions, 45 deletions

diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in
index 132b5de978..d55d2daaec 100644
--- a/docs/docbook/Makefile.in
+++ b/docs/docbook/Makefile.in
@@ -21,7 +21,9 @@ MANPAGES_NAMES=findsmb.1 smbclient.1 \
 	smbpasswd.8 testprns.1 \
 	smb.conf.5 wbinfo.1 pdbedit.8 \
 	smbcacls.1 smbsh.1 winbindd.8 \
-	vfstest.1
+	tdbbackup.8 vfstest.1 \
+	profiles.1 smbtree.1 ntlm_auth.1 \
+	editreg.1 smbcquotas.1
 
 ## This part contains only rules. You shouldn't need to change it 
 ## if you are adding docs
@@ -66,36 +68,42 @@ everything: manpages ps pdf html-single html htmlman txt htmlfaq
 
 # Global rules
 
-manpages: $(MANPAGES)
-pdf: $(PDFDIR)/Samba-HOWTO-Collection.pdf ../Samba-Developers-Guide.pdf
-ps: $(PSDIR)/Samba-HOWTO-Collection.ps ../Samba-Developers-Guide.ps
-txt: $(TXTDIR)/Samba-HOWTO-Collection.txt $(TXTDIR)/Samba-Developers-Guide.txt
-htmlman:  $(MANPAGES_HTML)
-htmlfaq: 
+manpages: $(MANDIR) $(MANPAGES)
+pdf: $(PDFDIR) $(PDFDIR)/Samba-HOWTO-Collection.pdf ../Samba-Developers-Guide.pdf
+ps: $(PSDIR) $(PSDIR)/Samba-HOWTO-Collection.ps ../Samba-Developers-Guide.ps
+txt: $(TXTDIR) $(TXTDIR)/Samba-HOWTO-Collection.txt $(TXTDIR)/Samba-Developers-Guide.txt
+htmlman: $(HTMLDIR) $(MANPAGES_HTML)
+htmlfaq: $(HTMLDIR)
 	$(DOCBOOK2HTML) -d samba.dsl -o $(FAQDIR) $(FAQPROJDOC)/sambafaq.sgml
-html-single: $(HTMLDIR)/Samba-HOWTO-Collection.html  $(HTMLDIR)/Samba-Developers-Guide.html
-html:
+html-single: $(HTMLDIR) $(HTMLDIR)/Samba-HOWTO-Collection.html  $(HTMLDIR)/Samba-Developers-Guide.html
+html: $(HTMLDIR)
 	$(DOCBOOK2HTML) -d samba.dsl -o $(HTMLDIR) $(PROJDOC)/samba-doc.sgml
 
 # Text files
 
+$(TXTDIR): 
+	mkdir $(TXTDIR)
+
 $(TXTDIR)/Samba-HOWTO-Collection.txt: $(PROJDOC)/samba-doc.sgml
-	$(DOCBOOK2TXT) -o . $<
+	$(DOCBOOK2TXT) -d samba.dsl -o . $<
 	mv ./samba-doc.txt $@
 
-$(TXTDIR)/Samba-Developers-Guide.txt: $(PROJDOC)/samba-doc.sgml
-	$(DOCBOOK2TXT) -o . $<
-	mv ./samba-doc.txt $@
+$(TXTDIR)/Samba-Developers-Guide.txt: $(DEVDOC)/dev-doc.sgml
+	$(DOCBOOK2TXT) -d samba.dsl -o . $<
+	mv ./dev-doc.txt $@
 
 # PostScript
 
+$(PSDIR):
+	mkdir $(PSDIR)
+
 $(PSDIR)/Samba-HOWTO-Collection.ps: $(PROJDOC)/samba-doc.sgml
-	$(DOCBOOK2PS) -o . $<
+	$(DOCBOOK2PS) -d samba.dsl -o . $<
 	mv ./samba-doc.ps $@
 
-$(PSDIR)/Samba-Developers-Guide.ps: $(PROJDOC)/samba-doc.sgml
-	$(DOCBOOK2PS) -o . $<
-	mv ./samba-doc.ps $@
+$(PSDIR)/Samba-Developers-Guide.ps: $(DEVDOC)/dev-doc.sgml
+	$(DOCBOOK2PS) -d samba.dsl -o . $<
+	mv ./dev-doc.ps $@
 
 # Adobe PDF files
 
@@ -107,20 +115,28 @@ $(PDFDIR)/Samba-Developers-Guide.pdf: $(HTMLDIR)/Samba-Developers-Guide.html
 
 # Single large HTML files
 
+$(HTMLDIR):
+	mkdir $(HTMLDIR)
+
 $(HTMLDIR)/Samba-HOWTO-Collection.html: $(PROJDOC)/samba-doc.sgml
-	$(DOCBOOK2HTML) -u -o . $<
+	$(DOCBOOK2HTML) -d samba.dsl -u -o . $<
 	mv ./samba-doc.html $@
 
 $(HTMLDIR)/Samba-Developers-Guide.html: $(DEVDOC)/dev-doc.sgml
-	$(DOCBOOK2HTML) -u -o . $<
+	$(DOCBOOK2HTML) -d samba.dsl -u -o . $<
 	mv ./dev-doc.html $@
 
 
 $(HTMLDIR)/%.html: $(MANPROJDOC)/%.sgml
-	$(DOCBOOK2HTML) -u -o $(HTMLDIR) $<
+	$(DOCBOOK2HTML) -d samba.dsl -u -o $(HTMLDIR) $<
+
+# Manpages
+
+$(MANDIR): 
+	mkdir $(MANDIR)
 
 $(MANDIR)/%: $(MANPROJDOC)/%.sgml 
-	$(DOCBOOK2MAN) -o $(MANDIR) $< || rm $@
+	$(DOCBOOK2MAN) -d samba.dsl -o $(MANDIR) $<
 	$(PERL) scripts/strip-links.pl < $@ > $@.temp
 	mv $@.temp $@
 
diff --git a/docs/docbook/manpages/tdbbackup.8.sgml b/docs/docbook/manpages/tdbbackup.8.sgml
index 25b2c27aef..31aa103e81 100644
--- a/docs/docbook/manpages/tdbbackup.8.sgml
+++ b/docs/docbook/manpages/tdbbackup.8.sgml
@@ -43,26 +43,29 @@
 	<variablelist>
 
 		<varlistentry>
+		<term>-h</term>
+		<listitem><para>
+		Get help information.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
 		<term>-s suffix</term>
 		<listitem><para>
-		The <term>-s</term> option allows the adminisistrator to specify a file
+		The <command>-s</command> option allows the adminisistrator to specify a file
 		backup extension. This way it is possible to keep a history of tdb backup
 		files by using a new suffix for each backup.
 		</para> </listitem>
 		</varlistentry>
 
-		&stdarg.help;
-
 		<varlistentry>
 		<term>-v</term>
 		<listitem><para>
-		The <term>-v</term> will check the database for damages (currupt data)
+		The <command>-v</command> will check the database for damages (currupt data)
 		which if detected causes the backup to be restored.
 		</para></listitem>
 		</varlistentry>
 
-		&popt.common.samba;
-
 	</variablelist>
 </refsect1>
 
@@ -88,8 +91,9 @@
 	<para>
 	Samba .tdb files are stored in various locations, be sure to run backup all
 	.tdb file on the system. Imporatant files includes:
+	</para>
 
-	<itemistedlist>
+	<itemizedlist>
 		<listitem><para>
 		<command>secrets.tdb</command> - usual location is in the /usr/local/samba/private
 		directory, or on some systems in /etc/samba.
@@ -104,7 +108,6 @@
 		<command>*.tdb</command> located in the /usr/local/samba/var directory or on some
 		systems in the /var/cache or /var/lib/samba directories.
 		</para></listitem>
-
 	</itemizedlist>
 
 </refsect1>
diff --git a/docs/docbook/projdoc/ADS-HOWTO.sgml b/docs/docbook/projdoc/ADS-HOWTO.sgml
index 1ee0ab1962..c89a0e4f87 100644
--- a/docs/docbook/projdoc/ADS-HOWTO.sgml
+++ b/docs/docbook/projdoc/ADS-HOWTO.sgml
@@ -160,8 +160,6 @@ specify the <parameter>-k</parameter> option to choose kerberos authentication.
 <para>You must change administrator password at least once after DC 
 install, to create the right encoding types</para>
 
-<!--RS: right encoding types for what?  I don't understand this note as I did not do this on my server and did not have any problems (that I know of)-->
-
 <para>w2k doesn't seem to create the _kerberos._udp and _ldap._tcp in
    their defaults DNS setup. Maybe fixed in service packs?</para>
 </sect1>
diff --git a/docs/docbook/projdoc/DOMAIN_MEMBER.sgml b/docs/docbook/projdoc/DOMAIN_MEMBER.sgml
index cd4168e446..a5921e8ce3 100644
--- a/docs/docbook/projdoc/DOMAIN_MEMBER.sgml
+++ b/docs/docbook/projdoc/DOMAIN_MEMBER.sgml
@@ -12,15 +12,13 @@
 <sect1>
 
 	<title>Joining an NT Domain with Samba 3.0</title>
-<!--changed by RS: IMHO, this would read better and be easier to reference as a listrather than written out in paragraph form-->
-	<para>
-	<variablelist>
-	<varlistentry><term>"Assumptions:"</term>
-	<listitem>NetBIOS name: <constant>SERV1</constant></listitem>
-	<listitem>Win2K/NT domain name: <constant>DOM</constant></listitem>
-	<listitem>Domain's PDC NetBIOS name: <constant>DOMPDC</constant></listitem>
-	<listitem>Domain's BDC NetBIOS names: <constant>DOMBDC1</constant> and <constant>DOMBDC2</constant></listitem>
-	</variablelist>
+	<para><emphasis>Assumptions:</emphasis>
+	<programlisting>
+		NetBIOS name: SERV1
+		Win2K/NT domain name: DOM
+		Domain's PDC NetBIOS name: DOMPDC
+		Domain's BDC NetBIOS names: DOMBDC1 and DOMBDC2
+	</programlisting>
 	</para>
 
 	<para>First, you must edit your &smb.conf; file to tell Samba it should
diff --git a/docs/docbook/projdoc/Diagnosis.sgml b/docs/docbook/projdoc/Diagnosis.sgml
index 8f9a85728f..150f071b78 100644
--- a/docs/docbook/projdoc/Diagnosis.sgml
+++ b/docs/docbook/projdoc/Diagnosis.sgml
@@ -82,7 +82,7 @@ best way to check this is with <userinput>testparm smb.conf</userinput>.
 
 <para>
 It is helpful to monitor the log files during testing by using the
-<command>tail -F <replaceable>log_file_name</replaceable> in a separate
+<command>tail -F <replaceable>log_file_name</replaceable></command> in a separate
 terminal console (use ctrl-alt-F1 through F6 or multiple terminals in X). 
 Relevant log files can be found (for default installations) in
 <filename>/usr/local/samba/var</filename>.  Also, connection logs from
diff --git a/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml b/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml
index 841d24b78d..af6ddff9bf 100644
--- a/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml
+++ b/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml
@@ -3,8 +3,8 @@
 <chapterinfo>
 	<author>
 		<firstname>Jean François</firstname><surname>Micouleau</surname>
-		&person.jerry;
 	</author>
+	&author.jerry;
 </chapterinfo>
 
 <title>Configuring Group Mapping</title>
diff --git a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml b/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
index be7a6d5201..6a3bcacf17 100644
--- a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
@@ -330,7 +330,7 @@ for this including:
 	</para></listitem>
 </itemizedlist>
 
-<para>Read the chapter about the <link linkend="passdb backend">User Database</link> 
+<para>Read the chapter about the <link linkend="passdb">User Database</link> 
 for details.</para>
 
 <note><para>
diff --git a/docs/docbook/projdoc/security_level.sgml b/docs/docbook/projdoc/security_level.sgml
index a59392bbac..f19ec4a1e8 100644
--- a/docs/docbook/projdoc/security_level.sgml
+++ b/docs/docbook/projdoc/security_level.sgml
@@ -130,8 +130,8 @@ Windows NT server, the later natively capable of encrypted password support.
 
 <note><para>
 <emphasis>Server</emphasis> level security is incompatible with what is known 
-as </empahsis>schannel</emphasis> or "sign and seal" protocols. This means that
-if you want to use <empahsis>server</emphasis> level security you must disable
+as <emphasis>schannel</emphasis> or "sign and seal" protocols. This means that
+if you want to use <emphasis>server</emphasis> level security you must disable
 the use of "sign and seal" on all machines on your network.
 </para></note>