sync from HEAD

(This used to be commit 2eb7f0acd761a11bb0f24010347247074c5ed49a)

4 files changed, 51 insertions, 4 deletions

diff --git a/docs/docbook/projdoc/Diagnosis.sgml b/docs/docbook/projdoc/Diagnosis.sgml
index 20b2ccee08..3cc0bab5d5 100644
--- a/docs/docbook/projdoc/Diagnosis.sgml
+++ b/docs/docbook/projdoc/Diagnosis.sgml
@@ -443,7 +443,13 @@ It's also possible that the server can't work out what user name to
 connect you as. To see if this is the problem add the line "user =
 USERNAME" to the [tmp] section of smb.conf where "USERNAME" is the
 username corresponding to the password you typed. If you find this
-fixes things you may need the username mapping option.
+fixes things you may need the username mapping option. 
+</para>
+
+<para>
+It might also be the case that your client only sends encrypted passwords 
+and you have <command>encrypt passwords = no</command> in <filename>smb.conf</filename>.
+Turn it back on to fix.
 </para>
 
 </sect2>
diff --git a/docs/docbook/projdoc/Portability.sgml b/docs/docbook/projdoc/Portability.sgml
index f2fe66b9dd..0ae720af53 100644
--- a/docs/docbook/projdoc/Portability.sgml
+++ b/docs/docbook/projdoc/Portability.sgml
@@ -36,6 +36,12 @@ allowed range.
 <para>This is documented in the HP manual pages under setgroups(2) and passwd(4).
 </para>
 
+<para>
+On HPUX you must use gcc or the HP Ansi compiler. The free compiler
+that comes with HP-UX is not Ansi compliant and cannot compile
+Samba.
+</para>
+
 </sect1>
 
 <sect1>
@@ -145,4 +151,27 @@ You should then remove the line:
 <para>from the DNIX section of <filename>includes.h</filename></para>
 
 </sect1>
+
+<sect1>
+<title>RedHat Linux Rembrandt-II</title>
+
+<para>
+By default RedHat Rembrandt-II during installation adds an
+entry to /etc/hosts as follows:
+<programlisting>
+	127.0.0.1 loopback "hostname"."domainname"
+</programlisting>
+</para>
+	
+<para>
+This causes Samba to loop back onto the loopback interface.
+The result is that Samba fails to communicate correctly with
+the world and therefor may fail to correctly negotiate who
+is the master browse list holder and who is the master browser.
+</para>
+
+<para>
+Corrective Action:	Delete the entry after the word loopback
+	in the line starting 127.0.0.1
+</para>
 </chapter>
diff --git a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml b/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
index 5b21e0a535..25a9783277 100644
--- a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
@@ -341,6 +341,12 @@ nickname"</replaceable> -s /bin/false <replaceable>machine_name</replaceable>$ <
 <prompt>root# </prompt><command>passwd -l <replaceable>machine_name</replaceable>$</command>
 </para>
 
+<para>On *BSD systems, this can be done using the 'chpass' utility:</para>
+
+<para>
+<prompt>root# </prompt><command>chpass -a "<replaceable>machine_name</replaceable>$:*:101:100::0:0:Workstation <replaceable>machine_name</replaceable>:/dev/null:/sbin/nologin"</command>
+</para>
+
 <para>
 The <filename>/etc/passwd</filename> entry will list the machine name 
 with a "$" appended, won't have a password, will have a null shell and no 
diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml
index 75c5c379d3..f20849edbf 100644
--- a/docs/docbook/projdoc/samba-doc.sgml
+++ b/docs/docbook/projdoc/samba-doc.sgml
@@ -18,12 +18,14 @@
 <!ENTITY SECURITY-LEVEL SYSTEM "security_level.sgml">
 <!ENTITY SPEED SYSTEM "Speed.sgml">
 <!ENTITY BROWSING SYSTEM "Browsing.sgml">
+<!ENTITY BROWSING-Quick SYSTEM "Browsing-Quickguide.sgml">
 <!ENTITY GROUP-MAPPING-HOWTO SYSTEM "GROUP-MAPPING-HOWTO.sgml">
 <!ENTITY Portability SYSTEM "Portability.sgml">
 <!ENTITY Other-Clients SYSTEM "Other-Clients.sgml">
+<!ENTITY ADS-HOWTO SYSTEM "ADS-HOWTO.sgml">
 ]>
 
-<book id="Samba-Project-Documentation">
+<book id="Samba-HOWTO-Collection">
 
 <title>SAMBA Project Documentation</title>
 
@@ -65,7 +67,6 @@ Cheers, jerry
 
 <!-- Chapters -->
 &UNIX-INSTALL;
-&Diagnosis;
 &IntegratingWithWindows;
 &Samba-PAM;
 &MS-Dfs-Setup;
@@ -78,12 +79,17 @@ Cheers, jerry
 &Samba-PDC-HOWTO;
 &Samba-BDC-HOWTO;
 &Samba-LDAP;
+&ADS-HOWTO;
 &BROWSING;
+&BROWSING-Quick;
 &SPEED;
-&Other-Clients;
 &CVS-Access;
 &BUGS;
 &GROUP-MAPPING-HOWTO;
+
+<!-- Appendices -->
 &Portability;
+&Other-Clients;
+&Diagnosis;
 
 </book>