aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasanori Kakura <kakurasan@gmail.com>2018-05-07 22:49:17 +0900
committerMasanori Kakura <kakurasan@gmail.com>2018-05-07 22:49:17 +0900
commit001d4aeffadec94368cde5738b957740d2e36980 (patch)
tree6504e9ce30ab6ab056e5ccec4582404090f81325
parentMerge pull request #608 from kakurasan/xdg-spec (diff)
downloadredshift-ng-001d4aeffadec94368cde5738b957740d2e36980.tar.gz
redshift-ng-001d4aeffadec94368cde5738b957740d2e36980.tar.bz2
redshift-ng-001d4aeffadec94368cde5738b957740d2e36980.tar.xz
README, man, apparmor: Update configuration file path
Because of commit 9ff0501.
-rw-r--r--README.md2
-rw-r--r--data/apparmor/usr.bin.redshift.in2
-rw-r--r--redshift.14
3 files changed, 5 insertions, 3 deletions
diff --git a/README.md b/README.md
index 65899e3..3528aa7 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ automatic location provider. An example configuration can be found in
The configuration file should be saved in the following location depending on
the platform:
-- Linux/macOS: `~/.config/redshift.conf`.
+- Linux/macOS: `~/.config/redshift/redshift.conf` (if the environment variable `XDG_CONFIG_HOME` is undefined) or `${XDG_CONFIG_HOME}/redshift/redshift.conf` (if `XDG_CONFIG_HOME` is defined).
- Windows: Put `redshift.conf` in `%USERPROFILE%\AppData\Local\`
(aka `%localappdata%`).
diff --git a/data/apparmor/usr.bin.redshift.in b/data/apparmor/usr.bin.redshift.in
index d6696db..dd9d9ae 100644
--- a/data/apparmor/usr.bin.redshift.in
+++ b/data/apparmor/usr.bin.redshift.in
@@ -35,7 +35,7 @@
# Allow but log any other dbus activity
audit dbus bus=system,
- owner @{HOME}/.config/redshift.conf r,
+ owner @{HOME}/.config/redshift/redshift.conf r,
# Site-specific additions and overrides. See local/README for details.
#include <local/usr.bin.redshift>
diff --git a/redshift.1 b/redshift.1
index dfdc9c0..ab45a4b 100644
--- a/redshift.1
+++ b/redshift.1
@@ -93,7 +93,9 @@ Default temperature values:
Daytime: 6500K, night: 4500K
.SH CONFIGURATION FILE
A configuration file with the name \fIredshift.conf\fR can optionally be
-placed in \fI~/.config/\fR. The file has standard INI format. General
+placed in \fI~/.config/redshift/\fR (if the environment variable
+XDG_CONFIG_HOME is undefined) or \fI${XDG_CONFIG_HOME}/redshift/\fR
+(if XDG_CONFIG_HOME is defined). The file has standard INI format. General
program options are placed under the \fBredshift\fR header, while options
for location providers and adjustment methods are placed under a
header with the name of that provider or method. General options are: