Use <note> instead of <emphasis>NOTE</emphasis> (gives much nicer output)

(This used to be commit 3e10d92746c645ae22756bca92046b2e26087ad2)

8 files changed, 29 insertions, 30 deletions

diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 90b636fc87..6cdfba11ea 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -287,11 +287,11 @@ alias|alias|alias|alias...
 		components (if there are more than one) are separated by vertical 
 		bar symbols ('|').</para>
 		
-		<para>NOTE: On SYSV systems which use lpstat to determine what 
+		<note><para>On SYSV systems which use lpstat to determine what 
 		printers are defined on the system you may be able to use
 		"printcap name = lpstat" to automatically obtain a list 
 		of printers. See the "printcap name" option 
-		for more details.</para>
+		for more details.</para></note>
 	</refsect2>
 </refsect1>
 
@@ -3019,8 +3019,8 @@ df $1 | tail -1 | awk '{print $2" "$4}'
 		that copes with different map formats and also Amd (another 
 		automounter) maps.</para>
 		
-		<para><emphasis>NOTE :</emphasis>A working NIS client is required on 
-		the system for this option to work.</para>
+		<note><para>A working NIS client is required on 
+		the system for this option to work.</para></note>
 
 		<para>See also <link linkend="NISHOMEDIR"><parameter>nis homedir</parameter>
 		</link>, <link linkend="DOMAINLOGONS"><parameter>domain logons</parameter>
@@ -3163,14 +3163,14 @@ df $1 | tail -1 | awk '{print $2" "$4}'
 		hosts equiv</parameter> may be useful for NT clients which will 
 		not supply passwords to Samba.</para>
 
-		<para><emphasis>NOTE :</emphasis> The use of <parameter>hosts equiv
+		<note><para>The use of <parameter>hosts equiv
 		</parameter> can be a major security hole. This is because you are 
 		trusting the PC to supply the correct username. It is very easy to 
 		get a PC to supply a false username. I recommend that the 
 		<parameter>hosts equiv</parameter> option be only used if you really 
 		know what you are doing, or perhaps on a home network where you trust 
 		your spouse and kids. And only if you <emphasis>really</emphasis> trust 
-		them :-).</para>
+		them :-).</para></note>
 		
 		<para>Default: <emphasis>no host equivalences</emphasis></para>
 		<para>Example: <command>hosts equiv = /etc/hosts.equiv</command></para>
@@ -5102,10 +5102,10 @@ df $1 | tail -1 | awk '{print $2" "$4}'
                 This range of ids should have no existing local or NIS users within 
                 it as strange conflicts can occur otherwise.</para>
 
-                <para>NOTE: These userids never appear on the system and Samba will never
+                <note><para>These userids never appear on the system and Samba will never
                 'become' these users. They are used only to ensure that the algorithmic 
                 RID mapping does not conflict with normal users.
-		</para>
+		</para></note>
 
 		<para>Default: <command>non unix account range = &lt;empty string&gt;
 		</command></para>
@@ -5704,10 +5704,10 @@ df $1 | tail -1 | awk '{print $2" "$4}'
 		the "LM1.2X002" or the "NT LM 0.12" protocol, and it must be in 
 		user level security mode.</para>
 
-		<para><emphasis>NOTE:</emphasis> Using a password server 
+		<note><para>Using a password server 
 		means your UNIX box (running Samba) is only as secure as your 
 		password server. <emphasis>DO NOT CHOOSE A PASSWORD SERVER THAT 
-		YOU DON'T COMPLETELY TRUST</emphasis>.</para>
+		YOU DON'T COMPLETELY TRUST</emphasis>.</para></note>
 		
 		<para>Never point a Samba server at itself for password 
 		serving. This will cause a loop and could lock up your Samba 
@@ -6154,10 +6154,10 @@ print5|My Printer 5
 		that the second alias has a space in it gives a hint to Samba 
 		that it's a comment.</para>
 
-		<para><emphasis>NOTE</emphasis>: Under AIX the default printcap 
+		<note><para>Under AIX the default printcap 
 		name is <filename>/etc/qconfig</filename>. Samba will assume the 
 		file is in AIX <filename>qconfig</filename> format if the string
