diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-02 09:01:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-02 09:01:55 +0200 |
| commit | 3d353f31ac1671d1b39c09b1f8d82c8811d3edd6 (patch) | |
| tree | ce19dbcec75ce7e87547f6f9b3495888aaea0966 /xorg-server/man/Xserver.man | |
| parent | b2a0f04a2984b290c1224fc1b1883d08b01a6231 (diff) | |
| parent | e67b35e7a899da5805fcce3d390cb10ebcaffe91 (diff) | |
| download | vcxsrv-3d353f31ac1671d1b39c09b1f8d82c8811d3edd6.tar.gz vcxsrv-3d353f31ac1671d1b39c09b1f8d82c8811d3edd6.tar.bz2 vcxsrv-3d353f31ac1671d1b39c09b1f8d82c8811d3edd6.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/os/connection.c
Diffstat (limited to 'xorg-server/man/Xserver.man')
| -rw-r--r-- | xorg-server/man/Xserver.man | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/xorg-server/man/Xserver.man b/xorg-server/man/Xserver.man index 0cd9b941c..8d243d6b7 100644 --- a/xorg-server/man/Xserver.man +++ b/xorg-server/man/Xserver.man @@ -127,6 +127,13 @@ Not obeyed by all servers. .B \-core causes the server to generate a core dump on fatal errors. .TP 8 +.B \-displayfd \fIfd\fP +specifies a file descriptor in the launching process. Rather than specify +a display number, the X server will attempt to listen on successively higher +display numbers, and upon finding a free one, will write the port number back +on this file descriptor as a newline-terminated string. The \-pn option is +ignored when using \-displayfd. +.TP 8 .B \-deferglyphs \fIwhichfonts\fP specifies the types of fonts for which the server should attempt to use deferred glyph loading. \fIwhichfonts\fP can be all (all fonts), |