|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
From 9270c8ffa5a7f12f510772eba0eb40fbb16ad163 Mon Sep 17 00:00:00 2001
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
From: Alison Chaiken <alison_chaiken@mentor.com>
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
Date: Sun, 15 Mar 2015 16:26:14 -0700
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
Subject: [PATCH] man: standard-conf: change directory reference to wildcard
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
(cherry picked from commit 1d940aa32913c108e0282ebd359b2eb999ffeadf)
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
---
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
man/standard-conf.xml | 2 +-
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
diff --git a/man/standard-conf.xml b/man/standard-conf.xml
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
index 36af45927d..004f53f70c 100644
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
--- a/man/standard-conf.xml
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
+++ b/man/standard-conf.xml
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
@@ -54,7 +54,7 @@
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
directories, and has the lowest precedence; entries in a file in
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
any configuration directory override entries in the single
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
configuration file. Files in the
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
- <filename>logind.conf.d/</filename> configuration subdirectories
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
+ <filename>*.conf.d/</filename> configuration subdirectories
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
are sorted by their filename in lexicographic order, regardless of
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
which of the subdirectories they reside in. If multiple files
|
|
Zbigniew Jędrzejewski-Szmek |
77e6ed |
specify the same option, the entry in the file with the
|