Merge from upstream and small wording/linking fixes

README.md

@@ -121,4 +121,4 @@ make
 
 Upstream
 --------
-Please submit pull requests for i3lock things to https://github.com/i3/i3lock and pull requests for features to me here at https://github.com/PandorasFox/i3lock-color.
+Please submit pull requests for i3lock things to https://github.com/i3/i3lock and pull requests for additional features on top of regular i3lock at https://github.com/PandorasFox/i3lock-color.

configure.ac

@@ -2,7 +2,7 @@
 # Run autoreconf -fi to generate a configure script from this file.
 
 AC_PREREQ([2.69])
-AC_INIT([i3lock-color], [2.10], [https://github.com/chrjguill/i3lock-color/issues])
+AC_INIT([i3lock-color], [2.12], [https://github.com/PandorasFox/i3lock-color/issues])
 # For AX_EXTEND_SRCDIR
 AX_ENABLE_BUILDDIR
 AM_INIT_AUTOMAKE([foreign subdir-objects -Wall no-dist-gzip dist-bzip2])

i3lock.1

@@ -83,7 +83,24 @@ as <width>x<height>:<pixfmt>. The supported pixel formats are:
 The "native" pixel format expects a pixel as a 32-bit (4-byte) integer in
 the machine's native endianness, with the upper 8 bits unused. Red, green and blue are stored in
 the remaining bits, in that order.
-Example: \-\-raw=1920x1080:rgb
+
+.BR Example:
+.Vb 6
+\&	--raw=1920x1080:rgb
+.Ve
+
+.BR
+You can use ImageMagick’s
+.IR convert(1)
+program to feed raw images into i3lock:
+
+.BR
+.Vb 6
+\&	convert wallpaper.jpg RGB:- | i3lock --raw 3840x2160:rgb --image /dev/stdin
+.Ve
+
+This allows you to load a variety of image formats without i3lock having to
+support each one explicitly.
 
 .TP
 .BI \-c\  rrggbb \fR,\ \fB\-\-color= rrggbb
@@ -440,6 +457,9 @@ The \-I (-\-inactivity-timeout=seconds) was removed because it only makes sense
 .IR xautolock(1)
 \- use i3lock as your screen saver
 
+.IR convert(1)
+\- feed a wide variety of image formats to i3lock
+
 .SH AUTHOR
 Michael Stapelberg <michael+i3lock at stapelberg dot de>