-		<filename>qconfig</filename> appears in the printcap filename.</para>
+		<filename>qconfig</filename> appears in the printcap filename.</para></note>
 
 		<para>Default: <command>printcap name = /etc/printcap</command></para>
 		<para>Example: <command>printcap name = /etc/myprintcap</command></para>
@@ -8294,12 +8294,11 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 		<para>You should point this at your WINS server if you have a
 		multi-subnetted network.</para>
 
-		<para><emphasis>NOTE</emphasis>. You need to set up Samba to point 
+		<note><para>You need to set up Samba to point 
 		to a WINS server if you have multiple subnets and wish cross-subnet 
-		browsing to work correctly.</para>
+		browsing to work correctly.</para></note>
 
-		<para>See the documentation file <ulink url="improved-browsing.html">BROWSING</ulink> 
-		in the docs/ directory of your Samba source distribution.</para>
+		<para>See the documentation file <ulink url="improved-browsing.html">Browsing</ulink> in the samba howto collection.</para>
 
 		<para>Default: <emphasis>not enabled</emphasis></para>
 		<para>Example: <command>wins server = 192.9.200.1</command></para>
diff --git a/docs/docbook/smbdotconf/misc/homedirmap.xml b/docs/docbook/smbdotconf/misc/homedirmap.xml
index 87a59204a2..41e6ca5ea1 100644
--- a/docs/docbook/smbdotconf/misc/homedirmap.xml
+++ b/docs/docbook/smbdotconf/misc/homedirmap.xml
@@ -15,8 +15,8 @@
 		that copes with different map formats and also Amd (another 
 		automounter) maps.</para>
 		
-		<para><emphasis>NOTE :</emphasis>A working NIS client is required on 
-		the system for this option to work.</para>
+		<note><para>A working NIS client is required on 
+				the system for this option to work.</para></note>
 
 		<para>See also <link linkend="NISHOMEDIR"><parameter moreinfo="none">nis homedir</parameter>
 		</link>, <link linkend="DOMAINLOGONS"><parameter moreinfo="none">domain logons</parameter>
diff --git a/docs/docbook/smbdotconf/printing/printcapname.xml b/docs/docbook/smbdotconf/printing/printcapname.xml
index fcfeada54c..0025624d25 100644
--- a/docs/docbook/smbdotconf/printing/printcapname.xml
+++ b/docs/docbook/smbdotconf/printing/printcapname.xml
@@ -36,10 +36,10 @@ print5|My Printer 5
 		that the second alias has a space in it gives a hint to Samba 
 		that it's a comment.</para>
 
-		<para><emphasis>NOTE</emphasis>: Under AIX the default printcap 
+		<note><para>Under AIX the default printcap 
 		name is <filename moreinfo="none">/etc/qconfig</filename>. Samba will assume the 
 		file is in AIX <filename moreinfo="none">qconfig</filename> format if the string
-		<filename moreinfo="none">qconfig</filename> appears in the printcap filename.</para>
+		<filename moreinfo="none">qconfig</filename> appears in the printcap filename.</para></note>
 
 		<para>Default: <command moreinfo="none">printcap name = /etc/printcap</command></para>
 		<para>Example: <command moreinfo="none">printcap name = /etc/myprintcap</command></para>
diff --git a/docs/docbook/smbdotconf/security/hostsequiv.xml b/docs/docbook/smbdotconf/security/hostsequiv.xml
index 68d6d628e8..084d8268ef 100644
--- a/docs/docbook/smbdotconf/security/hostsequiv.xml
+++ b/docs/docbook/smbdotconf/security/hostsequiv.xml
@@ -11,14 +11,14 @@
 		hosts equiv</parameter> may be useful for NT clients which will 
 		not supply passwords to Samba.</para>
 
-		<para><emphasis>NOTE :</emphasis> The use of <parameter moreinfo="none">hosts equiv
+		<note><para>The use of <parameter moreinfo="none">hosts equiv
 		</parameter> can be a major security hole. This is because you are 
 		trusting the PC to supply the correct username. It is very easy to 
 		get a PC to supply a false username. I recommend that the 
 		<parameter moreinfo="none">hosts equiv</parameter> option be only used if you really 
 		know what you are doing, or perhaps on a home network where you trust 
 		your spouse and kids. And only if you <emphasis>really</emphasis> trust 
