summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2014-01-29 13:24:15 +0100
committerJakub Hrozek <jhrozek@redhat.com>2014-01-29 17:27:55 +0100
commit294547ffbea71f472e0f1ca6797fca99c330f976 (patch)
tree5a1b30ca2c2826498f1c7434671038a243a70083 /src
parent580221eebb363fcda33d17f513f54752787bb829 (diff)
downloadsssd-294547ffbea71f472e0f1ca6797fca99c330f976.tar.gz
sssd-294547ffbea71f472e0f1ca6797fca99c330f976.tar.xz
sssd-294547ffbea71f472e0f1ca6797fca99c330f976.zip
MAN: clarify which shell option takes precedence
Diffstat (limited to 'src')
-rw-r--r--src/man/sssd.conf.5.xml13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index b879bdf63..84770f6b2 100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -503,8 +503,9 @@ fallback_homedir = /home/%u
<listitem>
<para>
Override the login shell for all users. This
- option can be specified globally in the [nss]
- section or per-domain.
+ option supersedes any other shell options if
+ it takes effect and can be set either in the
+ [nss] section or per-domain.
</para>
<para>
Default: not set (SSSD will use the value
@@ -568,10 +569,10 @@ fallback_homedir = /home/%u
<term>default_shell</term>
<listitem>
<para>
- The default shell to use if the provider does not
- return one during lookup. This option supersedes
- any other shell options if it takes effect and can
- be set either in the [nss] section or per-domain.
+ The default shell to use if the provider does
+ not return one during lookup. This option can
+ be specified globally in the [nss] section
+ or per-domain.
</para>
<para>
Default: not set (Return NULL if no shell is