From 274b7650447f3580ba78e36a87f1cd88718c2032 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Fri, 11 Apr 2003 14:26:21 +0000 Subject: [PATCH] Finish conversion of Browse options (This used to be commit e59bd1d9fba71e7b8841a6d995f7bb9e156a15cc) --- docs/docbook/smbdotconf/browse/browsable.xml | 14 +++-- docs/docbook/smbdotconf/browse/browseable.xml | 19 +++--- docs/docbook/smbdotconf/browse/browselist.xml | 24 +++++--- docs/docbook/smbdotconf/browse/domainmaster.xml | 72 ++++++++++++---------- .../docbook/smbdotconf/browse/enhancedbrowsing.xml | 51 +++++++-------- docs/docbook/smbdotconf/browse/lmannounce.xml | 51 +++++++-------- docs/docbook/smbdotconf/browse/lminterval.xml | 37 ++++++----- docs/docbook/smbdotconf/browse/localmaster.xml | 40 ++++++------ docs/docbook/smbdotconf/browse/oslevel.xml | 46 +++++++------- docs/docbook/smbdotconf/browse/preferedmaster.xml | 15 +++-- docs/docbook/smbdotconf/browse/preferredmaster.xml | 54 ++++++++-------- 11 files changed, 231 insertions(+), 192 deletions(-) rewrite docs/docbook/smbdotconf/browse/browseable.xml (99%) rewrite docs/docbook/smbdotconf/browse/browselist.xml (99%) rewrite docs/docbook/smbdotconf/browse/domainmaster.xml (98%) rewrite docs/docbook/smbdotconf/browse/enhancedbrowsing.xml (99%) rewrite docs/docbook/smbdotconf/browse/lmannounce.xml (98%) rewrite docs/docbook/smbdotconf/browse/lminterval.xml (98%) rewrite docs/docbook/smbdotconf/browse/localmaster.xml (99%) rewrite docs/docbook/smbdotconf/browse/oslevel.xml (98%) rewrite docs/docbook/smbdotconf/browse/preferredmaster.xml (99%) diff --git a/docs/docbook/smbdotconf/browse/browsable.xml b/docs/docbook/smbdotconf/browse/browsable.xml index 779571cff20..bd357329273 100644 --- a/docs/docbook/smbdotconf/browse/browsable.xml +++ b/docs/docbook/smbdotconf/browse/browsable.xml @@ -1,5 +1,9 @@ - - browsable (S) - See the - browseable. - + + + See the + browseable. + + diff --git a/docs/docbook/smbdotconf/browse/browseable.xml b/docs/docbook/smbdotconf/browse/browseable.xml dissimilarity index 99% index c223d6c7d7f..5da61cccfb6 100644 --- a/docs/docbook/smbdotconf/browse/browseable.xml +++ b/docs/docbook/smbdotconf/browse/browseable.xml @@ -1,8 +1,11 @@ - - browseable (S) - This controls whether this share is seen in - the list of available shares in a net view and in the browse list. - - Default: browseable = yes - - + + + This controls whether this share is seen in + the list of available shares in a net view and in the browse list. + + Default: browseable = yes + + diff --git a/docs/docbook/smbdotconf/browse/browselist.xml b/docs/docbook/smbdotconf/browse/browselist.xml dissimilarity index 99% index f15e2caf2ac..17a962a3f51 100644 --- a/docs/docbook/smbdotconf/browse/browselist.xml +++ b/docs/docbook/smbdotconf/browse/browselist.xml @@ -1,10 +1,14 @@ - - browse list (G) - This controls whether smbd - 8 will serve a browse list to - a client doing a NetServerEnum call. Normally - set to yes. You should never need to change - this. - - Default: browse list = yes - + + + This controls whether smbd + 8 will serve a browse list to + a client doing a NetServerEnum call. Normally + set to yes. You should never need to change + this. + + Default: browse list = yes + + diff --git a/docs/docbook/smbdotconf/browse/domainmaster.xml b/docs/docbook/smbdotconf/browse/domainmaster.xml dissimilarity index 98% index cf2d504e4d8..7bd334bbb5e 100644 --- a/docs/docbook/smbdotconf/browse/domainmaster.xml +++ b/docs/docbook/smbdotconf/browse/domainmaster.xml @@ -1,34 +1,38 @@ - - domain master (G) - Tell smbd - 8 to enable WAN-wide browse list - collation. Setting this option causes nmbd to - claim a special domain specific NetBIOS name that identifies - it as a domain master browser for its given - workgroup. Local master browsers - in the same workgroup on broadcast-isolated - subnets will give this nmbd their local browse lists, - and then ask smbd - 8 for a complete copy of the browse - list for the whole wide area network. Browser clients will then contact - their local master browser, and will receive the domain-wide browse list, - instead of just the list for their broadcast-isolated subnet. - - Note that Windows NT Primary Domain Controllers expect to be - able to claim this workgroup specific special - NetBIOS name that identifies them as domain master browsers for - that workgroup by default (i.e. there is no - way to prevent a Windows NT PDC from attempting to do this). This - means that if this parameter is set and nmbd claims - the special name for a workgroup before a Windows - NT PDC is able to do so then cross subnet browsing will behave - strangely and may fail. - - If domain logons = yes - , then the default behavior is to enable the domain - master parameter. If domain logons is - not enabled (the default setting), then neither will domain - master be enabled by default. - - Default: domain master = auto - + + + Tell smbd + 8 to enable WAN-wide browse list + collation. Setting this option causes nmbd to + claim a special domain specific NetBIOS name that identifies + it as a domain master browser for its given + workgroup. Local master browsers + in the same workgroup on broadcast-isolated + subnets will give this nmbd their local browse lists, + and then ask smbd + 8 for a complete copy of the browse + list for the whole wide area network. Browser clients will then contact + their local master browser, and will receive the domain-wide browse list, + instead of just the list for their broadcast-isolated subnet. + + Note that Windows NT Primary Domain Controllers expect to be + able to claim this workgroup specific special + NetBIOS name that identifies them as domain master browsers for + that workgroup by default (i.e. there is no + way to prevent a Windows NT PDC from attempting to do this). This + means that if this parameter is set and nmbd claims + the special name for a workgroup before a Windows + NT PDC is able to do so then cross subnet browsing will behave + strangely and may fail. + + If domain logons = yes + , then the default behavior is to enable the domain + master parameter. If domain logons is + not enabled (the default setting), then neither will domain + master be enabled by default. + + Default: domain master = auto + + diff --git a/docs/docbook/smbdotconf/browse/enhancedbrowsing.xml b/docs/docbook/smbdotconf/browse/enhancedbrowsing.xml dissimilarity index 99% index cf8d3e54b99..8fb3be16034 100644 --- a/docs/docbook/smbdotconf/browse/enhancedbrowsing.xml +++ b/docs/docbook/smbdotconf/browse/enhancedbrowsing.xml @@ -1,24 +1,27 @@ - - enhanced browsing (G) - This option enables a couple of enhancements to - cross-subnet browse propagation that have been added in Samba - but which are not standard in Microsoft implementations. - - - The first enhancement to browse propagation consists of a regular - wildcard query to a Samba WINS server for all Domain Master Browsers, - followed by a browse synchronization with each of the returned - DMBs. The second enhancement consists of a regular randomised browse - synchronization with all currently known DMBs. - - You may wish to disable this option if you have a problem with empty - workgroups not disappearing from browse lists. Due to the restrictions - of the browse protocols these enhancements can cause a empty workgroup - to stay around forever which can be annoying. - - In general you should leave this option enabled as it makes - cross-subnet browse propagation much more reliable. - - Default: enhanced browsing = yes - - + + + This option enables a couple of enhancements to + cross-subnet browse propagation that have been added in Samba + but which are not standard in Microsoft implementations. + + + The first enhancement to browse propagation consists of a regular + wildcard query to a Samba WINS server for all Domain Master Browsers, + followed by a browse synchronization with each of the returned + DMBs. The second enhancement consists of a regular randomised browse + synchronization with all currently known DMBs. + + You may wish to disable this option if you have a problem with empty + workgroups not disappearing from browse lists. Due to the restrictions + of the browse protocols these enhancements can cause a empty workgroup + to stay around forever which can be annoying. + + In general you should leave this option enabled as it makes + cross-subnet browse propagation much more reliable. + + Default: enhanced browsing = yes + + diff --git a/docs/docbook/smbdotconf/browse/lmannounce.xml b/docs/docbook/smbdotconf/browse/lmannounce.xml dissimilarity index 98% index 1551c0991ef..b18234443a5 100644 --- a/docs/docbook/smbdotconf/browse/lmannounce.xml +++ b/docs/docbook/smbdotconf/browse/lmannounce.xml @@ -1,24 +1,27 @@ - - lm announce (G) - This parameter determines if nmbd - 8 will produce Lanman announce - broadcasts that are needed by OS/2 clients in order for them to see - the Samba server in their browse list. This parameter can have three - values, yes, no, or - auto. The default is auto. - If set to no Samba will never produce these - broadcasts. If set to yes Samba will produce - Lanman announce broadcasts at a frequency set by the parameter - lm interval. If set to auto - Samba will not send Lanman announce broadcasts by default but will - listen for them. If it hears such a broadcast on the wire it will - then start sending them at a frequency set by the parameter - lm interval. - - See also lm interval - . - - Default: lm announce = auto - Example: lm announce = yes - - + + + This parameter determines if nmbd + 8 will produce Lanman announce + broadcasts that are needed by OS/2 clients in order for them to see + the Samba server in their browse list. This parameter can have three + values, yes, no, or + auto. The default is auto. + If set to no Samba will never produce these + broadcasts. If set to yes Samba will produce + Lanman announce broadcasts at a frequency set by the parameter + lm interval. If set to auto + Samba will not send Lanman announce broadcasts by default but will + listen for them. If it hears such a broadcast on the wire it will + then start sending them at a frequency set by the parameter + lm interval. + + See also lm interval. + + Default: lm announce = auto + + Example: lm announce = yes + + diff --git a/docs/docbook/smbdotconf/browse/lminterval.xml b/docs/docbook/smbdotconf/browse/lminterval.xml dissimilarity index 98% index cc17dc15b05..58e4cc30ba6 100644 --- a/docs/docbook/smbdotconf/browse/lminterval.xml +++ b/docs/docbook/smbdotconf/browse/lminterval.xml @@ -1,17 +1,20 @@ - - lm interval (G) - If Samba is set to produce Lanman announce - broadcasts needed by OS/2 clients (see the - lm announce parameter) then this - parameter defines the frequency in seconds with which they will be - made. If this is set to zero then no Lanman announcements will be - made despite the setting of the lm announce - parameter. - - See also lm - announce. - - Default: lm interval = 60 - Example: lm interval = 120 - - + + + If Samba is set to produce Lanman announce + broadcasts needed by OS/2 clients (see the + lm announce parameter) then this + parameter defines the frequency in seconds with which they will be + made. If this is set to zero then no Lanman announcements will be + made despite the setting of the lm announce + parameter. + + See also lm announce. + + Default: lm interval = 60 + + Example: lm interval = 120 + + diff --git a/docs/docbook/smbdotconf/browse/localmaster.xml b/docs/docbook/smbdotconf/browse/localmaster.xml dissimilarity index 99% index dffbd3cb194..ac2626c679d 100644 --- a/docs/docbook/smbdotconf/browse/localmaster.xml +++ b/docs/docbook/smbdotconf/browse/localmaster.xml @@ -1,18 +1,22 @@ - - local master (G) - This option allows nmbd - 8 to try and become a local master browser - on a subnet. If set to no then - nmbd will not attempt to become a local master browser - on a subnet and will also lose in all browsing elections. By - default this value is set to yes. Setting this value to yes doesn't - mean that Samba will become the local master - browser on a subnet, just that nmbd will - participate in elections for local master browser. - - Setting this value to no will cause nmbd - never to become a local master browser. - - Default: local master = yes - - + + + This option allows nmbd + 8 to try and become a local master browser + on a subnet. If set to no then + nmbd will not attempt to become a local master browser + on a subnet and will also lose in all browsing elections. By + default this value is set to yes. Setting this value to + yes doesn't mean that Samba will become the + local master browser on a subnet, just that nmbd + will participate in elections for local master browser. + + Setting this value to no will cause nmbd never to become a local + master browser. + + Default: local master = yes + + diff --git a/docs/docbook/smbdotconf/browse/oslevel.xml b/docs/docbook/smbdotconf/browse/oslevel.xml dissimilarity index 98% index 927db322047..560516e3f8d 100644 --- a/docs/docbook/smbdotconf/browse/oslevel.xml +++ b/docs/docbook/smbdotconf/browse/oslevel.xml @@ -1,21 +1,25 @@ - - os level (G) - This integer value controls what level Samba - advertises itself as for browse elections. The value of this - parameter determines whether nmbd - 8 - has a chance of becoming a local master browser for the - WORKGROUP in the local broadcast area. - - Note :By default, Samba will win - a local master browsing election over all Microsoft operating - systems except a Windows NT 4.0/2000 Domain Controller. This - means that a misconfigured Samba host can effectively isolate - a subnet for browsing purposes. See BROWSING.txt - in the Samba docs/ directory - for details. - - Default: os level = 20 - Example: os level = 65 - - + + + This integer value controls what level Samba + advertises itself as for browse elections. The value of this + parameter determines whether nmbd + 8 + has a chance of becoming a local master browser for the + WORKGROUP in the local broadcast area. + + Note :By default, Samba will win + a local master browsing election over all Microsoft operating + systems except a Windows NT 4.0/2000 Domain Controller. This + means that a misconfigured Samba host can effectively isolate + a subnet for browsing purposes. See BROWSING.txt + in the Samba docs/ directory + for details. + + Default: os level = 20 + + Example: os level = 65 + + diff --git a/docs/docbook/smbdotconf/browse/preferedmaster.xml b/docs/docbook/smbdotconf/browse/preferedmaster.xml index 8098626c510..2e8cd938ea4 100644 --- a/docs/docbook/smbdotconf/browse/preferedmaster.xml +++ b/docs/docbook/smbdotconf/browse/preferedmaster.xml @@ -1,6 +1,9 @@ - - prefered master (G) - Synonym for - preferred master for people who cannot spell :-). - - + + + Synonym for + preferred master for people who cannot spell :-). + + diff --git a/docs/docbook/smbdotconf/browse/preferredmaster.xml b/docs/docbook/smbdotconf/browse/preferredmaster.xml dissimilarity index 99% index 53934fdb780..31c966b4ac9 100644 --- a/docs/docbook/smbdotconf/browse/preferredmaster.xml +++ b/docs/docbook/smbdotconf/browse/preferredmaster.xml @@ -1,25 +1,29 @@ - - preferred master (G) - This boolean parameter controls if nmbd(8) is a preferred master browser - for its workgroup. - - If this is set to yes, on startup, nmbd - will force an election, and it will have a slight advantage in - winning the election. It is recommended that this parameter is - used in conjunction with - domain master = yes, so that - nmbd can guarantee becoming a domain master. - - Use this option with caution, because if there are several - hosts (whether Samba servers, Windows 95 or NT) that are preferred - master browsers on the same subnet, they will each periodically - and continuously attempt to become the local master browser. - This will result in unnecessary broadcast traffic and reduced browsing - capabilities. - - See also os level - . - - Default: preferred master = auto - - + + + This boolean parameter controls if + nmbd + 8 is a preferred master + browser for its workgroup. + + If this is set to yes, on startup, nmbd + will force an election, and it will have a slight advantage in + winning the election. It is recommended that this parameter is + used in conjunction with + domain master = yes, so + that nmbd can guarantee becoming a domain master. + + Use this option with caution, because if there are several + hosts (whether Samba servers, Windows 95 or NT) that are + preferred master browsers on the same subnet, they will each + periodically and continuously attempt to become the local + master browser. This will result in unnecessary broadcast + traffic and reduced browsing capabilities. + + See also os level. + + Default: preferred master = auto + + -- 2.11.4.GIT