trying to get HEAD building again. If you want the code

prior to this merge, checkout HEAD_PRE_3_0_0_BETA_3_MERGE
(This used to be commit adb98e7b7cd0f025b52c570e4034eebf4047b1ad)

1 files changed, 34 insertions, 32 deletions

diff --git a/docs/docbook/projdoc/Diagnosis.xml b/docs/docbook/projdoc/Diagnosis.xml
index 150f071b78..7e3656c0f3 100644
--- a/docs/docbook/projdoc/Diagnosis.xml
+++ b/docs/docbook/projdoc/Diagnosis.xml
@@ -5,7 +5,7 @@
 	<pubdate>Wed Jan 15</pubdate>
 </chapterinfo>
 
-<title>The samba checklist</title>
+<title>The Samba checklist</title>
 
 <sect1>
 <title>Introduction</title>
@@ -129,7 +129,7 @@ run ping.
 </para>
 
 <para>
-If you get a message saying "host not found" or similar then your DNS
+If you get a message saying <errorname>host not found</errorname> or similar then your DNS
 software or <filename>/etc/hosts</filename> file is not correctly setup.
 It is possible to
 run samba without DNS entries for the server and client, but I assume
@@ -143,10 +143,12 @@ in question, perhaps by allowing access from another subnet (on Linux
 this is done via the <application>ipfwadm</application> program.)
 </para>
 
+<note>
 <para>
-Note: Modern Linux distributions install ipchains/iptables by default. 
+Modern Linux distributions install ipchains/iptables by default. 
 This is a common problem that is often overlooked.
 </para>
+</note>
 </step>
 
 <step performance="required">
@@ -165,7 +167,7 @@ temporarily remove any <command>hosts allow</command>, <command>hosts deny</comm
 </para>
 
 <para>
-If you get a "connection refused" response then the smbd server may
+If you get a <errorname>connection refused</errorname> response then the smbd server may
 not be running. If you installed it in inetd.conf then you probably edited
 that file incorrectly. If you installed it as a daemon then check that
 it is running, and check that the netbios-ssn port is in a LISTEN
@@ -180,7 +182,7 @@ this network super daemon.
 </para></note>
 
 <para>
-If you get a "session request failed" then the server refused the
+If you get a <errorname>session request failed</errorname> then the server refused the
 connection. If it says "Your server software is being unfriendly" then
 its probably because you have invalid command line parameters to &smbd;,
 or a similar fatal problem with the initial startup of &smbd;. Also
@@ -203,7 +205,7 @@ the following &smb.conf; file entries:
 
 <para>
 In the above, no allowance has been made for any session requests that
-will automatically translate to the loopback adaptor address 127.0.0.1.
+will automatically translate to the loopback adapter address 127.0.0.1.
 To solve this problem change these lines to:
 </para>
 
@@ -213,7 +215,7 @@ To solve this problem change these lines to:
 </programlisting></para>
 
 <para>
-Do NOT use the <command>bind interfaces only</command> parameter where you 
+Do <emphasis>not</emphasis> use the <command>bind interfaces only</command> parameter where you 
 may wish to
 use the samba password change facility, or where &smbclient; may need to
 access a local service for name resolution or for local resource
@@ -224,7 +226,8 @@ fixed soon).
 
 <para>
 Another common cause of these two errors is having something already running 
-on port 139, such as Samba (ie: smbd is running from <application>inetd</application> already) or
+on port <constant>139</constant>, such as Samba 
+(ie: &smbd; is running from <application>inetd</application> already) or
 something like Digital's Pathworks. Check your <filename>inetd.conf</filename> file before trying
 to start &smbd; as a daemon, it can avoid a lot of frustration!
 </para>
@@ -233,7 +236,7 @@ to start &smbd; as a daemon, it can avoid a lot of frustration!
 And yet another possible cause for failure of this test is when the subnet mask
 and / or broadcast address settings are incorrect. Please check that the
 network interface IP Address / Broadcast Address / Subnet Mask settings are
-correct and that Samba has correctly noted these in the <filename>log.nmb</filename> file.
+correct and that Samba has correctly noted these in the <filename>log.nmbd</filename> file.
 </para>
 
 </step>
@@ -286,10 +289,10 @@ Run the command <userinput>nmblookup -d 2 '*'</userinput>
 <para>
 This time we are trying the same as the previous test but are trying
 it via a broadcast to the default broadcast address. A number of
-Netbios/TCPIP hosts on the network should respond, although Samba may
+NetBIOS / TCP/IP hosts on the network should respond, although Samba may
 not catch all of the responses in the short time it listens. You
-should see "got a positive name query response" messages from several
-hosts.
+should see <errorname>got a positive name query response</errorname>
+messages from several hosts.
 </para>
 
 <para>
@@ -332,18 +335,18 @@ as follows:
 
 <para>
 Once you enter the password you should get the <prompt>smb></prompt> prompt. If you
