xserver: Branch 'master' - 3 commits

[Keith Packard]

 hw/kdrive/ephyr/man/Xephyr.man |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 891123ce9dac5e52685b9a921b33d8279ba52956
Merge: 7e97166 49521ed
Author: Keith Packard <keithp at keithp.com>
Date:   Thu May 23 10:30:15 2013 -0600

    Merge remote-tracking branch 'whot/for-keith'

commit 49521edaf8930b335afac2185209e26e7000820b
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed May 15 08:51:51 2013 +1000

    ephyr: add -resizeable to the man page
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/hw/kdrive/ephyr/man/Xephyr.man b/hw/kdrive/ephyr/man/Xephyr.man
index 792511b..f14f6c8 100644
--- a/hw/kdrive/ephyr/man/Xephyr.man
+++ b/hw/kdrive/ephyr/man/Xephyr.man
@@ -59,6 +59,10 @@ set 'cursor acceleration':
 The host's cursor is reused. This is only really there to aid
 debugging by avoiding server paints for the cursor. Performance
 improvement is negligible.
+.TP 8
+.B -resizeable
+Allow the Xephyr window to be resized, even if not embedded into a parent
+window. By default, the Xephyr window has a fixed size.
 .SH "SIGNALS"
 Send a SIGUSR1 to the server (e.g. pkill -USR1 Xephyr) to
 toggle the debugging mode.
commit 7a4bbfd9f2ce7aad23148ba01bb3f1071da606a3
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed May 15 08:46:38 2013 +1000

    ephyr: fix typo in man page
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/hw/kdrive/ephyr/man/Xephyr.man b/hw/kdrive/ephyr/man/Xephyr.man
index ca88ab2..792511b 100644
--- a/hw/kdrive/ephyr/man/Xephyr.man
+++ b/hw/kdrive/ephyr/man/Xephyr.man
@@ -46,7 +46,7 @@ and the following additional options:
 sets the screen size.
 .TP 8
 .BI -parent " id"
-uses exiting window
+uses existing window
 .I id .
 If a
 .BI -screen