diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-06-19 08:17:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-19 08:17:41 -0400 |
commit | 9ae3b2fb0b3b7405556b3c52344cf256e73f632b (patch) | |
tree | b9a246318c43dcc6f0b8944363a22e9764265486 | |
parent | Merge pull request #1241 from Blajda/ffmpeg-opts (diff) | |
parent | Correct swaylock man page description of -i and -c (diff) | |
download | sway-9ae3b2fb0b3b7405556b3c52344cf256e73f632b.tar.gz sway-9ae3b2fb0b3b7405556b3c52344cf256e73f632b.tar.zst sway-9ae3b2fb0b3b7405556b3c52344cf256e73f632b.zip |
Merge pull request #1244 from her001/swaylock-man-corrections
Correct swaylock man page description of -i and -c
-rw-r--r-- | completions/zsh/_swaylock | 2 | ||||
-rw-r--r-- | swaylock/swaylock.1.txt | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/completions/zsh/_swaylock b/completions/zsh/_swaylock index 3d4f650e..16ef1cb5 100644 --- a/completions/zsh/_swaylock +++ b/completions/zsh/_swaylock | |||
@@ -7,7 +7,7 @@ _arguments -s \ | |||
7 | '(-v --version)'{-v,--version}'[Show the version number and quit]' \ | 7 | '(-v --version)'{-v,--version}'[Show the version number and quit]' \ |
8 | '(-h --help)'{-h,--help}'[Show help message and quit]' \ | 8 | '(-h --help)'{-h,--help}'[Show help message and quit]' \ |
9 | '(-f --daemonize)'{-f, --daemonize}'[Detach from the controlling terminal]\ | 9 | '(-f --daemonize)'{-f, --daemonize}'[Detach from the controlling terminal]\ |
10 | '(-c --color)'{-c,--color}'[Specify a color (rrggbb) instead of white]' \ | 10 | '(-c --color)'{-c,--color}'[Specify a color (rrggbb)]' \ |
11 | '(-i --image)'{-i,--image}'[Display an image]:files:_files' \ | 11 | '(-i --image)'{-i,--image}'[Display an image]:files:_files' \ |
12 | '(-s --scaling)'{-s,--scaling}'[Scaling mode]:mode:(stretch fill fit center tile)' \ | 12 | '(-s --scaling)'{-s,--scaling}'[Scaling mode]:mode:(stretch fill fit center tile)' \ |
13 | '(-u --no-unlock-indicator)'{-u,--no-unlock-indicator}'[Disable the unlock indicator]' | 13 | '(-u --no-unlock-indicator)'{-u,--no-unlock-indicator}'[Disable the unlock indicator]' |
diff --git a/swaylock/swaylock.1.txt b/swaylock/swaylock.1.txt index 1cc77547..0e503f29 100644 --- a/swaylock/swaylock.1.txt +++ b/swaylock/swaylock.1.txt | |||
@@ -23,12 +23,13 @@ Options | |||
23 | Show help message and quit. | 23 | Show help message and quit. |
24 | 24 | ||
25 | *-c, \--color* <rrggbb[aa]>:: | 25 | *-c, \--color* <rrggbb[aa]>:: |
26 | Turn the screen into the given color instead of white. If an image is in use, | 26 | Turn the screen into the given color. If -i is used, this sets the |
27 | also enables color display. This option and -i are mutually exclusive. | 27 | background of the image to the given color. Defaults to white (ffffff), or |
28 | transparent (00000000) if an image is in use. | ||
28 | 29 | ||
29 | *-i, \--image* [<output>:]<path>:: | 30 | *-i, \--image* [<output>:]<path>:: |
30 | Display the given image, optionally only on the given output. This option | 31 | Display the given image, optionally only on the given output. Use -c to set |
31 | and -c are mutually exclusive. | 32 | a background color. |
32 | 33 | ||
33 | *--scaling*:: | 34 | *--scaling*:: |
34 | Scaling mode for images: stretch, fill, fit, center, or tile. | 35 | Scaling mode for images: stretch, fill, fit, center, or tile. |