summaryrefslogtreecommitdiff
path: root/docs-xml
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-12-14 17:17:55 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-12-14 17:17:55 +0100
commit573441ff9b63fed9ab0b7eaf52df337ccd5592be (patch)
tree77c354f48c04fd7d92aa02cd92125eca3d246eae /docs-xml
parentcd25b6245f8185e36a365dcf4c28e7df13090d3e (diff)
parentdaeb3a190d16a5bc05be63b2b136ebe65d6f6cf7 (diff)
downloadsamba-573441ff9b63fed9ab0b7eaf52df337ccd5592be.tar.gz
samba-573441ff9b63fed9ab0b7eaf52df337ccd5592be.tar.bz2
samba-573441ff9b63fed9ab0b7eaf52df337ccd5592be.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/smbdotconf/misc/socketaddress.xml12
1 files changed, 7 insertions, 5 deletions
diff --git a/docs-xml/smbdotconf/misc/socketaddress.xml b/docs-xml/smbdotconf/misc/socketaddress.xml
index 7566380e70..17018efd40 100644
--- a/docs-xml/smbdotconf/misc/socketaddress.xml
+++ b/docs-xml/smbdotconf/misc/socketaddress.xml
@@ -4,12 +4,14 @@
developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para>This option allows you to control what
- address Samba will listen for connections on. This is used to
- support multiple virtual interfaces on the one server, each
+ <para>This option allows you to control what
+ address Samba will listen for connections on. This is used to
+ support multiple virtual interfaces on the one server, each
with a different configuration.</para>
-
- <para>By default Samba will accept connections on any
+ <para>Setting this option should never be necessary on usual Samba
+ servers running only one nmbd.</para>
+
+ <para>By default Samba will accept connections on any
address.</para>
</description>