diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-04-20 16:53:02 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-20 16:53:02 +0200 |
| commit | 6c9caed48187a0d18becf59ab636af44cbe521b0 (patch) | |
| tree | c47170169077be6f8ae60aed739803ab4ba861b7 /docs-xml | |
| parent | 53765c81f726a8c056cc4e57004592dd489975c9 (diff) | |
| parent | 31120c9eacafd93e0f2c6b0f906af21adadd318a (diff) | |
| download | samba-6c9caed48187a0d18becf59ab636af44cbe521b0.tar.gz samba-6c9caed48187a0d18becf59ab636af44cbe521b0.tar.bz2 samba-6c9caed48187a0d18becf59ab636af44cbe521b0.zip | |
Merge commit 'origin/master' into libcli-auth-merge-without-netlogond
Diffstat (limited to 'docs-xml')
| -rw-r--r-- | docs-xml/manpages-3/net.8.xml | 9 | ||||
| -rw-r--r-- | docs-xml/manpages-3/pam_winbind.7.xml | 9 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/winbind/winbindnormalizenames.xml | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml index 77d7bfbb11..3907f2e53c 100644 --- a/docs-xml/manpages-3/net.8.xml +++ b/docs-xml/manpages-3/net.8.xml @@ -35,6 +35,7 @@ <arg choice="opt">-P</arg> <arg choice="opt">-d debuglevel</arg> <arg choice="opt">-V</arg> + <arg choice="opt">--request-timeout seconds</arg> </cmdsynopsis> </refsynopsisdiv> @@ -125,6 +126,14 @@ </para></listitem> </varlistentry> + <varlistentry> + <term>--request-timeout 30</term> + <listitem><para> + Let client requests timeout after 30 seconds the default is 10 + seconds. + </para></listitem> + </varlistentry> + &stdarg.server.debug; </variablelist> </refsect1> diff --git a/docs-xml/manpages-3/pam_winbind.7.xml b/docs-xml/manpages-3/pam_winbind.7.xml index 80f7dc8273..ff88de8197 100644 --- a/docs-xml/manpages-3/pam_winbind.7.xml +++ b/docs-xml/manpages-3/pam_winbind.7.xml @@ -142,8 +142,15 @@ </para></listitem> </varlistentry> - </variablelist> + <varlistentry> + <term>warn_pwd_expire</term> + <listitem><para> + Defines number of days before pam_winbind starts to warn about passwords that are + going to expire. Defaults to 14 days. + </para></listitem> + </varlistentry> + </variablelist> </para> diff --git a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml index 5b68bca912..ba7168665f 100644 --- a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml +++ b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml @@ -16,7 +16,7 @@ </para> <para>This feature also enables the name aliasing API which can - be used to make domain user and group names to a non-qlaified + be used to make domain user and group names to a non-qualified version. Please refer to the manpage for the configured idmap and nss_info plugin for the specifics on how to configure name aliasing for a specific configuration. Name aliasing takes |