Blame SOURCES/Document-config-file-non-merging.patch
|
 |
aa181f |
From ceeb1ff9226d21ff166d6737bab34b91fa6660fa Mon Sep 17 00:00:00 2001
|
|
|
aa181f |
From: Robbie Harwood <rharwood@redhat.com>
|
|
|
aa181f |
Date: Wed, 10 Jun 2020 15:50:36 -0400
|
|
|
aa181f |
Subject: [PATCH] Document config file non-merging
|
|
|
aa181f |
|
|
|
aa181f |
Merges: #4
|
|
|
aa181f |
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
|
|
|
aa181f |
Reviewed-by: Simo Sorce <simo@redhat.com>
|
|
|
aa181f |
(cherry picked from commit a05b876badd52ba99d95c981f5f8b0e50de28c63)
|
|
|
aa181f |
(cherry picked from commit 2592d32c5c6d39f30dc0bfdb78b5c292ed0af2ae)
|
|
|
aa181f |
---
|
|
|
aa181f |
man/gssproxy.conf.5.xml | 5 ++++-
|
|
|
aa181f |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
aa181f |
|
|
|
aa181f |
diff --git a/man/gssproxy.conf.5.xml b/man/gssproxy.conf.5.xml
|
|
|
aa181f |
index 53cae3d..c8dd504 100644
|
|
|
aa181f |
--- a/man/gssproxy.conf.5.xml
|
|
|
aa181f |
+++ b/man/gssproxy.conf.5.xml
|
|
|
aa181f |
@@ -37,7 +37,10 @@
|
|
|
aa181f |
of the form "##-foo.conf" (that is, start with two numbers
|
|
|
aa181f |
followed by a dash, and end in ".conf"). Files not conforming to
|
|
|
aa181f |
this will be ignored unless specifically requested through command
|
|
|
aa181f |
- line parameters.
|
|
|
aa181f |
+ line parameters. Within a single file, any duplicate values or
|
|
|
aa181f |
+ sections will be merged. Across multiple files, duplicates will
|
|
|
aa181f |
+ generate a warning, and the first value encountered will take
|
|
|
aa181f |
+ precedence (i.e., there is no merging).
|
|
|
aa181f |
</para>
|
|
|
aa181f |
</refsect1>
|
|
|
aa181f |
|