Fix typos, update to sync HEAD and 3.0.0.

(This used to be commit 58750141696feddfeef9ea817b44e4cdfe3afd51)

5 files changed, 20 insertions, 26 deletions

diff --git a/docs/docbook/projdoc/ServerType.xml b/docs/docbook/projdoc/ServerType.xml
index 9081956bb0a..ecfeb417359 100644
--- a/docs/docbook/projdoc/ServerType.xml
+++ b/docs/docbook/projdoc/ServerType.xml
@@ -436,15 +436,6 @@ be determined from a domain name. In essence a samba server that is in
 workgroup mode.
 </para></note>
 
-<note><para>
-<emphasis>Server level</emphasis> security is incompatible with the newer security features
-in recent MS Windows networking protocols. In particular it is incompatible with NTLMv2.
-Server Mode security also breaks Sign and Seal interoperability because only a domain member
-can sign packets in the manner in which it is currently implemented in Samba-3. 
-If you chose to use Server Mode security this means it is necessary to disable Sign and Seal
-on all workstations.
-</para></note>
-
 <sect3>
 <title>Example Configuration</title>
 <para><emphasis>
diff --git a/docs/docbook/projdoc/Speed.xml b/docs/docbook/projdoc/Speed.xml
index 327aeff8c96..e2ede62ac73 100644
--- a/docs/docbook/projdoc/Speed.xml
+++ b/docs/docbook/projdoc/Speed.xml
@@ -192,8 +192,7 @@ case you may wish to change this option.
 
 <para>
 Slow logins are almost always due to the password checking time. Using
-the lowest practical <command>password level</command> will improve things. Note that 
-this problem only occurs on slow servers(e.g. 486 and lower).
+the lowest practical <command>password level</command> will improve things. 
 </para>
 
 </sect1>
@@ -201,10 +200,14 @@ this problem only occurs on slow servers(e.g. 486 and lower).
 <sect1>
 <title>LDAP</title>
 
-<para>LDAP can be vastly improved by using the <ulink url="smb.conf.5.html#LDAPTRUSTIDS">ldap trust ids</ulink> parameter.</para>
+<para>
+LDAP can be vastly improved by using the
+<ulink url="smb.conf.5.html#LDAPTRUSTIDS">ldap trust ids</ulink> parameter.
+</para>
 
 </sect1>
 
+
 <sect1>
 <title>Client tuning</title>
 
@@ -216,5 +219,4 @@ performance. Check the sections on the various clients in
 </para>
 
 </sect1>
-
 </chapter>
diff --git a/docs/docbook/projdoc/StandAloneServer.xml b/docs/docbook/projdoc/StandAloneServer.xml
index fc003330eae..d8f5992191c 100644
--- a/docs/docbook/projdoc/StandAloneServer.xml
+++ b/docs/docbook/projdoc/StandAloneServer.xml
@@ -5,7 +5,7 @@
 <title>Stand-Alone Servers</title>
 
 <para>
-Stand-Alone servers are independant of an Domain Controllers on the network.
+Stand-Alone servers are independant of Domain Controllers on the network.
 They are NOT domain members and function more like workgroup servers. In many
 cases a stand-alone server is configured with a minimum of security control
 with the intent that all data served will be readilly accessible to all users.
@@ -42,11 +42,11 @@ a great solution.
 <title>Background</title>
 
 <para>
-The term <emphasis>stand alone server</emphasis> means that the server
+The term <emphasis>stand-alone server</emphasis> means that the server
 will provide local authentication and access control for all resources
 that are available from it. In general this means that there will be a
 local user database. In more technical terms, it means that resources
-on the machine will either be made available in either SHARE mode or in
+on the machine will be made available in either SHARE mode or in
 USER mode.
 </para>
 
@@ -71,10 +71,10 @@ the samba server is NOT a member of a domain security context.
 Through the use of PAM (Pluggable Authentication Modules) and nsswitch
 (the name service switcher) the source of authentication may reside on 
 another server. We would be inclined to call this the authentication server.
-This means that the samba server may use the local Unix/Linux system
-password database (/etc/passwd or /etc/shadow), may use a local smbpasswd
-file, or may use an LDAP back end, or even via PAM and Winbind another CIFS/SMB
-server for authentication.
+This means that the samba server may use the local Unix/Linux system password database
+(/etc/passwd or /etc/shadow), may use a local smbpasswd file, or may use
+an LDAP back end, or even via PAM and Winbind another CIFS/SMB server
+for authentication.
 </para>
 
 </sect1>
@@ -222,7 +222,8 @@ the anonymous (guest) user two things will be required:
 <title>Common Errors</title>
 
 <para>
-Put stuff here.
+The greatest mistake so often made is to make a network configuration too complex.
+It pays to use the simplest solution that will meet the needs of the moment.
 </para>
 
 </sect1>
diff --git a/docs/docbook/projdoc/passdb.xml b/docs/docbook/projdoc/passdb.xml
index c64f5685719..5dc0f9e6cbb 100644
--- a/docs/docbook/projdoc/passdb.xml
+++ b/docs/docbook/projdoc/passdb.xml
@@ -687,7 +687,7 @@ In smb.conf [globals]
 			The LDAP ldapsam code has been developed and tested using the OpenLDAP 2.0 and 2.1 server and
 			client libraries.  The same code should work with Netscape's Directory Server and client SDK.
 			However, there are bound to be compile errors and bugs. These should not be hard to fix.
-			Please submit fixes via <link linkend="Bugs"/>.
+			Please submit fixes via <link linkend="bugreport"/>.
 			</para>
 
 		</sect3>
@@ -834,7 +834,7 @@ index   default               sub
 
 <para>
 <programlisting>
-root# </prompt><userinput>/etc/init.d/slapd restart</userinput>
+<prompt>root# </prompt><userinput>/etc/init.d/slapd restart</userinput>
 </programlisting>
 </para>
 
diff --git a/docs/docbook/projdoc/samba-doc.xml b/docs/docbook/projdoc/samba-doc.xml
index c6822303302..a4394d263f3 100644
--- a/docs/docbook/projdoc/samba-doc.xml
+++ b/docs/docbook/projdoc/samba-doc.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book SYSTEM "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+				  
 <!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
 ]>
 
@@ -90,8 +91,7 @@ section carefully.
 <partintro>
 <title>Valuable Nuts and Bolts Information</title>
 <para>
-Samba has several features that you might want or might not want to use.
-The chapters in this part each cover specific Samba features.
+Samba has several features that you might want or might not want to use. The chapters in this part each cover specific Samba features.
 </para>
 </partintro>
 &NetworkBrowsing;