- Update documentation of 'wins server' (add info about tags, namespaces)

4 files changed, 50 insertions, 29 deletions

diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 6cdfba11ea8..2fbd27b9344 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -8294,14 +8294,28 @@ 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>If you want to work in multiple namespaces, you can 
+		give every wins server a 'tag'. For each tag, only one 
+		(working) server will be queried for a name. The tag should be 
+		seperated from the ip address by a colon.
+		</para>
+
 		<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></note>
+		
 
 		<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>
+		<para>Example: <command>wins server = mary:192.9.200.1 fred:192.168.3.199 mary:192.168.2.61</command></para>
+		<para>For this example when querying a certain name, 192.19.200.1 will 
+		be asked first and if that doesn't respond 192.168.2.61. If either 
+		of those doesn't know the name 192.168.3.199 will be queried.
+		</para>
+
+		<para>Example: <command>wins server = 192.9.200.1 192.168.2.61</command></para>
+		
 		</listitem>
 		</varlistentry>
 
diff --git a/docs/docbook/projdoc/Browsing.sgml b/docs/docbook/projdoc/Browsing.sgml
index aeb3b477c5e..60512c3cd15 100644
--- a/docs/docbook/projdoc/Browsing.sgml
+++ b/docs/docbook/projdoc/Browsing.sgml
@@ -534,10 +534,10 @@ options in the [global] section of the smb.conf file :
 
 <para>
 <programlisting>
-        domain master = yes
-        local master = yes
-        preferred master = yes
-        os level = 65
+domain master = yes
+local master = yes
+preferred master = yes
+os level = 65
 </programlisting>
 </para>
 
@@ -559,10 +559,10 @@ smb.conf file :
 
 <para>
 <programlisting>
-        domain master = no
-        local master = yes
-        preferred master = yes
-        os level = 65
+domain master = no
+local master = yes
+preferred master = yes
+os level = 65
 </programlisting>
 </para>
 
@@ -588,10 +588,10 @@ options in the [global] section of the smb.conf file :
 
 <para>
 <programlisting>
-        domain master = no
-        local master = no
-        preferred master = no
-        os level = 0
+domain master = no
+local master = no
+preferred master = no
+os level = 0
 </programlisting>
 </para>
 
@@ -619,10 +619,10 @@ file :
 
 <para>
 <programlisting>
-        domain master = no
-        local master = yes
-        preferred master = yes
-        os level = 65
+domain master = no
+local master = yes
+preferred master = yes
+os level = 65
 </programlisting>
 </para>
 
diff --git a/docs/docbook/projdoc/upgrading-to-3.0.sgml b/docs/docbook/projdoc/upgrading-to-3.0.sgml
index f227556151d..cd0ec2064d5 100644
--- a/docs/docbook/projdoc/upgrading-to-3.0.sgml
+++ b/docs/docbook/projdoc/upgrading-to-3.0.sgml
@@ -24,16 +24,12 @@ In 3.0, the following configuration options have been removed.
 </para>
 
 <simplelist>
-<member>printer driver</member>
-<member>printer driver file</member>
-<member>printer driver location</member>
+<member>printer driver (replaced by new driver procedures) </member>
+<member>printer driver file (replaced by new driver procedures)</member>
+<member>printer driver location (replaced by new driver procedures)</member>
 <member>use rhosts</member>
 <member>postscript</member>
+<member>client code page (replaced by dos charset)</member>
 </simplelist>
-
-<para>The first three options have been replaced by new driver procedures. 
-Please read the printing documentation.</para>
-
 </sect1>
-
 </chapter>
diff --git a/docs/docbook/smbdotconf/wins/winsserver.xml b/docs/docbook/smbdotconf/wins/winsserver.xml
index 2a644d3f09f..ebdb3016c70 100644
--- a/docs/docbook/smbdotconf/wins/winsserver.xml
+++ b/docs/docbook/smbdotconf/wins/winsserver.xml
@@ -8,14 +8,25 @@
 		<para>You should point this at your WINS server if you have a
 		multi-subnetted network.</para>
 
+		<para>If you want to work in multiple namespaces, you can 
+		give every wins server a 'tag'. For each tag, only one 
+		(working) server will be queried for a name. The tag should be 
+		seperated from the ip address by a colon.
+		</para>
+
 		<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></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 = mary:192.9.200.1 fred:192.168.3.199 mary:192.168.2.61</command></para>
+		<para>For this example when querying a certain name, 192.19.200.1 will 
+		be asked first and if that doesn't respond 192.168.2.61. If either 
+		of those doesn't know the name 192.168.3.199 will be queried.
+		</para>
 
-		<para>Default: <emphasis>not enabled</emphasis></para>
-		<para>Example: <command moreinfo="none">wins server = 192.9.200.1</command></para>
+		<para>Example: <command>wins server = 192.9.200.1 192.168.2.61</command></para>
 		</listitem>
 		</samba:parameter>