diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 16:39:35 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 16:39:35 +0100 |
commit | 09ac816b36e45fd537af2f7fe7c57a11f5c744f5 (patch) | |
tree | 4d5d44c27a2395a39efc62359f6e4b6976f2ba2e /docs-xml/smbdotconf/misc/remoteannounce.xml | |
parent | 235244f4cc707130dd130afce88bde49606bd501 (diff) | |
parent | 54bc27e9374742d37b1ed9012d1cfe8f5ace6d40 (diff) | |
download | samba-09ac816b36e45fd537af2f7fe7c57a11f5c744f5.tar.gz samba-09ac816b36e45fd537af2f7fe7c57a11f5c744f5.tar.bz2 samba-09ac816b36e45fd537af2f7fe7c57a11f5c744f5.zip |
Merge branch 'master' of git://git.samba.org/samba into teventfix
Conflicts:
lib/tevent/pytevent.c
Diffstat (limited to 'docs-xml/smbdotconf/misc/remoteannounce.xml')
-rw-r--r-- | docs-xml/smbdotconf/misc/remoteannounce.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs-xml/smbdotconf/misc/remoteannounce.xml b/docs-xml/smbdotconf/misc/remoteannounce.xml index f23968b501..a6bf0c546f 100644 --- a/docs-xml/smbdotconf/misc/remoteannounce.xml +++ b/docs-xml/smbdotconf/misc/remoteannounce.xml @@ -6,7 +6,7 @@ <description> <para> This option allows you to setup <citerefentry><refentrytitle>nmbd</refentrytitle> - <manvolnum>8</manvolnum></citerefentry>to periodically announce itself + <manvolnum>8</manvolnum></citerefentry> to periodically announce itself to arbitrary IP addresses with an arbitrary workgroup name. </para> @@ -23,7 +23,7 @@ </programlisting> the above line would cause <command moreinfo="none">nmbd</command> to announce itself to the two given IP addresses using the given workgroup names. If you leave out the - workgroup name then the one given in the <smbconfoption name="workgroup"/> parameter + workgroup name, then the one given in the <smbconfoption name="workgroup"/> parameter is used instead. </para> |