-		them :-).</para>
+		them :-).</para></note>
 		
 		<para>Default: <emphasis>no host equivalences</emphasis></para>
 		<para>Example: <command moreinfo="none">hosts equiv = /etc/hosts.equiv</command></para>
diff --git a/docs/docbook/smbdotconf/security/nonunixaccountrange.xml b/docs/docbook/smbdotconf/security/nonunixaccountrange.xml
index a8e426649e..baa9a783b0 100644
--- a/docs/docbook/smbdotconf/security/nonunixaccountrange.xml
+++ b/docs/docbook/smbdotconf/security/nonunixaccountrange.xml
@@ -8,10 +8,10 @@
                 This range of ids should have no existing local or NIS users within 
                 it as strange conflicts can occur otherwise.</para>
 
-                <para>NOTE: These userids never appear on the system and Samba will never
+				<note><para>These userids never appear on the system and Samba will never
                 'become' these users. They are used only to ensure that the algorithmic 
                 RID mapping does not conflict with normal users.
-		</para>
+		</para></note>
 
 		<para>Default: <command moreinfo="none">non unix account range = &lt;empty string&gt;
 		</command></para>
diff --git a/docs/docbook/smbdotconf/security/passwordserver.xml b/docs/docbook/smbdotconf/security/passwordserver.xml
index df50ac8f8a..b803816d88 100644
--- a/docs/docbook/smbdotconf/security/passwordserver.xml
+++ b/docs/docbook/smbdotconf/security/passwordserver.xml
@@ -20,10 +20,10 @@
 		the &quot;LM1.2X002&quot; or the &quot;NT LM 0.12&quot; protocol, and it must be in 
 		user level security mode.</para>
 
-		<para><emphasis>NOTE:</emphasis> Using a password server 
+		<note><para>Using a password server 
 		means your UNIX box (running Samba) is only as secure as your 
 		password server. <emphasis>DO NOT CHOOSE A PASSWORD SERVER THAT 
-		YOU DON'T COMPLETELY TRUST</emphasis>.</para>
+		YOU DON'T COMPLETELY TRUST</emphasis>.</para></note>
 		
 		<para>Never point a Samba server at itself for password 
 		serving. This will cause a loop and could lock up your Samba 
diff --git a/docs/docbook/smbdotconf/smb.conf.5.xml b/docs/docbook/smbdotconf/smb.conf.5.xml
index e37add4206..edb94573df 100644
--- a/docs/docbook/smbdotconf/smb.conf.5.xml
+++ b/docs/docbook/smbdotconf/smb.conf.5.xml
@@ -292,11 +292,11 @@ alias|alias|alias|alias...
 		components (if there are more than one) are separated by vertical 
 		bar symbols ('|').</para>
 		
-		<para>NOTE: On SYSV systems which use lpstat to determine what 
+		<note><para>On SYSV systems which use lpstat to determine what 
 		printers are defined on the system you may be able to use
 		&quot;printcap name = lpstat&quot; to automatically obtain a list 
 		of printers. See the &quot;printcap name&quot; option 
-		for more details.</para>
+		for more details.</para></note>
 	</refsect2>
 </refsect1>
 
diff --git a/docs/docbook/smbdotconf/wins/winsserver.xml b/docs/docbook/smbdotconf/wins/winsserver.xml
index ba49f687f6..2a644d3f09 100644
--- a/docs/docbook/smbdotconf/wins/winsserver.xml
+++ b/docs/docbook/smbdotconf/wins/winsserver.xml
@@ -8,9 +8,9 @@
 		<para>You should point this at your WINS server if you have a
 		multi-subnetted network.</para>
 
-		<para><emphasis>NOTE</emphasis>. You need to set up Samba to point 
+		<note><para>You need to set up Samba to point 
 		to a WINS server if you have multiple subnets and wish cross-subnet 
-		browsing to work correctly.</para>
+		browsing to work correctly.</para></note>
 
 		<para>See the documentation file <ulink url="improved-browsing.html">BROWSING</ulink> 
 		in the docs/ directory of your Samba source distribution.</para>