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:25:25 +0100
commit7f8273d35cb7d563b066bf52ae17022b1e9ec3f8 (patch)
tree9a2938b4b68690191bf0abfe939bce62c70202ac /src
parente6f4dbf8474e928ca7da33d6be18e94cbc66a5de (diff)
downloadsssd-7f8273d35cb7d563b066bf52ae17022b1e9ec3f8.tar.gz
sssd-7f8273d35cb7d563b066bf52ae17022b1e9ec3f8.tar.xz
sssd-7f8273d35cb7d563b066bf52ae17022b1e9ec3f8.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 c25b44fc9..b3b70e14a 100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -518,8 +518,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
@@ -583,10 +584,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