From 0aa4383c9a1b3b693ee771e7829ed84582b4577c Mon Sep 17 00:00:00 2001
From: Nuew <code@nuew.net>
Date: Thu, 24 Mar 2016 18:02:34 -0400
Subject: Add choice of display to --image.

Additionally
  - Made background colors display when an image is enabled if
a --color is specified.
  - Link CJson to swaylock.
  - Add the --socket option to swaylock.
---
 swaylock/swaylock.1.txt | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'swaylock/swaylock.1.txt')

diff --git a/swaylock/swaylock.1.txt b/swaylock/swaylock.1.txt
index 04594fd0..724573ce 100644
--- a/swaylock/swaylock.1.txt
+++ b/swaylock/swaylock.1.txt
@@ -23,10 +23,11 @@ Options
 	Show help message and quit.
 
 *-c, \--color* <rrggbb[aa]>::
-	Turn the screen into the given color instead of white.
+	Turn the screen into the given color instead of white. If an image is in use,
+	also enables color display.
 
-*-i, \--image* <path>::
-	Display the given image.
+*-i, \--image* [<display>:]<path>::
+	Display the given image, optionally only on the given display.
 
 *-s, \--scaling*::
 	Scaling mode for images: stretch, fill, fit, center, or tile.
@@ -37,6 +38,11 @@ Options
 *-v, \--version*::
 	Show the version number and quit.
 
+*--socket <path>*::
+	Use the specified socket path. Otherwise, swaymsg will ask sway where the
+	socket is (which is the value of $SWAYSOCK, then of $I3SOCK).
+
+
 Authors
 -------
 
-- 
cgit v1.2.3


From 644c13de77864120d999242a4a92ad053ecdc2e1 Mon Sep 17 00:00:00 2001
From: Nuew <code@nuew.net>
Date: Thu, 24 Mar 2016 18:49:58 -0400
Subject: Change 'display' to 'output' in swaylock docs where necessary

---
 swaylock/main.c         | 14 +++++++-------
 swaylock/swaylock.1.txt |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'swaylock/swaylock.1.txt')

diff --git a/swaylock/main.c b/swaylock/main.c
index 7f4c424d..202d95c2 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -250,13 +250,13 @@ int main(int argc, char **argv) {
 	const char *usage =
 		"Usage: swaylock [options...]\n"
 		"\n"
-		"  -h, --help                      Show help message and quit.\n"
-		"  -c, --color <rrggbb[aa]>        Turn the screen into the given color instead of white.\n"
-		"  -s, --scaling                   Scaling mode: stretch, fill, fit, center, tile.\n"
-		"  -t, --tiling                    Same as --scaling=tile.\n"
-		"  -v, --version                   Show the version number and quit.\n"
-		"  -i, --image [<display>:]<path>  Display the given image.\n"
-		"  --socket <socket>               Use the specified socket.\n";
+		"  -h, --help                     Show help message and quit.\n"
+		"  -c, --color <rrggbb[aa]>       Turn the screen into the given color instead of white.\n"
+		"  -s, --scaling                  Scaling mode: stretch, fill, fit, center, tile.\n"
+		"  -t, --tiling                   Same as --scaling=tile.\n"
+		"  -v, --version                  Show the version number and quit.\n"
+		"  -i, --image [<output>:]<path>  Display the given image.\n"
+		"  --socket <socket>              Use the specified socket.\n";
 
 	registry = registry_poll();
 
diff --git a/swaylock/swaylock.1.txt b/swaylock/swaylock.1.txt
index 724573ce..c30e8d3d 100644
--- a/swaylock/swaylock.1.txt
+++ b/swaylock/swaylock.1.txt
@@ -26,8 +26,8 @@ Options
 	Turn the screen into the given color instead of white. If an image is in use,
 	also enables color display.
 
-*-i, \--image* [<display>:]<path>::
-	Display the given image, optionally only on the given display.
+*-i, \--image* [<output>:]<path>::
+	Display the given image, optionally only on the given output.
 
 *-s, \--scaling*::
 	Scaling mode for images: stretch, fill, fit, center, or tile.
-- 
cgit v1.2.3