The branch, v3-5-test has been updated via b737434... s3-docs: Move -D option to the right paragraph in man winbindd. from 9649538... work around AIX6.1 name space pollution rename mod_name to module_name
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log ----------------------------------------------------------------- commit b737434fbf60c250166f10cf196af8030b388bdb Author: Karolin Seeger <ksee...@samba.org> Date: Wed May 12 11:24:57 2010 +0200 s3-docs: Move -D option to the right paragraph in man winbindd. Fix bug #7260 (Command line option documentation in wrong place in winbindd man page.). Thanks to Ged Haywood <sa...@jubileegroup.co.uk> for reporting! Karolin (cherry picked from commit da5c49d727150eea7d2a4b83da1a02ac1f26e77c) ----------------------------------------------------------------------- Summary of changes: docs-xml/manpages-3/winbindd.8.xml | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml index 91ac2c8..ba20c5e 100644 --- a/docs-xml/manpages-3/winbindd.8.xml +++ b/docs-xml/manpages-3/winbindd.8.xml @@ -80,16 +80,6 @@ <variablelist> <varlistentry> - <term>-D</term> - <listitem><para>If specified, this parameter causes - the server to operate as a daemon. That is, it detaches - itself and runs in the background on the appropriate port. - This switch is assumed if <command>winbindd</command> is - executed on the command line of a shell. - </para></listitem> - </varlistentry> - - <varlistentry> <term>hosts</term> <listitem><para>This feature is only available on IRIX. User information traditionally stored in @@ -147,6 +137,16 @@ hosts: files wins <variablelist> <varlistentry> + <term>-D</term> + <listitem><para>If specified, this parameter causes + the server to operate as a daemon. That is, it detaches + itself and runs in the background on the appropriate port. + This switch is assumed if <command>winbindd</command> is + executed on the command line of a shell. + </para></listitem> + </varlistentry> + + <varlistentry> <term>-F</term> <listitem><para>If specified, this parameter causes the main <command>winbindd</command> process to not daemonize, -- Samba Shared Repository