diff options
| author | Gerald Carter <jerry@samba.org> | 2002-01-27 05:37:23 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-01-27 05:37:23 +0000 |
| commit | bc06e06d34c4a5da1272e1f2eab3e00fe3d7a0d4 (patch) | |
| tree | 8a2cf3029ecd344c1ec1efda7193a2374ebb1c65 /docs/docbook/projdoc | |
| parent | 26073c4aec4a45ae58855dd6eecc20cc376c7e8c (diff) | |
| download | samba-bc06e06d34c4a5da1272e1f2eab3e00fe3d7a0d4.tar.gz samba-bc06e06d34c4a5da1272e1f2eab3e00fe3d7a0d4.tar.bz2 samba-bc06e06d34c4a5da1272e1f2eab3e00fe3d7a0d4.zip | |
merge from 2.2 and regenerate
(This used to be commit 55c53ef08974947cf10a79882b63d6d8e8baad4c)
Diffstat (limited to 'docs/docbook/projdoc')
| -rw-r--r-- | docs/docbook/projdoc/UNIX_INSTALL.sgml | 20 | ||||
| -rw-r--r-- | docs/docbook/projdoc/winbind.sgml | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/docs/docbook/projdoc/UNIX_INSTALL.sgml b/docs/docbook/projdoc/UNIX_INSTALL.sgml index ee91f6e07a..90d4843577 100644 --- a/docs/docbook/projdoc/UNIX_INSTALL.sgml +++ b/docs/docbook/projdoc/UNIX_INSTALL.sgml @@ -126,22 +126,22 @@ <sect1> <title>Step 5: Starting the smbd and nmbd</title> - - <para>You must choose to start smbd and nmbd either - as daemons or from <command>inetd</command>. Don't try + + <para>You must choose to start smbd and nmbd either + as daemons or from <command>inetd</command>. Don't try to do both! Either you can put them in <filename> - inetd.conf</filename> and have them started on demand + inetd.conf</filename> and have them started on demand by <command>inetd</command>, or you can start them as daemons either from the command line or in <filename> - /etc/rc.local</filename>. See the man pages for details - on the command line options. Take particular care to read - the bit about what user you need to be in order to start + /etc/rc.local</filename>. See the man pages for details + on the command line options. Take particular care to read + the bit about what user you need to be in order to start Samba. In many cases you must be root.</para> <para>The main advantage of starting <command>smbd</command> - and <command>nmbd</command> as a daemon is that they will - respond slightly more quickly to an initial connection - request. This is, however, unlikely to be a problem.</para> + and <command>nmbd</command> using the recommended daemon method + is that they will respond slightly more quickly to an initial connection + request.</para> <sect2> <title>Step 5a: Starting from inetd.conf</title> diff --git a/docs/docbook/projdoc/winbind.sgml b/docs/docbook/projdoc/winbind.sgml index 8ea419d758..eaa14bf0c2 100644 --- a/docs/docbook/projdoc/winbind.sgml +++ b/docs/docbook/projdoc/winbind.sgml @@ -624,7 +624,7 @@ CEO+TsInternetUser </programlisting></para> <para> -Obviously, I have named my domain 'CEO' and my <parameter>winbindd +Obviously, I have named my domain 'CEO' and my <parameter>winbind separator</parameter> is '+'. </para> |