From 63c87884d494b22b6b7f055ed75dc259c2997e79 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 1 Apr 2003 19:48:15 +0000 Subject: - Update documentation of 'wins server' (add info about tags, namespaces) (This used to be commit 1a3f8a5f8ad97b2d431b22fbda74cc3f2400e2f9) --- docs/docbook/manpages/smb.conf.5.sgml | 16 ++++++++++++++- docs/docbook/projdoc/Browsing.sgml | 32 ++++++++++++++--------------- docs/docbook/projdoc/upgrading-to-3.0.sgml | 12 ++++------- docs/docbook/smbdotconf/wins/winsserver.xml | 19 +++++++++++++---- 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 6cdfba11ea..2fbd27b934 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/ You should point this at your WINS server if you have a multi-subnetted network. + 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. + + 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. + See the documentation file Browsing in the samba howto collection. Default: not enabled - Example: wins server = 192.9.200.1 + Example: wins server = mary:192.9.200.1 fred:192.168.3.199 mary:192.168.2.61 + 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. + + + Example: wins server = 192.9.200.1 192.168.2.61 + diff --git a/docs/docbook/projdoc/Browsing.sgml b/docs/docbook/projdoc/Browsing.sgml index aeb3b477c5..60512c3cd1 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 : - domain master = yes - local master = yes - preferred master = yes - os level = 65 +domain master = yes +local master = yes +preferred master = yes +os level = 65 @@ -559,10 +559,10 @@ smb.conf file : - domain master = no - local master = yes - preferred master = yes - os level = 65 +domain master = no +local master = yes +preferred master = yes +os level = 65 @@ -588,10 +588,10 @@ options in the [global] section of the smb.conf file : - domain master = no - local master = no - preferred master = no - os level = 0 +domain master = no +local master = no +preferred master = no +os level = 0 @@ -619,10 +619,10 @@ file : - domain master = no - local master = yes - preferred master = yes - os level = 65 +domain master = no +local master = yes +preferred master = yes +os level = 65 diff --git a/docs/docbook/projdoc/upgrading-to-3.0.sgml b/docs/docbook/projdoc/upgrading-to-3.0.sgml index f227556151..cd0ec2064d 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. -printer driver -printer driver file -printer driver location +printer driver (replaced by new driver procedures) +printer driver file (replaced by new driver procedures) +printer driver location (replaced by new driver procedures) use rhosts postscript +client code page (replaced by dos charset) - -The first three options have been replaced by new driver procedures. -Please read the printing documentation. - - diff --git a/docs/docbook/smbdotconf/wins/winsserver.xml b/docs/docbook/smbdotconf/wins/winsserver.xml index 2a644d3f09..ebdb3016c7 100644 --- a/docs/docbook/smbdotconf/wins/winsserver.xml +++ b/docs/docbook/smbdotconf/wins/winsserver.xml @@ -8,14 +8,25 @@ You should point this at your WINS server if you have a multi-subnetted network. + 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. + + 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. - See the documentation file BROWSING - in the docs/ directory of your Samba source distribution. + See the documentation file Browsing in the samba howto collection. + + Default: not enabled + Example: wins server = mary:192.9.200.1 fred:192.168.3.199 mary:192.168.2.61 + 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. + - Default: not enabled - Example: wins server = 192.9.200.1 + Example: wins server = 192.9.200.1 192.168.2.61 -- cgit