You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
24 lines
1.0 KiB
24 lines
1.0 KiB
7 years ago
|
From 6cf5c5d46e6eb06411dd8b180d3f1b3de1f93652 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alison Chaiken <alison_chaiken@mentor.com>
|
||
|
|
Date: Sun, 15 Mar 2015 16:26:14 -0700
|
||
|
|
Subject: [PATCH] man: standard-conf: change directory reference to wildcard
|
||
|
|
|
||
|
|
(cherry picked from commit 1d940aa32913c108e0282ebd359b2eb999ffeadf)
|
||
|
|
---
|
||
|
|
man/standard-conf.xml | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/man/standard-conf.xml b/man/standard-conf.xml
|
||
|
|
index 36af45927..004f53f70 100644
|
||
|
|
--- a/man/standard-conf.xml
|
||
|
|
+++ b/man/standard-conf.xml
|
||
|
|
@@ -54,7 +54,7 @@
|
||
|
|
directories, and has the lowest precedence; entries in a file in
|
||
|
|
any configuration directory override entries in the single
|
||
|
|
configuration file. Files in the
|
||
|
|
- <filename>logind.conf.d/</filename> configuration subdirectories
|
||
|
|
+ <filename>*.conf.d/</filename> configuration subdirectories
|
||
|
|
are sorted by their filename in lexicographic order, regardless of
|
||
|
|
which of the subdirectories they reside in. If multiple files
|
||
|
|
specify the same option, the entry in the file with the
|