Merge remote-tracking branch 'upstream/master'

2016-06-22 16:43:04 -05:00 · 2016-06-22 16:43:04 -05:00 · 70d2648639
parent 36146964d8 679fb57acc
commit 70d2648639
1 changed files with 1 additions and 1 deletions
--- a/i3lock.1
+++ b/i3lock.1
@ -134,7 +134,7 @@ use a wrapper script around i3lock like the following:
 \&	revert() {
 \&	  xset dpms 0 0 0
 \&	}
-\&	trap revert SIGHUP SIGINT SIGTERM
+\&	trap revert HUP INT TERM
 \&	xset +dpms dpms 5 5 5
 \&	i3lock -n
 \&	revert