3 files changed, 21 insertions, 19 deletions
diff --git a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml b/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
index 451ab02762..a0927ec888 100644
--- a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
@@ -315,7 +315,7 @@ for this including:
 	file allows the creation of arbitrary user and machine accounts without
 	requiring that account to be added to the system (/etc/passwd) file. It
 	too requires the specification of the "non unix account range" option
-	in the [globals] section of the smb.conf file.
+	in the [globals] section of the &smb.conf; file.
 	</para></listitem>
 
 	<listitem><para>
@@ -329,6 +329,9 @@ for this including:
 	</para></listitem>
 </itemizedlist>
 
+<para>Read the chapter about the <link linkend="passdb">User Database</link> 
+for details.</para>
+
 <para>
 A Samba PDC, however, stores each machine trust account in two parts,
 as follows:
@@ -418,7 +421,7 @@ as shown here:
 </para>
 
 <para>
-<prompt>root# </prompt><command>smbpasswd -a -m <replaceable>machine_name</replaceable></command>
+<prompt>root# </prompt><userinput>smbpasswd -a -m <replaceable>machine_name</replaceable></userinput>
 </para>
 
 <para>
diff --git a/docs/docbook/projdoc/passdb.sgml b/docs/docbook/projdoc/passdb.sgml
index 362cf97064..d7b54a38e8 100644
--- a/docs/docbook/projdoc/passdb.sgml
+++ b/docs/docbook/projdoc/passdb.sgml
@@ -114,23 +114,22 @@
 			<member>Windows 200x Server/Advanced Server</member>
 			<member>Windows XP Professional</member>
 		</simplelist>
-		
-		<para><emphasis>Note :</emphasis>All current release of 
-		Microsoft SMB/CIFS clients support authentication via the
-		SMB Challenge/Response mechanism described here.  Enabling
-		clear text authentication does not disable the ability
-		of the client to participate in encrypted authentication.</para>
-
-
-		<para>MS Windows clients will cache the encrypted password alone.
-		Even when plain text passwords are re-enabled, through the appropriate
-		registry change, the plain text password is NEVER cached. This means that
-		in the event that a network connections should become disconnected (broken)
-		only the cached (encrypted) password will be sent to the resource server
-		to affect a auto-reconnect. If the resource server does not support encrypted
-		passwords the auto-reconnect will fail. <emphasis>USE OF ENCRYPTED PASSWORDS
-		IS STRONGLY ADVISED.</emphasis></para>
 	</warning>
+		
+	<note><para>All current release of 
+	Microsoft SMB/CIFS clients support authentication via the
+	SMB Challenge/Response mechanism described here.  Enabling
+	clear text authentication does not disable the ability
+	of the client to participate in encrypted authentication.</para></note>
+
+	<para>MS Windows clients will cache the encrypted password alone.
+	Even when plain text passwords are re-enabled, through the appropriate
+	registry change, the plain text password is NEVER cached. This means that
+	in the event that a network connections should become disconnected (broken)
+	only the cached (encrypted) password will be sent to the resource server
+	to affect a auto-reconnect. If the resource server does not support encrypted
+	passwords the auto-reconnect will fail. <emphasis>USE OF ENCRYPTED PASSWORDS
+	IS STRONGLY ADVISED.</emphasis></para>
 
 	<sect2>
 		<title>Advantages of SMB Encryption</title>
diff --git a/docs/docbook/projdoc/unicode.sgml b/docs/docbook/projdoc/unicode.sgml
index 4d1fac0150..d44e8ea291 100644
--- a/docs/docbook/projdoc/unicode.sgml
+++ b/docs/docbook/projdoc/unicode.sgml
@@ -58,7 +58,7 @@ samba knows of three kinds of character sets:
 		<term>unix charset</term>
 		<listitem><para>
 		This is the charset used internally by your operating system. 
-		The default is <emphasis>ASCII</emphasis>, which is fine for most 
+		The default is <constant>ASCII</constant>, which is fine for most 
 		systems.
 		</para></listitem>
 	</varlistentry>