-don't then look at the error message. If it says "invalid network
-name" then the service "tmp" is not correctly setup in your &smb.conf;.
+don't then look at the error message. If it says <errorname>invalid network
+name</errorname> then the service <emphasis>"tmp"</emphasis> is not correctly setup in your &smb.conf;.
 </para>
 
 <para>
-If it says "bad password" then the likely causes are:
+If it says <errorname>bad password</errorname> then the likely causes are:
 </para>
 
 <orderedlist>
 <listitem>
 	<para>
-	you have shadow passords (or some other password system) but didn't
+	you have shadow passwords (or some other password system) but didn't
 	compile in support for them in &smbd;
 	</para>
 </listitem>
@@ -369,8 +372,7 @@ If it says "bad password" then the likely causes are:
 
 <listitem>
 	<para>
-	you enabled password encryption but didn't create the SMB encrypted
-	password file
+	you enabled password encryption but didn't map unix to samba users
 	</para>
 </listitem>
 </orderedlist>
@@ -394,7 +396,7 @@ list of available shares on the server.
 </para>
 
 <para>
-If you get a "network name not found" or similar error then netbios
+If you get a <errorname>network name not found</errorname> or similar error then netbios
 name resolution is not working. This is usually caused by a problem in
 nmbd. To overcome it you could do one of the following (you only need
 to choose one of them):
@@ -407,12 +409,12 @@ to choose one of them):
 
 <listitem><para>
 	add the IP address of BIGSERVER to the <command>wins server</command> box in the
-	advanced tcp/ip setup on the PC.
+	advanced TCP/IP setup on the PC.
 </para></listitem>
 
 <listitem><para>
 	enable windows name resolution via DNS in the advanced section of
-	the tcp/ip setup
+	the TCP/IP setup
 </para></listitem>
 
 <listitem><para>
@@ -421,7 +423,7 @@ to choose one of them):
 </orderedlist>
 
 <para>
-If you get a "invalid network name" or "bad password error" then the
+If you get a <errorname>invalid network name</errorname> or <errorname>bad password error</errorname> then the
 same fixes apply as they did for the <userinput>smbclient -L</userinput> test above. In
 particular, make sure your <command>hosts allow</command> line is correct (see the man
 pages)
@@ -436,7 +438,7 @@ name and password.
 </para>
 
 <para>
-If you get "specified computer is not receiving requests" or similar
+If you get <errorname>specified computer is not receiving requests</errorname> or similar
 it probably means that the host is not contactable via tcp services.
 Check to see if the host is running tcp wrappers, and if so add an entry in
 the <filename>hosts.allow</filename> file for your client (or subnet, etc.)
@@ -448,16 +450,16 @@ the <filename>hosts.allow</filename> file for your client (or subnet, etc.)
 
 <para>
 Run the command <userinput>net use x: \\BIGSERVER\TMP</userinput>. You should 
-be prompted for a password then you should get a "command completed 
-successfully" message. If not then your PC software is incorrectly 
+be prompted for a password then you should get a <computeroutput>command completed 
+successfully</computeroutput> message. If not then your PC software is incorrectly 
 installed or your smb.conf is incorrect. make sure your <command>hosts allow</command>
 and other config lines in &smb.conf; are correct.
 </para>
 
 <para>
 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 <command>user =
-<replaceable>username</replaceable></command> to the <command>[tmp]</command> section of 
+connect you as. To see if this is the problem add the line <parameter>user =
+<replaceable>username</replaceable></parameter> to the <parameter>[tmp]</parameter> section of 
 &smb.conf; where <replaceable>username</replaceable> is the
 username corresponding to the password you typed. If you find this
 fixes things you may need the username mapping option. 
@@ -465,7 +467,7 @@ fixes things you may need the username mapping option.
 
 <para>
 It might also be the case that your client only sends encrypted passwords 
-and you have <command>encrypt passwords = no</command> in &smb.conf;
+and you have <parameter>encrypt passwords = no</parameter> in &smb.conf;
 Turn it back on to fix.
 </para>
 
@@ -484,7 +486,7 @@ master browser for that workgroup.
 If you don't then the election process has failed. Wait a minute to
 see if it is just being slow then try again. If it still fails after
 that then look at the browsing options you have set in &smb.conf;. Make
-sure you have <command>preferred master = yes</command> to ensure that 
+sure you have <parameter>preferred master = yes</parameter> to ensure that 
 an election is held at startup.
 </para>
 
@@ -500,9 +502,9 @@ of the server and get a list of shares. If you get a "invalid
 password" error when you do then you are probably running WinNT and it
 is refusing to browse a server that has no encrypted password
 capability and is in user level security mode. In this case either set
-<command>security = server</command> AND 
-<command>password server = Windows_NT_Machine</command> in your
-&smb.conf; file, or make sure <command>encrypted passwords</command> is
+<parameter>security = server</parameter> AND 
+<parameter>password server = Windows_NT_Machine</parameter> in your
+&smb.conf; file, or make sure <parameter>encrypted passwords</parameter> is
 set to "yes".
 </para>