xserver: Branch 'master'

[Keith Packard]

 os/utils.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2535b76c0d32bc1dd0ddaca06a419a68a4757df1
Author: Robert Ancell <robert.ancell at canonical.com>
Date:   Wed Apr 23 08:19:35 2014 +1200

    os: Add -displayfd into -help text
    
    Add -displayfd into -help text. It was mentioned in the man page but seem to have been missed from the -help text.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/os/utils.c b/os/utils.c
index bc5e7df..ed7581e 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -529,6 +529,7 @@ UseMsg(void)
     ErrorF("-cc int                default color visual class\n");
     ErrorF("-nocursor              disable the cursor\n");
     ErrorF("-core                  generate core dump on fatal error\n");
+    ErrorF("-displayfd fd          file descriptor to write display number to when ready to connect\n");
     ErrorF("-dpi int               screen resolution in dots per inch\n");
 #ifdef DPMSExtension
     ErrorF("-dpms                  disables VESA DPMS monitor control\n");