diff --git a/CHANGELOG.md b/CHANGELOG.md index de82874..2950083 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ If a change only affects particular applications, they are listed in parentheses ## Unreleased +- feat: Load config from /usr/share aswell (!26, thanks @fossdd) - feat(buffyboard): Add man pages (!23, thanks @Jarrah) - misc: Unify build system (!23, thanks @Jarrah) - misc: Ensure stable file order during builds (!24, thanks @devrtz) diff --git a/buffyboard/README.md b/buffyboard/README.md index decb3d7..1ff2093 100644 --- a/buffyboard/README.md +++ b/buffyboard/README.md @@ -44,6 +44,8 @@ Mandatory arguments to long options are mandatory for short options too. -C, --config-override Path to a config override file. Can be supplied multiple times. Config files are merged in the following order: + * /usr/share/buffyboard.conf + * /usr/share/buffyboard.conf.d/* (alphabetically) * /etc/buffyboard.conf * /etc/buffyboard.conf.d/* (alphabetically) * Override files (in supplied order) diff --git a/buffyboard/command_line.c b/buffyboard/command_line.c index b849876..58abf58 100644 --- a/buffyboard/command_line.c +++ b/buffyboard/command_line.c @@ -57,6 +57,8 @@ static void print_usage() { " -C, --config-override Path to a config override file. Can be supplied\n" " multiple times. Config files are merged in the\n" " following order:\n" + " * /usr/share/buffyboard.conf\n" + " * /usr/share/buffyboard.conf.d/* (alphabetically)\n" " * /etc/buffyboard.conf\n" " * /etc/buffyboard.conf.d/* (alphabetically)\n" " * Override files (in supplied order)\n" diff --git a/buffyboard/doc/buffyboard.1.scd b/buffyboard/doc/buffyboard.1.scd index 6699a37..a37957f 100644 --- a/buffyboard/doc/buffyboard.1.scd +++ b/buffyboard/doc/buffyboard.1.scd @@ -27,6 +27,8 @@ result. *-C, --config-override* Path to a config override file. Can be supplied multiple times. Config files are merged in the following order: + - /usr/share/buffyboard.conf + - /usr/share/buffyboard.conf.d/\* (alphabetically) - /etc/buffyboard.conf - /etc/buffyboard.conf.d/\* (alphabetically) - Override files (in supplied order) diff --git a/buffyboard/doc/buffyboard.conf.5.scd b/buffyboard/doc/buffyboard.conf.5.scd index d82ff46..b16a529 100644 --- a/buffyboard/doc/buffyboard.conf.5.scd +++ b/buffyboard/doc/buffyboard.conf.5.scd @@ -14,10 +14,11 @@ one option/value pair per line: