sway

commit 9ae3b2fb0b3b7405556b3c52344cf256e73f632b
parent 25b6adb7ac47c7444afeb8c801ce154863011d83
Author: Drew DeVault <sir@cmpwn.com>
Date:   Mon, 19 Jun 2017 08:17:41 -0400

Merge pull request #1244 from her001/swaylock-man-corrections

Correct swaylock man page description of -i and -c
Diffstat:
M
completions/zsh/_swaylock
 | 
2
+-
M
swaylock/swaylock.1.txt
 | 
9
+++++----

2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/completions/zsh/_swaylock b/completions/zsh/_swaylock
@@ -7,7 +7,7 @@ _arguments -s \
     '(-v --version)'{-v,--version}'[Show the version number and quit]' \
     '(-h --help)'{-h,--help}'[Show help message and quit]' \
     '(-f --daemonize)'{-f, --daemonize}'[Detach from the controlling terminal]\
-    '(-c --color)'{-c,--color}'[Specify a color (rrggbb) instead of white]' \
+    '(-c --color)'{-c,--color}'[Specify a color (rrggbb)]' \
     '(-i --image)'{-i,--image}'[Display an image]:files:_files' \
     '(-s --scaling)'{-s,--scaling}'[Scaling mode]:mode:(stretch fill fit center tile)' \
     '(-u --no-unlock-indicator)'{-u,--no-unlock-indicator}'[Disable the unlock indicator]'
diff --git a/swaylock/swaylock.1.txt b/swaylock/swaylock.1.txt
@@ -23,12 +23,13 @@ Options
 	Show help message and quit.
 
 *-c, \--color* <rrggbb[aa]>::
-	Turn the screen into the given color instead of white. If an image is in use,
-	also enables color display. This option and -i are mutually exclusive.
+	Turn the screen into the given color. If -i is used, this sets the
+	background of the image to the given color. Defaults to white (ffffff), or
+	transparent (00000000) if an image is in use.
 
 *-i, \--image* [<output>:]<path>::
-	Display the given image, optionally only on the given output. This option
-	and -c are mutually exclusive.
+	Display the given image, optionally only on the given output. Use -c to set
+	a background color.
 
 *--scaling*::
 	Scaling mode for images: stretch, fill, fit, center, or tile.