summaryrefslogtreecommitdiff
path: root/docs/smbdotconf
diff options
context:
space:
mode:
Diffstat (limited to 'docs/smbdotconf')
-rw-r--r--docs/smbdotconf/misc/remoteannounce.xml4
-rw-r--r--docs/smbdotconf/misc/remotebrowsesync.xml4
-rw-r--r--docs/smbdotconf/printing/os2drivermap.xml6
-rw-r--r--docs/smbdotconf/protocol/nameresolveorder.xml28
-rw-r--r--docs/smbdotconf/security/hostsallow.xml9
-rw-r--r--docs/smbdotconf/security/hostsdeny.xml2
-rw-r--r--docs/smbdotconf/vfs/hostmsdfs.xml13
-rw-r--r--docs/smbdotconf/vfs/msdfsroot.xml5
-rw-r--r--docs/smbdotconf/winbind/winbindtrusteddomainsonly.xml13
-rw-r--r--docs/smbdotconf/wins/winsserver.xml2
10 files changed, 43 insertions, 43 deletions
diff --git a/docs/smbdotconf/misc/remoteannounce.xml b/docs/smbdotconf/misc/remoteannounce.xml
index f4fe1d9538..f23968b501 100644
--- a/docs/smbdotconf/misc/remoteannounce.xml
+++ b/docs/smbdotconf/misc/remoteannounce.xml
@@ -33,7 +33,9 @@
config is that stable.
</para>
-<para>See <smbconfoption name="NetworkBrowsing"/>.</para>
+ <para>
+ See the chapter on Network Browsing in the Samba-HOWTO book.
+ </para>
</description>
<value type="default"></value>
diff --git a/docs/smbdotconf/misc/remotebrowsesync.xml b/docs/smbdotconf/misc/remotebrowsesync.xml
index e133fa4ba9..c966c95be0 100644
--- a/docs/smbdotconf/misc/remotebrowsesync.xml
+++ b/docs/smbdotconf/misc/remotebrowsesync.xml
@@ -6,7 +6,7 @@
<description>
<para>
This option allows you to setup <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> to periodically request
+ <manvolnum>8</manvolnum></citerefentry> 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 @@
</para>
<para>
- The <parameter>remote browse sync</parameter> may be used on networks
+ The <smbconfoption name="remote browse sync"/> 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.
</para>
diff --git a/docs/smbdotconf/printing/os2drivermap.xml b/docs/smbdotconf/printing/os2drivermap.xml
index 4243ecab15..a578d3af44 100644
--- a/docs/smbdotconf/printing/os2drivermap.xml
+++ b/docs/smbdotconf/printing/os2drivermap.xml
@@ -15,9 +15,9 @@
LaserJet 5L</command>.</para>
<para>
- The need for the file is due to the printer driver namespace problem described in <link
- linkend="classicalprinting">the chapter on Classical Printing in the book Samba3-HOWTO</link>. For more
- details on OS/2 clients, please refer to <link linkend="Other-Clients"/>.
+ 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.
</para>
</description>
<value type="default"/>
diff --git a/docs/smbdotconf/protocol/nameresolveorder.xml b/docs/smbdotconf/protocol/nameresolveorder.xml
index d8bbb39589..9b1ad075b1 100644
--- a/docs/smbdotconf/protocol/nameresolveorder.xml
+++ b/docs/smbdotconf/protocol/nameresolveorder.xml
@@ -16,23 +16,23 @@
<itemizedlist>
<listitem>
- <para><constant>lmhosts</constant> : 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 <usmbconfoption
- noescape="1" url="lmhosts.5.html">lmhosts(5)</usmbconfoption> for details) then
- any name type matches for lookup.</para>
+ <para>
+ <constant>lmhosts</constant> : 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.
+ </para>
</listitem>
<listitem>
- <para><constant>host</constant> : Do a standard host
- name to IP address resolution, using the system <filename moreinfo="none">/etc/hosts
- </filename>, 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 <filename moreinfo="none">/etc/nsswitch.conf</filename>
- 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.</para>
+ <para>
+ <constant>host</constant> : Do a standard host name to IP address resolution, using the system
+ <filename moreinfo="none">/etc/hosts </filename>, 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 <filename
+ moreinfo="none">/etc/nsswitch.conf</filename> 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.
+ </para>
</listitem>
<listitem>
diff --git a/docs/smbdotconf/security/hostsallow.xml b/docs/smbdotconf/security/hostsallow.xml
index 5e807daa68..849b515f46 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">
<synonym>allow hosts</synonym>
<description>
- <para>A synonym for this parameter is <parameter moreinfo="none">allow
- hosts</parameter>.</para>
+ <para>A synonym for this parameter is <smbconfoption name="allow hosts"/>.</para>
<para>This parameter is a comma, space, or tab delimited
set of hosts which are permitted to access a service.</para>
@@ -17,9 +16,9 @@
<para>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 <command moreinfo="none">allow hosts = 150.203.5.
- </command>. The full syntax of the list is described in the man
- page <filename moreinfo="none">hosts_access(5)</filename>. Note that this man
+ Class C subnet with something like <command>allow hosts = 150.203.5.</command>.
+ The full syntax of the list is described in the man
+ page <filename>hosts_access(5)</filename>. Note that this man
page may not be present on your system, so a brief description will
be given here also.</para>
diff --git a/docs/smbdotconf/security/hostsdeny.xml b/docs/smbdotconf/security/hostsdeny.xml
index 0f2241cb32..136f86c9c8 100644
--- a/docs/smbdotconf/security/hostsdeny.xml
+++ b/docs/smbdotconf/security/hostsdeny.xml
@@ -14,7 +14,7 @@
<para>
In the event that it is necessary to deny all by default, use the keyword
ALL (or the netmask <literal>0.0.0.0/0</literal>) and then explicitly specify
- to the <link linkend="hostsallow">hosts allow</link> parameter those hosts
+ to the <smbconfoption name="hosts allow">hosts allow</smbconfoption> parameter those hosts
that should be permitted access.
</para>
</description>
diff --git a/docs/smbdotconf/vfs/hostmsdfs.xml b/docs/smbdotconf/vfs/hostmsdfs.xml
index 7d5e3f5a1f..35f42d600b 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">
<description>
- <para>If set to <constant>yes</constant>, Samba will act as a Dfs
- server, and allow Dfs-aware clients to browse Dfs trees hosted
- on the server.</para>
+ <para>
+ If set to <constant>yes</constant>, Samba will act as a Dfs server, and allow Dfs-aware clients to browse
+ Dfs trees hosted on the server.
+ </para>
- <para>See also the <smbconfoption name="msdfs root"/> share level parameter. For
- more information on setting up a Dfs tree on Samba,
- refer to <link linkend="msdfs">the MSFDS chapter in the book Samba3-HOWTO</link>.
+ <para>
+ See also the <smbconfoption name="msdfs root"/> share level parameter. For more information on
+ setting up a Dfs tree on Samba, refer to the MSFDS chapter in the book Samba3-HOWTO.
</para>
</description>
diff --git a/docs/smbdotconf/vfs/msdfsroot.xml b/docs/smbdotconf/vfs/msdfsroot.xml
index 754344180c..1e6a5152a6 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 <filename
- moreinfo="none">msdfs:serverA\\shareA,serverB\\shareB</filename>
+ links of the form <filename>msdfs:serverA\\shareA,serverB\\shareB</filename>
and so on. For more information on setting up a Dfs tree on
- Samba, refer to <link linkend="msdfs">the MSDFS chapter in the Samba3-HOWTO book</link>.</para>
+ Samba, refer to the MSDFS chapter in the Samba3-HOWTO book.</para>
</description>
<related>host msdfs</related>
diff --git a/docs/smbdotconf/winbind/winbindtrusteddomainsonly.xml b/docs/smbdotconf/winbind/winbindtrusteddomainsonly.xml
index 5e2633a1cf..b6c5754f5b 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">
<description>
- <para>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.
-</para>
+ <para>
+ 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 <literal>DOMAIN\user1</literal> would be mapped to the account user1 in /etc/passwd
+ instead of allocating a new uid for him or her.
+ </para>
</description>
<value type="default">no</value>
diff --git a/docs/smbdotconf/wins/winsserver.xml b/docs/smbdotconf/wins/winsserver.xml
index a6ede55c08..afced35f50 100644
--- a/docs/smbdotconf/wins/winsserver.xml
+++ b/docs/smbdotconf/wins/winsserver.xml
@@ -21,7 +21,7 @@
<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 <link linkend="NetworkBrowsing"/>.</para>
+ <para>See the chapter in the Samba3-HOWTO on Network Browsing.</para>
</description>
<value type="default"></value>