From 3b8d15fa0eb220ccd3be1963b1e794a7b3bf673b Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Tue, 4 May 2004 19:44:07 +0000
Subject: Merge the new release from HEAD

---
 startx.cmd  | 2 +-
 startx.man  | 7 ++++---
 xinit.c     | 3 +++
 xinitrc.cmd | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/startx.cmd b/startx.cmd
index fd19ef4..cd37ecb 100644
--- a/startx.cmd
+++ b/startx.cmd
@@ -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
 
diff --git a/startx.man b/startx.man
index e3898de..196affd 100644
--- a/startx.man
+++ b/startx.man
@@ -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)
diff --git a/xinit.c b/xinit.c
index a2384f2..fea283e 100644
--- a/xinit.c
+++ b/xinit.c
@@ -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)
-- 
cgit v1.2.3