Move all PAM code behind UES_PAM and enable that by default.

[i3/i3lock] / i3lock.1

diff --git a/i3lock.1 b/i3lock.1
index 07f127054de8242d4e90f7ac1d4cdda421fe8b86..55af52d759a7576ec53a2058310953b04b8a78e9 100644 (file)
--- a/i3lock.1
+++ b/i3lock.1
@@ -18,7 +18,6 @@ i3lock \- improved screen locker
 .RB [\|\-v\|]
 .RB [\|\-n\|]
 .RB [\|\-b\|]
 .RB [\|\-v\|]
 .RB [\|\-n\|]
 .RB [\|\-b\|]

-.RB [\|\-d\|]

 .RB [\|\-i
 .IR image.png \|]
 .RB [\|\-c
 .RB [\|\-i
 .IR image.png \|]
 .RB [\|\-c


@@ -28,7 +27,6 @@ i3lock \- improved screen locker
 .IR pointer\|]
 .RB [\|\-u\|]
 .RB [\|\-e\|]
 .IR pointer\|]
 .RB [\|\-u\|]
 .RB [\|\-e\|]

-.RB [\|\-I\|]

 .RB [\|\-f\|]
 
 .SH DESCRIPTION
 .RB [\|\-f\|]
 
 .SH DESCRIPTION


@@ -64,19 +62,6 @@ Don't fork after starting.
 Enable beeping. Be sure to not do this when you are about to annoy other people,
 like when opening your laptop in a boring lecture.
 
 Enable beeping. Be sure to not do this when you are about to annoy other people,
 like when opening your laptop in a boring lecture.
 

-.TP
-.B \-d, \-\-dpms
-Enable turning off your screen using DPMS. Note that, when you do not specify this
-option, DPMS will turn off your screen after 15 minutes of inactivity anyways (if
-you did not disable this in your X server).
-
-.TP
-.B \-I, \-\-inactivity-timeout
-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
-30 seconds.
-

 .TP
 .B \-u, \-\-no-unlock-indicator
 Disable the unlock indicator. i3lock will by default show an unlock indicator
 .TP
 .B \-u, \-\-no-unlock-indicator
 Disable the unlock indicator. i3lock will by default show an unlock indicator


@@ -125,6 +110,29 @@ Show the number of failed attempts, if any.
 Enables debug logging.
 Note, that this will log the password used for authentication to stdout.
 
 Enables debug logging.
 Note, that this will log the password used for authentication to stdout.
 

+.SH DPMS
+
+The \-d (\-\-dpms) option was removed from i3lock in version 2.8. There were
+plenty of use-cases that were not properly addressed, and plenty of bugs
+surrounding that feature. While features are not normally removed from i3 and
+its tools, we felt the need to make an exception in this case.
+
+Users who wish to explicitly enable DPMS only when their screen is locked can
+use a wrapper script around i3lock like the following:
+
+.Vb 6
+\&     #!/bin/sh
+\&     revert() {
+\&       xset dpms 0 0 0
+\&     }
+\&     trap revert HUP INT TERM
+\&     xset +dpms dpms 5 5 5
+\&     i3lock -n
+\&     revert
+.Ve
+
+The \-I (-\-inactivity-timeout=seconds) was removed because it only makes sense with DPMS.
+

 .SH SEE ALSO
 .IR xautolock(1)
 \- use i3lock as your screen saver
 .SH SEE ALSO
 .IR xautolock(1)
 \- use i3lock as your screen saver