diff options
| -rw-r--r-- | startx.cmd | 2 | ||||
| -rw-r--r-- | startx.man | 7 | ||||
| -rw-r--r-- | xinit.c | 3 | ||||
| -rw-r--r-- | xinitrc.cmd | 2 |
4 files changed, 9 insertions, 5 deletions
@@ -15,7 +15,7 @@ ADDRESS CMD env = 'OS2ENVIRONMENT' x11root = VALUE('X11ROOT',,env) IF x11root = '' THEN DO - SAY "The environment variable X11ROOT is not set. XFree86/OS2 won't run without it." + SAY "The environment variable X11ROOT is not set. X/OS2 won't run without it." EXIT END @@ -1,4 +1,5 @@ .\" $Xorg: startx.man,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $ +.\" $XdotOrg: xc/programs/xinit/startx.man,v 1.2 2004/04/23 19:54:49 eich Exp $ .\" Copyright 1993, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -58,9 +59,9 @@ per-session basis the default color depth, the server's notion of the number of dots-per-inch the display device presents, or take advantage of a different server layout, as permitted by the -.IR XFree86 (1) +.IR __XSERVERNAME__ (1) server and specified in the -.IR XF86Config (__filemansuffix__) +.IR __XCONFIGFILE__ (__filemansuffix__) file. Some examples of specifying server arguments follow; consult the manual page for your X server to determine which arguments are legal. .RS @@ -186,4 +187,4 @@ file. .SH "SEE ALSO" .IR xinit (1), .IR Xserver (1), -.IR XFree86 (1) +.IR __XSERVERNAME__ (1) @@ -123,6 +123,9 @@ char *server_names[] = { #ifdef XFREE86 "XFree86 XFree86 displays", #endif +#ifdef XORG + "Xorg X.Org displays", +#endif #ifdef __DARWIN__ "XDarwin Darwin/Mac OS X IOKit displays", "XDarwinQuartz Mac OS X Quartz displays", diff --git a/xinitrc.cmd b/xinitrc.cmd index a4502b8..f40a7b7 100644 --- a/xinitrc.cmd +++ b/xinitrc.cmd @@ -4,7 +4,7 @@ env = 'OS2ENVIRONMENT' x11root = VALUE('X11ROOT',,env) IF x11root = '' THEN DO - SAY "The environment variable X11ROOT is not set. XFree86/OS2 won't run without it." + SAY "The environment variable X11ROOT is not set. X/OS2 won't run without it." EXIT END home = VALUE('HOME',,env) |