~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clients/, disobedience/: Add `-u' option to override user config file.
[disorder]
/
doc
/
disorder.1.in
diff --git
a/doc/disorder.1.in
b/doc/disorder.1.in
index
5899ab5
..
a5a84f9
100644
(file)
--- a/
doc/disorder.1.in
+++ b/
doc/disorder.1.in
@@
-40,13
+40,20
@@
and \fBdisorder_config\fR (5) for documentation of the configuration file.
.SH OPTIONS
.TP
.B \-\-config \fIPATH\fR, \fB\-c \fIPATH
.SH OPTIONS
.TP
.B \-\-config \fIPATH\fR, \fB\-c \fIPATH
-Set the configuration file.
+Set the
system
configuration file.
The default is
given by the
.B DISORDER_CONFIG
environment variable, defaulting to
.IR pkgconfdir/config .
.TP
The default is
given by the
.B DISORDER_CONFIG
environment variable, defaulting to
.IR pkgconfdir/config .
.TP
+.B \-\-user-config \fIPATH\fR, \fB\-u \fIPATH
+Set the user configuration file.
+THe default is given by the
+.B DISORDER_USERCONFIG
+environment variable, defaulting to
+.IR $HOME/.disorder/passwd .
+.TP
.B \-\-debug\fR, \fB\-d
Enable debugging.
.TP
.B \-\-debug\fR, \fB\-d
Enable debugging.
.TP
@@
-402,6
+409,10
@@
Private configuration file to use instead of
.B DISORDER_USERCONFIG
Per-user configuration file to use instead of
.BR $DISORDER_HOME/passwd .
.B DISORDER_USERCONFIG
Per-user configuration file to use instead of
.BR $DISORDER_HOME/passwd .
+Overridden by the
+.B \-u
+.RB ( \-\-user-config )
+command-line option.
.TP
.B DISORDER_USERCONFIG_SYS
System-provided per-user configuration file to use instead of
.TP
.B DISORDER_USERCONFIG_SYS
System-provided per-user configuration file to use instead of