From c82789aad172d7ebd9f616510bdbe950dccd51ac Mon Sep 17 00:00:00 2001
From: Michal Židek <mzidek@redhat.com>
Date: Fri, 1 Jul 2016 11:23:20 +0200
Subject: MAN: Config file merging

Related to:
https://fedorahosted.org/sssd/ticket/2247

Explain configuration merging in sssd.conf
man page.

Signed-off-by: Dan Lavu <dlavu@redhat.com>
Reviewed-by: Dan Lavu <dlavu@redhat.com>
---
 src/man/sssd.conf.5.xml | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

(limited to 'src/man/sssd.conf.5.xml')

diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index d5442d0cd..924dead23 100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -55,6 +55,45 @@
         </para>
     </refsect1>
 
+    <refsect1 id='config-snippets'>
+        <title>CONFIGURATION SNIPPETS FROM INCLUDE DIRECTORY</title>
+
+        <para>
+            The configuration file <filename>sssd.conf</filename> will
+            include configuration snippets using the include directory
+            <filename>conf.d</filename>. This feature is available if
+            SSSD was compiled with libini version 1.3.0 or later.
+        </para>
+
+        <para>
+            Any file placed in <filename>conf.d</filename>
+            that ends in <quote><filename>.conf</filename></quote>
+            and does not begin with a dot (<quote>.</quote>) will
+            be used together with <filename>sssd.conf</filename>
+            to configure SSSD.
+        </para>
+
+        <para>
+            The configuration snippets from <filename>conf.d</filename>
+            have higher priority than <filename>sssd.conf</filename>
+            and will override <filename>sssd.conf</filename> when
+            conflicts occur. If several snippets are present in
+            <filename>conf.d</filename>, then they are included in
+            alphabetical order (based on locale).
+            Files included later have higher priority. Numerical
+            prefixes (<filename>01_snippet.conf</filename>,
+            <filename>02_snippet.conf</filename> etc.) can help
+            visualize the priority (higher number means higher
+            priority).
+        </para>
+
+        <para>
+            The snippet files require the same owner and permissions
+            as <filename>sssd.conf</filename>. Which are by default
+            root:root and 0600.
+        </para>
+    </refsect1>
+
     <refsect1 id='general-options'>
         <title>GENERAL OPTIONS</title>
         <para>
-- 
cgit