summaryrefslogtreecommitdiffstats
path: root/docs-xml
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-05-26 09:26:47 +1000
committerAndrew Tridgell <tridge@samba.org>2009-05-26 09:26:47 +1000
commitecdad56b6eedad4a4d8031477827c522cdf6d76e (patch)
treeee924581609a5ddfca9992630502a53f7540db87 /docs-xml
parente15027155d3d880abde83124e252b3dd10a9aae4 (diff)
parent714acfac013a46c3677c3eb72ad57db6d97c7d61 (diff)
downloadsamba-ecdad56b6eedad4a4d8031477827c522cdf6d76e.tar.gz
samba-ecdad56b6eedad4a4d8031477827c522cdf6d76e.tar.xz
samba-ecdad56b6eedad4a4d8031477827c522cdf6d76e.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/Samba3-HOWTO/TOSHARG-Install.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml
index c0ffc05613..d13f6ee4ff 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml
@@ -334,8 +334,8 @@
<variablelist>
<varlistentry><term>nmbd</term>
<listitem><para>
- <indexterm><primary>smbd</primary></indexterm>
- <indexterm><primary>starting samba</primary><secondary>smbd</secondary></indexterm>
+ <indexterm><primary>nmbd</primary></indexterm>
+ <indexterm><primary>starting samba</primary><secondary>nmbd</secondary></indexterm>
This daemon handles all name registration and resolution requests. It is the primary vehicle involved
in network browsing. It handles all UDP-based protocols. The <command>nmbd</command> daemon should
be the first command started as part of the Samba startup process.
@@ -344,8 +344,8 @@
<varlistentry><term>smbd</term>
<listitem><para>
- <indexterm><primary>nmbd</primary></indexterm>
- <indexterm><primary>starting samba</primary><secondary>nmbd</secondary></indexterm>
+ <indexterm><primary>smbd</primary></indexterm>
+ <indexterm><primary>starting samba</primary><secondary>smbd</secondary></indexterm>
This daemon handles all TCP/IP-based connection services for file- and print-based operations. It also
manages local authentication. It should be started immediately following the startup of <command>nmbd</command>.
</para></listitem>