From 8920ad1215beab24e1bc1b59805e0d51d9bd1615 Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Tue, 1 Nov 2005 22:33:40 +0000 Subject: [PATCH] A slew of fixups that were causing problems for some folk. (This used to be commit 6b2ea0772cd3ec8cd735acec2cde807d972737c5) --- docs/Samba3-HOWTO/index.xml | 4 ++-- docs/smbdotconf/misc/remoteannounce.xml | 4 +++- docs/smbdotconf/misc/remotebrowsesync.xml | 4 ++-- docs/smbdotconf/printing/os2drivermap.xml | 6 ++--- docs/smbdotconf/protocol/nameresolveorder.xml | 28 +++++++++++----------- docs/smbdotconf/security/hostsallow.xml | 9 ++++--- docs/smbdotconf/security/hostsdeny.xml | 2 +- docs/smbdotconf/vfs/hostmsdfs.xml | 13 +++++----- docs/smbdotconf/vfs/msdfsroot.xml | 5 ++-- .../winbind/winbindtrusteddomainsonly.xml | 13 +++++----- docs/smbdotconf/wins/winsserver.xml | 2 +- 11 files changed, 45 insertions(+), 45 deletions(-) diff --git a/docs/Samba3-HOWTO/index.xml b/docs/Samba3-HOWTO/index.xml index 7bbc7dce8c3..62a5313038e 100644 --- a/docs/Samba3-HOWTO/index.xml +++ b/docs/Samba3-HOWTO/index.xml @@ -216,10 +216,10 @@ The chapters in this part each cover specific Samba features. - ---> + diff --git a/docs/smbdotconf/misc/remoteannounce.xml b/docs/smbdotconf/misc/remoteannounce.xml index f4fe1d95382..f23968b5015 100644 --- a/docs/smbdotconf/misc/remoteannounce.xml +++ b/docs/smbdotconf/misc/remoteannounce.xml @@ -33,7 +33,9 @@ config is that stable. -See . + + See the chapter on Network Browsing in the Samba-HOWTO book. + diff --git a/docs/smbdotconf/misc/remotebrowsesync.xml b/docs/smbdotconf/misc/remotebrowsesync.xml index e133fa4ba98..c966c95be07 100644 --- a/docs/smbdotconf/misc/remotebrowsesync.xml +++ b/docs/smbdotconf/misc/remotebrowsesync.xml @@ -6,7 +6,7 @@ This option allows you to setup nmbd - 8 to periodically request + 8 to periodically request synchronization of browse lists with the master browser of a Samba server that is on a remote segment. This option will allow you to gain browse lists for multiple workgroups across routed networks. This @@ -40,7 +40,7 @@ - The remote browse sync may be used on networks + The may be used on networks where there is no WINS server, and may be used on disjoint networks where each network has its own WINS server. diff --git a/docs/smbdotconf/printing/os2drivermap.xml b/docs/smbdotconf/printing/os2drivermap.xml index 4243ecab151..a578d3af443 100644 --- a/docs/smbdotconf/printing/os2drivermap.xml +++ b/docs/smbdotconf/printing/os2drivermap.xml @@ -15,9 +15,9 @@ LaserJet 5L. - The need for the file is due to the printer driver namespace problem described in the chapter on Classical Printing in the book Samba3-HOWTO. For more - details on OS/2 clients, please refer to . + The need for the file is due to the printer driver namespace problem described in + the chapter on Classical Printing in the Samba3-HOWTO book. For more + details on OS/2 clients, please refer to chapter on other clients in the Samba3-HOWTO book. diff --git a/docs/smbdotconf/protocol/nameresolveorder.xml b/docs/smbdotconf/protocol/nameresolveorder.xml index d8bbb395891..9b1ad075b13 100644 --- a/docs/smbdotconf/protocol/nameresolveorder.xml +++ b/docs/smbdotconf/protocol/nameresolveorder.xml @@ -16,23 +16,23 @@ - lmhosts : Lookup an IP - address in the Samba lmhosts file. If the line in lmhosts has - no name type attached to the NetBIOS name (see the lmhosts(5) for details) then - any name type matches for lookup. + + lmhosts : Lookup an IP address in the Samba lmhosts file. If the line in lmhosts has + no name type attached to the NetBIOS name (see the manpage for lmhosts for details) then + any name type matches for lookup. + - host : Do a standard host - name to IP address resolution, using the system /etc/hosts - , NIS, or DNS lookups. This method of name resolution - is operating system depended for instance on IRIX or Solaris this - may be controlled by the /etc/nsswitch.conf - file. Note that this method is used only if the NetBIOS name - type being queried is the 0x20 (server) name type or 0x1c (domain controllers). - The latter case is only useful for active directory domains and results in a DNS - query for the SRV RR entry matching _ldap._tcp.domain. + + host : Do a standard host name to IP address resolution, using the system + /etc/hosts , NIS, or DNS lookups. This method of name resolution is + operating system depended for instance on IRIX or Solaris this may be controlled by the /etc/nsswitch.conf file. Note that this method is used only if the NetBIOS name + type being queried is the 0x20 (server) name type or 0x1c (domain controllers). The latter case is only + useful for active directory domains and results in a DNS query for the SRV RR entry matching + _ldap._tcp.domain. + diff --git a/docs/smbdotconf/security/hostsallow.xml b/docs/smbdotconf/security/hostsallow.xml index 5e807daa68f..849b515f46a 100644 --- a/docs/smbdotconf/security/hostsallow.xml +++ b/docs/smbdotconf/security/hostsallow.xml @@ -5,8 +5,7 @@ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> allow hosts - A synonym for this parameter is allow - hosts. + A synonym for this parameter is . This parameter is a comma, space, or tab delimited set of hosts which are permitted to access a service. @@ -17,9 +16,9 @@ You can specify the hosts by name or IP number. For example, you could restrict access to only the hosts on a - Class C subnet with something like allow hosts = 150.203.5. - . The full syntax of the list is described in the man - page hosts_access(5). Note that this man + Class C subnet with something like allow hosts = 150.203.5.. + The full syntax of the list is described in the man + page hosts_access(5). Note that this man page may not be present on your system, so a brief description will be given here also. diff --git a/docs/smbdotconf/security/hostsdeny.xml b/docs/smbdotconf/security/hostsdeny.xml index 0f2241cb32a..136f86c9c8a 100644 --- a/docs/smbdotconf/security/hostsdeny.xml +++ b/docs/smbdotconf/security/hostsdeny.xml @@ -14,7 +14,7 @@ In the event that it is necessary to deny all by default, use the keyword ALL (or the netmask 0.0.0.0/0) and then explicitly specify - to the hosts allow parameter those hosts + to the hosts allow parameter those hosts that should be permitted access. diff --git a/docs/smbdotconf/vfs/hostmsdfs.xml b/docs/smbdotconf/vfs/hostmsdfs.xml index 7d5e3f5a1f3..35f42d600b3 100644 --- a/docs/smbdotconf/vfs/hostmsdfs.xml +++ b/docs/smbdotconf/vfs/hostmsdfs.xml @@ -4,13 +4,14 @@ advanced="1" developer="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> - If set to yes, Samba will act as a Dfs - server, and allow Dfs-aware clients to browse Dfs trees hosted - on the server. + + If set to yes, Samba will act as a Dfs server, and allow Dfs-aware clients to browse + Dfs trees hosted on the server. + - See also the share level parameter. For - more information on setting up a Dfs tree on Samba, - refer to the MSFDS chapter in the book Samba3-HOWTO. + + See also the share level parameter. For more information on + setting up a Dfs tree on Samba, refer to the MSFDS chapter in the book Samba3-HOWTO. diff --git a/docs/smbdotconf/vfs/msdfsroot.xml b/docs/smbdotconf/vfs/msdfsroot.xml index 754344180ce..1e6a5152a66 100644 --- a/docs/smbdotconf/vfs/msdfsroot.xml +++ b/docs/smbdotconf/vfs/msdfsroot.xml @@ -7,10 +7,9 @@ share as a Dfs root and allows clients to browse the distributed file system tree rooted at the share directory. Dfs links are specified in the share directory by symbolic - links of the form msdfs:serverA\\shareA,serverB\\shareB + links of the form msdfs:serverA\\shareA,serverB\\shareB and so on. For more information on setting up a Dfs tree on - Samba, refer to the MSDFS chapter in the Samba3-HOWTO book. + Samba, refer to the MSDFS chapter in the Samba3-HOWTO book. host msdfs diff --git a/docs/smbdotconf/winbind/winbindtrusteddomainsonly.xml b/docs/smbdotconf/winbind/winbindtrusteddomainsonly.xml index 5e2633a1cf7..b6c5754f5b1 100644 --- a/docs/smbdotconf/winbind/winbindtrusteddomainsonly.xml +++ b/docs/smbdotconf/winbind/winbindtrusteddomainsonly.xml @@ -4,13 +4,12 @@ advanced="1" developer="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> - This parameter is designed to allow Samba servers that - are members of a Samba controlled domain to use UNIX accounts - distributed via NIS, rsync, or LDAP as the uid's for winbindd users - in the hosts primary domain. Therefore, the user DOMAIN\user1 would - be mapped to the account user1 in /etc/passwd instead of allocating - a new uid for him or her. - + + This parameter is designed to allow Samba servers that are members of a Samba controlled domain to use + UNIX accounts distributed via NIS, rsync, or LDAP as the uid's for winbindd users in the hosts primary domain. + Therefore, the user DOMAIN\user1 would be mapped to the account user1 in /etc/passwd + instead of allocating a new uid for him or her. + no diff --git a/docs/smbdotconf/wins/winsserver.xml b/docs/smbdotconf/wins/winsserver.xml index a6ede55c08e..afced35f507 100644 --- a/docs/smbdotconf/wins/winsserver.xml +++ b/docs/smbdotconf/wins/winsserver.xml @@ -21,7 +21,7 @@ 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 . + See the chapter in the Samba3-HOWTO on Network Browsing. -- 2.11.4.GIT