From 4689e6ee6d40fb1b99cf339df9bd5190d924904f Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Sun, 19 Apr 2020 12:10:14 +0200 Subject: [PATCH] Clearify system configuration file loading process. --- doc/rofi.1 | 3 ++- doc/rofi.1.markdown | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/rofi.1 b/doc/rofi.1 index 95fcace9..c41a2ea6 100644 --- a/doc/rofi.1 +++ b/doc/rofi.1 @@ -70,7 +70,8 @@ Markup support can be enabled, see CONFIGURATION options. There are currently three methods of setting configuration options (evaluated in order below): .IP \(bu 2 System configuration file (for example \fB\fC/etc/rofi.rasi\fR or old format \fB\fC/etc/rofi.conf\fR). -It checks XDG\_CONFIG\_DIRS and SYSCONFDIR passed at compile time. +It first checks XDG\_CONFIG\_DIRS and then SYSCONFDIR (that is passed at compile time). +It loads the first config file it finds, it does not merge multiple system configuration files. .IP \(bu 2 Xresources: A method of storing key values in the Xserver. See here diff --git a/doc/rofi.1.markdown b/doc/rofi.1.markdown index 78cff763..42345081 100644 --- a/doc/rofi.1.markdown +++ b/doc/rofi.1.markdown @@ -54,7 +54,8 @@ Markup support can be enabled, see CONFIGURATION options. There are currently three methods of setting configuration options (evaluated in order below): * System configuration file (for example `/etc/rofi.rasi` or old format `/etc/rofi.conf`). - It checks XDG_CONFIG_DIRS and SYSCONFDIR passed at compile time. + It first checks XDG_CONFIG_DIRS and then SYSCONFDIR (that is passed at compile time). + It loads the first config file it finds, it does not merge multiple system configuration files. * Xresources: A method of storing key values in the Xserver. See [here](https://en.wikipedia.org/wiki/X_resources) for more information. * Rasi theme file: The new *theme* format can be used to set configuration values.