From 045b0cbf342d50ce07fc768fbce63b9bd0309215 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Wed, 29 Jan 2014 13:24:15 +0100
Subject: [PATCH 73/73] MAN: clarify which shell option takes precedence
---
src/man/sssd.conf.5.xml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index b879bdf63c40e80efa21644bd9ba9d2d3477af06..84770f6b28876278a0ddd6d8a8a8f9a8e0d3146f 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
--
1.8.4.2