summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Davenport <qball@gmpclient.org>2020-04-19 12:10:14 +0200
committerDave Davenport <qball@gmpclient.org>2020-04-19 12:10:14 +0200
commit4689e6ee6d40fb1b99cf339df9bd5190d924904f (patch)
treedfd4b8506ae070204c043eb72630dac3df9ed9b4
parente7554da627cbb1c459b19cf51b5d284f4548a9ce (diff)
Clearify system configuration file loading process.
-rw-r--r--doc/rofi.13
-rw-r--r--doc/rofi.1.markdown3
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.