commit c5bb1d55e00df320033469eceb81ec03d8a52d80
parent 105a86dc570761f3bfea1151ed9968f3c95dd4ca
Author: Michael Stapelberg <stapelberg@users.noreply.github.com>
Date: Thu, 2 Jul 2015 23:30:44 -0700
Merge pull request #24 from ixjlyons/timeout-doc
Indicate that the --inactivity-timeout option takes an argument.
Diffstat:
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/i3lock.1 b/i3lock.1
@@ -28,7 +28,8 @@ i3lock \- improved screen locker
.IR pointer\|]
.RB [\|\-u\|]
.RB [\|\-e\|]
-.RB [\|\-I\|]
+.RB [\|\-I
+.IR timeout\|]
.RB [\|\-f\|]
.SH DESCRIPTION
@@ -71,7 +72,7 @@ option, DPMS will turn off your screen after 15 minutes of inactivity anyways (i
you did not disable this in your X server).
.TP
-.B \-I, \-\-inactivity-timeout
+.BI \-I\ seconds \fR,\ \fB\-\-inactivity-timeout= seconds
Specifies the number of seconds i3lock will wait for another password before
turning off the monitors, in case you entered a wrong password or canceled by
pressing Escape. Only makes sense together with \-d. If omitted, the default is
diff --git a/i3lock.c b/i3lock.c
@@ -858,7 +858,7 @@ int main(int argc, char *argv[]) {
break;
default:
errx(EXIT_FAILURE, "Syntax: i3lock [-v] [-n] [-b] [-d] [-c color] [-u] [-p win|default]"
- " [-i image.png] [-t] [-e] [-I] [-f]");
+ " [-i image.png] [-t] [-e] [-I timeout] [-f]");
}
}