diff options
author | marha <marha@users.sourceforge.net> | 2012-10-15 16:56:14 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-10-15 16:56:14 +0200 |
commit | f15a40afaf6d1b3a4841d25631f947da1b289f89 (patch) | |
tree | f2066dc8caaf2fddd3b88251d18839d5878bfd9b /xorg-server/man | |
parent | f2a3390c8b2052e8f65d3502dd703b5c5b23a28e (diff) | |
parent | 54db46582aba2252d544fa3956522f9ef06b49cb (diff) | |
download | vcxsrv-f15a40afaf6d1b3a4841d25631f947da1b289f89.tar.gz vcxsrv-f15a40afaf6d1b3a4841d25631f947da1b289f89.tar.bz2 vcxsrv-f15a40afaf6d1b3a4841d25631f947da1b289f89.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa pixman git update 15 oct 2012
Conflicts:
xorg-server/hw/xwin/InitOutput.c
Diffstat (limited to 'xorg-server/man')
-rw-r--r-- | xorg-server/man/Xserver.man | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/man/Xserver.man b/xorg-server/man/Xserver.man index 8d243d6b7..b103551fa 100644 --- a/xorg-server/man/Xserver.man +++ b/xorg-server/man/Xserver.man @@ -130,7 +130,7 @@ causes the server to generate a core dump on fatal errors. .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 +display numbers, and upon finding a free one, will write the display number back on this file descriptor as a newline-terminated string. The \-pn option is ignored when using \-displayfd. .TP 8 |