Merge remote-tracking branch 'origin/released'

7 files changed, 121 insertions, 121 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Init.c b/xorg-server/hw/xfree86/common/xf86Init.c
index 0974893d3..2a7d0a37e 100644
--- a/xorg-server/hw/xfree86/common/xf86Init.c
+++ b/xorg-server/hw/xfree86/common/xf86Init.c
@@ -1053,7 +1053,7 @@ AbortDDX(enum ExitCode error)
 }
 
 void
-OsVendorFatalError(void)
+OsVendorFatalError(const char *f, va_list args)
 {
 #ifdef VENDORSUPPORT
     ErrorF("\nPlease refer to your Operating System Vendor support pages\n"
diff --git a/xorg-server/hw/xfree86/exa/man/exa.man b/xorg-server/hw/xfree86/exa/man/exa.man
index 30d01824d..42a8de31d 100644
--- a/xorg-server/hw/xfree86/exa/man/exa.man
+++ b/xorg-server/hw/xfree86/exa/man/exa.man
@@ -14,7 +14,7 @@ The
 .B EXA
 architecture is designed to make accelerating the Render extension simple and
 efficient, and results in various performance tradeoffs compared to XAA.  Some
-__xconfigfile__ options are available for debugging performance issues or
+xorg.conf options are available for debugging performance issues or
 driver rendering problems.  They are not intended for general use.
 .TP
 .BI "Option \*qEXANoComposite\*q \*q" boolean \*q
@@ -36,7 +36,7 @@ default is intended to be the best performing one for general use, though others
 may help with specific use cases.  Available options include \*qalways\*q,
 \*qgreedy\*q, and \*qsmart\*q.  Default: always.
 .SH "SEE ALSO"
-.BR __xservername__ (__appmansuffix__),
-.BR __xconfigfile__(__filemansuffix__).
+.BR Xorg (__appmansuffix__),
+.BR xorg.conf(__filemansuffix__).
 .SH AUTHORS
 Authors include: Keith Packard, Eric Anholt, Zack Rusin, and Michel D\(:anzer
diff --git a/xorg-server/hw/xfree86/fbdevhw/man/fbdevhw.man b/xorg-server/hw/xfree86/fbdevhw/man/fbdevhw.man
index fe5d1e17b..fa46df08f 100644
--- a/xorg-server/hw/xfree86/fbdevhw/man/fbdevhw.man
+++ b/xorg-server/hw/xfree86/fbdevhw/man/fbdevhw.man
@@ -14,7 +14,7 @@ fbdev(__drivermansuffix__) is a non-accelerated driver which runs on top of the
 fbdevhw module.  fbdevhw can be used by other drivers too, this
 is usually activated with `Option "UseFBDev"' in the device section.
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
+Xorg(__appmansuffix__), xorg.conf(__filemansuffix__),
 xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__),
 fbdev(__drivermansuffix__)
 .SH AUTHORS
diff --git a/xorg-server/hw/xfree86/man/Xorg.man b/xorg-server/hw/xfree86/man/Xorg.man
index 2fa72d672..0cd5a1068 100644
--- a/xorg-server/hw/xfree86/man/Xorg.man
+++ b/xorg-server/hw/xfree86/man/Xorg.man
@@ -1,16 +1,16 @@
 .\" $XdotOrg: xserver/xorg/hw/xfree86/doc/man/Xorg.man.pre,v 1.3 2005/07/04 18:41:01 ajax Exp $
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH __xservername__ __appmansuffix__ __vendorversion__
+.TH Xorg __appmansuffix__ __vendorversion__
 .SH NAME
-__xservername__ - X11R7 X server
+Xorg - X11R7 X server
 .SH SYNOPSIS
-.B __xservername__
+.B Xorg
 .RI [\fB:\fP display ]
 .RI [ option
 .IR ... ]
 .SH DESCRIPTION
-.B __xservername__
+.B Xorg
 is a full featured X server that was originally designed for UNIX and
 UNIX-like operating systems running on Intel x86 hardware.  It now runs
 on a wider range of hardware and OS platforms.
@@ -24,7 +24,7 @@ by Thomas Roell which was contributed to X11R5 by Snitily Graphics
 Consulting Service.
 .SH PLATFORMS
 .PP
-.B __xservername__
+.B Xorg
 operates under a wide range of operating systems and hardware platforms.
 The Intel x86 (IA32) architecture is the most widely supported hardware
 platform.  Other hardware platforms include Compaq Alpha, Intel IA64, AMD64,
@@ -37,7 +37,7 @@ Xquartz(__appmansuffix__) X server.  Win32/Cygwin is supported with the
 XWin(__appmansuffix__) X server.
 .PP
 .SH "NETWORK CONNECTIONS"
-.B __xservername__
+.B Xorg
 supports connections made using the following reliable
 byte-streams:
 .TP 4
@@ -47,7 +47,7 @@ On some System V platforms, the "local" connection types also include
 STREAMS pipes, named pipes, and some other mechanisms.
 .TP 4
 .I TCP\/IP
-.B __xservername__
+.B Xorg
 listens on port
 .RI 6000+ n ,
 where
@@ -108,10 +108,10 @@ file.  If you use xdm(1), the definitions should be early on in the
 .I __projectroot__/lib/X11/xdm/Xsession
 script.
 .SH OPTIONS
-.B __xservername__
+.B Xorg
 supports several mechanisms for supplying/obtaining configuration and
 run-time parameters: command line options, environment variables, the
-__xconfigfile__(__filemansuffix__) configuration files, auto-detection, and
+xorg.conf(__filemansuffix__) configuration files, auto-detection, and
 fallback defaults.  When the same information is supplied in more than
 one way, the highest precedence mechanism is used.  The list of mechanisms
 is ordered from highest precedence to lowest.  Note that not all parameters
@@ -119,21 +119,21 @@ can be supplied via all methods.  The available command line options
 and environment variables (and some defaults) are described here and in
 the Xserver(__appmansuffix__) manual page.  Most configuration file
 parameters, with their defaults, are described in the
-__xconfigfile__(__filemansuffix__) manual page.  Driver and module specific
+xorg.conf(__filemansuffix__) manual page.  Driver and module specific
 configuration parameters are described in the relevant driver or module
 manual page.
 .PP
 In addition to the normal server options described in the
 Xserver(__appmansuffix__) manual page,
-.B __xservername__
+.B Xorg
 accepts the following command line switches:
 .TP 8
 .BI vt XX
 .I XX
 specifies the Virtual Terminal device number which
-.B __xservername__
+.B Xorg
 will use.  Without this option,
-.B __xservername__
+.B Xorg
 will pick the first available Virtual Terminal that it can locate.  This
 option applies only to platforms that have virtual terminal support, such
 as Linux, BSD, OpenSolaris, SVR3, and SVR4.
@@ -142,14 +142,14 @@ as Linux, BSD, OpenSolaris, SVR3, and SVR4.
 Allow the server to start up even if the mouse device can't be opened
 or initialised.  This is equivalent to the
 .B AllowMouseOpenFail
-__xconfigfile__(__filemansuffix__) file option.
+xorg.conf(__filemansuffix__) file option.
 .TP 8
 .B \-allowNonLocalXvidtune
 Make the VidMode extension available to remote clients.  This allows
 the xvidtune client to connect from another host.  This is equivalent
 to the
 .B AllowNonLocalXvidtune
-__xconfigfile__(__filemansuffix__) file option.  By default non-local
+xorg.conf(__filemansuffix__) file option.  By default non-local
 connections are not allowed.
 .TP 8
 .BI \-bgamma " value"
@@ -187,9 +187,9 @@ config directory search path for all other users.
 .TP 8
 .B \-configure
 When this option is specified, the
-.B __xservername__
+.B Xorg
 server loads all video driver modules, probes for available hardware,
-and writes out an initial __xconfigfile__(__filemansuffix__) file based on
+and writes out an initial xorg.conf(__filemansuffix__) file based on
 what was detected.  This option currently has some problems on some
 platforms, but in most cases it is a good way to bootstrap the
 configuration process.  This option is only available when the server
@@ -209,7 +209,7 @@ Disable the parts of the VidMode extension (used by the xvidtune
 client) that can be used to change the video modes.  This is equivalent
 to the
 .B DisableVidModeExtension
-__xconfigfile__(__filemansuffix__) file option.
+xorg.conf(__filemansuffix__) file option.
 .TP 8
 .B \-fbbpp \fIn\fP
 Sets the number of framebuffer bits per pixel.  You should only set this
@@ -249,7 +249,7 @@ options.
 .TP 8
 .B \-ignoreABI
 The
-.B __xservername__
+.B Xorg
 server checks the ABI revision levels of each module that it loads.  It
 will normally refuse to load modules with ABI revisions that are newer
 than the server's.  This is because such modules might use interfaces
@@ -276,7 +276,7 @@ This option is only useful when debugging the server.  Not all platforms
 support (or can use) this option.
 .TP 8
 .BI \-keyboard " keyboard-name"
-Use the __xconfigfile__(__filemansuffix__) file
+Use the xorg.conf(__filemansuffix__) file
 .B InputDevice
 section called
 .I keyboard-name
@@ -288,7 +288,7 @@ section and this option, the first relevant
 section is used for the core keyboard.
 .TP 8
 .BI \-layout " layout-name"
-Use the __xconfigfile__(__filemansuffix__) file
+Use the xorg.conf(__filemansuffix__) file
 .B Layout
 section called
 .IR layout-name .
@@ -300,20 +300,20 @@ section is used.
 Use the file called
 .I filename
 as the
-.B __xservername__
+.B Xorg
 server log file.  The default log file is
-.BI __logdir__/__xservername__. n .log
+.BI __logdir__/Xorg. n .log
 on most platforms, where
 .I n
 is the display number of the
-.B __xservername__
+.B Xorg
 server.  The default may be in a different directory on some platforms.
 This option is only available when the server is run as root (i.e, with
 real-uid 0).
 .TP 8
 .BR \-logverbose " [\fIn\fP]"
 Sets the verbosity level for information printed to the
-.B __xservername__
+.B Xorg
 server log file.  If the
 .I n
 value isn't supplied, each occurrence of this option increments the log
@@ -327,7 +327,7 @@ Set the module search path to
 .IR searchpath .
 .I searchpath
 is a comma separated list of directories to search for
-.B __xservername__
+.B Xorg
 server modules.  This option is only available when the server is run
 as root (i.e, with real-uid 0).
 .TP 8
@@ -345,16 +345,16 @@ reason to use this option.  Some client applications don't like this
 pixmap format, even though it is a perfectly legal format.  This is
 equivalent to the
 .B Pixmap
-__xconfigfile__(__filemansuffix__) file option.
+xorg.conf(__filemansuffix__) file option.
 .TP 8
 .B \-pixmap32
 Set the internal pixmap format for depth 24 pixmaps to 32 bits per pixel.
 This is usually the default.  This is equivalent to the
 .B Pixmap
-__xconfigfile__(__filemansuffix__) file option.
+xorg.conf(__filemansuffix__) file option.
 .TP 8
 .BI \-pointer " pointer-name"
-Use the __xconfigfile__(__filemansuffix__) file
+Use the xorg.conf(__filemansuffix__) file
 .B InputDevice
 section called
 .I pointer-name
@@ -384,7 +384,7 @@ options.
 Share virtual terminals with another X server, if supported by the OS.
 .TP 8
 .BI \-screen " screen-name"
-Use the __xconfigfile__(__filemansuffix__) file
+Use the xorg.conf(__filemansuffix__) file
 .B Screen
 section called
 .IR screen-name .
@@ -434,7 +434,7 @@ support.
 .SH "KEYBOARD"
 .PP
 The
-.B __xservername__
+.B Xorg
 server is normally configured to recognize various special combinations
 of key presses that instruct the server to perform some action, rather
 than just sending the key press event to a client application. These actions
@@ -448,7 +448,7 @@ keymap.
 Immediately kills the server -- no questions asked. It can be disabled by
 setting the
 .B DontZap
-__xconfigfile__(__filemansuffix__) file option to a TRUE value.
+xorg.conf(__filemansuffix__) file option to a TRUE value.
 .PP
 .RS 8
 It should be noted that zapping is triggered by the
@@ -462,43 +462,43 @@ but can be enabled with the XKB option
 Change video mode to next one specified in the configuration file.
 This can be disabled with the
 .B DontZoom
-__xconfigfile__(__filemansuffix__) file option.
+xorg.conf(__filemansuffix__) file option.
 .TP 8
 .B Ctrl+Alt+Keypad-Minus
 Change video mode to previous one specified in the configuration file.
 This can be disabled with the
 .B DontZoom
-__xconfigfile__(__filemansuffix__) file option.
+xorg.conf(__filemansuffix__) file option.
 .TP 8
 .B Ctrl+Alt+F1...F12
 For systems with virtual terminal support, these keystroke
 combinations are used to switch to virtual terminals 1 through 12,
 respectively.  This can be disabled with the
 .B DontVTSwitch
-__xconfigfile__(__filemansuffix__) file option.
+xorg.conf(__filemansuffix__) file option.
 .SH CONFIGURATION
-.B __xservername__
+.B Xorg
 typically uses a configuration file called
-.B __xconfigfile__
+.B xorg.conf
 and configuration files with the suffix
 .I .conf
 in a directory called
 .B __xconfigdir__
 for its initial setup.
-Refer to the __xconfigfile__(__filemansuffix__) manual page for information
+Refer to the xorg.conf(__filemansuffix__) manual page for information
 about the format of this file.
 .PP
-.B __xservername__
+.B Xorg
 has a mechanism for automatically generating a built-in configuration
 at run-time when no
-.B __xconfigfile__
+.B xorg.conf
 file or
 .B __xconfigdir__
 files are present.  The current version of this automatic configuration
 mechanism works in two ways.
 .PP
 The first is via enhancements that have made many components of the
-.B __xconfigfile__
+.B xorg.conf
 file optional.  This means that information that can be probed or
 reasonably deduced doesn't need to be specified explicitly, greatly
 reducing the amount of built-in configuration information that needs to
@@ -506,33 +506,33 @@ be generated at run-time.
 .PP
 The second is to have "safe" fallbacks for most configuration information.
 This maximises the likelihood that the
-.B __xservername__
+.B Xorg
 server will start up in some usable configuration even when information
 about the specific hardware is not available.
 .PP
-The automatic configuration support for __xservername__ is work in progress.
+The automatic configuration support for Xorg is work in progress.
 It is currently aimed at the most popular hardware and software platforms
-supported by __xservername__.  Enhancements are planned for future releases.
+supported by Xorg.  Enhancements are planned for future releases.
 .SH FILES
 The
-.B __xservername__
+.B Xorg
 server config files can be found in a range of locations.  These are
-documented fully in the __xconfigfile__(__filemansuffix__) manual page.  The
+documented fully in the xorg.conf(__filemansuffix__) manual page.  The
 most commonly used locations are shown here.
 .TP 30
-.B /etc/X11/__xconfigfile__
+.B /etc/X11/xorg.conf
 Server configuration file.
 .TP 30
-.B /etc/X11/__xconfigfile__-4
+.B /etc/X11/xorg.conf-4
 Server configuration file.
 .TP 30
-.B /etc/__xconfigfile__
+.B /etc/xorg.conf
 Server configuration file.
 .TP 30
-.B __projectroot__/etc/__xconfigfile__
+.B __projectroot__/etc/xorg.conf
 Server configuration file.
 .TP 30
-.B __projectroot__/lib/X11/__xconfigfile__
+.B __projectroot__/lib/X11/xorg.conf
 Server configuration file.
 .TP 30
 .B /etc/X11/__xconfigdir__
@@ -550,7 +550,7 @@ Server configuration directory.
 .B __projectroot__/lib/X11/__xconfigdir__
 Server configuration directory.
 .TP 30
-.BI __logdir__/__xservername__. n .log
+.BI __logdir__/Xorg. n .log
 Server log file for display
 .IR n .
 .TP 30
@@ -580,7 +580,7 @@ Initial access control list for display
 .IR n .
 .SH "SEE ALSO"
 X(__miscmansuffix__), Xserver(__appmansuffix__), xdm(__appmansuffix__), xinit(__appmansuffix__),
-__xconfigfile__(__filemansuffix__), xvidtune(__appmansuffix__),
+xorg.conf(__filemansuffix__), xvidtune(__appmansuffix__),
 xkeyboard-config (__miscmansuffix__),
 apm(__drivermansuffix__),
 ati(__drivermansuffix__),
@@ -623,15 +623,15 @@ Web site
 .IR <http://www.x.org> .
 
 .SH AUTHORS
-__xservername__ has many contributors world wide.  The names of most of them
+Xorg has many contributors world wide.  The names of most of them
 can be found in the documentation, ChangeLog files in the source tree,
 and in the actual source code.
 .PP
-__xservername__ was originally based on XFree86 4.4rc2.
+Xorg was originally based on XFree86 4.4rc2.
 That was originally based on \fIX386 1.2\fP by Thomas Roell, which
 was contributed to the then X Consortium's X11R5 distribution by SGCS.
 .PP
-__xservername__ is released by the X.Org Foundation.
+Xorg is released by the X.Org Foundation.
 .PP
 The project that became XFree86 was originally founded in 1992 by
 David Dawes, Glenn Lai, Jim Tsillas and David Wexelblat.
@@ -671,7 +671,7 @@ Orest Zborowski    \fIorestz@eskimo.com\fP
 .fi
 .RE
 .PP
-__xservername__ source is available from the FTP server
+Xorg source is available from the FTP server
 \fI<ftp://ftp.x.org/>\fP, and from the X.Org
 server \fI<http://gitweb.freedesktop.org/>\fP.  Documentation and other
 information can be found from the X.Org web site
@@ -679,10 +679,10 @@ information can be found from the X.Org web site
 
 .SH LEGAL
 .PP
-.B __xservername__
+.B Xorg
 is copyright software, provided under licenses that permit modification
 and redistribution in source and binary form without fee.
-.B __xservername__ is copyright by numerous authors and
+.B Xorg is copyright by numerous authors and
 contributors from around the world.  Licensing information can be found
 at
 .IR <http://www.x.org> .
diff --git a/xorg-server/hw/xfree86/man/xorg.conf.man b/xorg-server/hw/xfree86/man/xorg.conf.man
index c1b3c4f2d..72e57136c 100644
--- a/xorg-server/hw/xfree86/man/xorg.conf.man
+++ b/xorg-server/hw/xfree86/man/xorg.conf.man
@@ -1,35 +1,35 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH __xconfigfile__ __filemansuffix__ __vendorversion__
+.TH xorg.conf __filemansuffix__ __vendorversion__
 .SH NAME
-__xconfigfile__, __xconfigdir__ \- configuration files for
-__xservername__ X server
+xorg.conf, __xconfigdir__ \- configuration files for
+Xorg X server
 .SH INTRODUCTION
-.B __xservername__
+.B Xorg
 supports several mechanisms for supplying/obtaining configuration and
 run-time parameters: command line options, environment variables, the
-__xconfigfile__ and __xconfigdir__ configuration files, auto-detection,
+xorg.conf and __xconfigdir__ configuration files, auto-detection,
 and fallback defaults. When the same information is supplied in more
 than one way, the highest precedence mechanism is used. The list of
 mechanisms is ordered from highest precedence to lowest. Note that not
 all parameters can be supplied via all methods. The available command
 line options and environment variables (and some defaults) are
 described in the Xserver(__appmansuffix__) and
-__xservername__(__appmansuffix__) manual pages. Most configuration file
+Xorg(__appmansuffix__) manual pages. Most configuration file
 parameters, with their defaults, are described below. Driver and module
 specific configuration parameters are described in the relevant driver
 or module manual page.
 .SH DESCRIPTION
-.B __xservername__
+.B Xorg
 uses a configuration file called
-.I __xconfigfile__
+.I xorg.conf
 and files ending in the suffix
 .I .conf
 from the directory
 .I __xconfigdir__
 for its initial setup.
 The
-.I __xconfigfile__
+.I xorg.conf
 configuration file is searched for in the following places when the
 server is started as a normal user:
 .PP
@@ -39,12 +39,12 @@ server is started as a normal user:
 .IR __projectroot__/etc/X11/ <cmdline>
 .IB /etc/X11/ $XORGCONFIG
 .IB __projectroot__/etc/X11/ $XORGCONFIG
-.I /etc/X11/__xconfigfile__
-.I /etc/__xconfigfile__
-.IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
-.I __projectroot__/etc/X11/__xconfigfile__
-.IR __projectroot__/lib/X11/__xconfigfile__. <hostname>
-.I __projectroot__/lib/X11/__xconfigfile__
+.I /etc/X11/xorg.conf
+.I /etc/xorg.conf
+.IR __projectroot__/etc/X11/xorg.conf. <hostname>
+.I __projectroot__/etc/X11/xorg.conf
+.IR __projectroot__/lib/X11/xorg.conf. <hostname>
+.I __projectroot__/lib/X11/xorg.conf
 .fi
 .RE
 .PP
@@ -60,7 +60,7 @@ environment variable, and
 is the machine's hostname as reported by
 .BR gethostname (__libmansuffix__).
 .PP
-When the __xservername__ server is started by the \(lqroot\(rq user, the config file
+When the Xorg server is started by the \(lqroot\(rq user, the config file
 search locations are as follows:
 .PP
 .RS 4
@@ -71,12 +71,12 @@ search locations are as follows:
 .B $XORGCONFIG
 .IB /etc/X11/ $XORGCONFIG
 .IB __projectroot__/etc/X11/ $XORGCONFIG
-.I /etc/X11/__xconfigfile__
-.I /etc/__xconfigfile__
-.IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
-.I __projectroot__/etc/X11/__xconfigfile__
-.IR __projectroot__/lib/X11/__xconfigfile__. <hostname>
-.I __projectroot__/lib/X11/__xconfigfile__
+.I /etc/X11/xorg.conf
+.I /etc/xorg.conf
+.IR __projectroot__/etc/X11/xorg.conf. <hostname>
+.I __projectroot__/etc/X11/xorg.conf
+.IR __projectroot__/lib/X11/xorg.conf. <hostname>
+.I __projectroot__/lib/X11/xorg.conf
 .fi
 .RE
 .PP
@@ -113,7 +113,7 @@ is a relative path (with no \(lq..\(rq components) specified with the
 .B \-configdir
 command line option.
 .PP
-When the __xservername__ server is started by the \(lqroot\(rq user, the
+When the Xorg server is started by the \(lqroot\(rq user, the
 config directory search locations are as follows:
 .PP
 .RS 4
@@ -145,7 +145,7 @@ These files are found in the following directories:
 .RE
 .PP
 The
-.I __xconfigfile__
+.I xorg.conf
 and
 .I __xconfigdir__
 files are composed of a number of sections which may be present in any order,
@@ -331,7 +331,7 @@ section is used to specify some path names required by the server.
 Some of these paths can also be set from the command line (see
 .BR Xserver (__appmansuffix__)
 and
-.BR __xservername__ (__appmansuffix__)).
+.BR Xorg (__appmansuffix__)).
 The command line settings override the values specified in the config
 file.
 The
@@ -342,7 +342,7 @@ The entries that can appear in this section are:
 .TP 7
 .BI "FontPath \*q" path \*q
 sets the search path for fonts.
-This path is a comma separated list of font path elements which the __xservername__
+This path is a comma separated list of font path elements which the Xorg
 server searches for font databases.
 Multiple
 .B FontPath
@@ -426,8 +426,8 @@ font path when the server starts up.
 .RE
 .TP 7
 .BI "ModulePath \*q" path \*q
-sets the search path for loadable __xservername__ server modules.
-This path is a comma separated list of directories which the __xservername__ server
+sets the search path for loadable Xorg server modules.
+This path is a comma separated list of directories which the Xorg server
 searches for loadable modules loading in the order specified.
 Multiple
 .B ModulePath
@@ -441,17 +441,17 @@ __modulepath__
 .ig
 .TP 7
 .BI "LogFile \*q" path \*q
-sets the name of the __xservername__ server log file.
+sets the name of the Xorg server log file.
 The default log file name is
 .PP
 .RS 11
-.RI __logdir__/__xservername__. <n> .log
+.RI __logdir__/Xorg. <n> .log
 .RE
 .PP
 .RS 7
 where
 .I <n>
-is the display number for the __xservername__ server.
+is the display number for the Xorg server.
 ..
 .TP 7
 .BI "XkbDir \*q" path \*q
@@ -466,7 +466,7 @@ __xkbdir__
 In addition to options specific to this section (described below), the
 .B ServerFlags
 section is used to specify some global
-__xservername__ server options.
+Xorg server options.
 All of the entries in this section are
 .BR Options ,
 although for compatibility purposes some of the old style entries are
@@ -498,20 +498,20 @@ section to use in the absence of the
 command line option.
 .TP 7
 .BI "Option \*qNoTrapSignals\*q  \*q" boolean \*q
-This prevents the __xservername__ server from trapping a range of unexpected fatal
+This prevents the Xorg server from trapping a range of unexpected fatal
 signals and exiting cleanly.
-Instead, the __xservername__ server will die and drop core where the fault occurred.
-The default behaviour is for the __xservername__ server to exit cleanly, but still drop a
+Instead, the Xorg server will die and drop core where the fault occurred.
+The default behaviour is for the Xorg server to exit cleanly, but still drop a
 core file.
-In general you never want to use this option unless you are debugging an __xservername__
+In general you never want to use this option unless you are debugging an Xorg
 server problem and know how to deal with the consequences.
 .TP 7
 .BI "Option \*qUseSIGIO\*q  \*q" boolean \*q
-This controls whether the __xservername__ server requests that events from
+This controls whether the Xorg server requests that events from
 input devices be reported via a SIGIO signal handler (also known as SIGPOLL
 on some platforms), or only reported via the standard select(3) loop.
 The default behaviour is platform specific.   In general you do not want to
-use this option unless you are debugging the __xservername__ server, or
+use this option unless you are debugging the Xorg server, or
 working around a specific bug until it is fixed, and understand the
 consequences.
 .TP 7
@@ -531,7 +531,7 @@ Default: off.
 This disallows the use of the
 .B Terminate_Server
 XKB action (usually on Ctrl+Alt+Backspace, depending on XKB options).
-This action is normally used to terminate the __xservername__ server.
+This action is normally used to terminate the Xorg server.
 When this option is enabled, the action has no effect.
 Default: off.
 .TP 7
@@ -568,7 +568,7 @@ sets the inactivity timeout for the
 phase of the screensaver.
 .I time
 is in minutes.
-This is equivalent to the __xservername__ server's
+This is equivalent to the Xorg server's
 .B \-s
 flag, and the value can be changed at run\-time with
 .BR xset(__appmansuffix__).
@@ -679,9 +679,9 @@ Unset by default.
 .SH "MODULE SECTION"
 The
 .B Module
-section is used to specify which __xservername__ server modules should be loaded.
-This section is ignored when the __xservername__ server is built in static form.
-The type of modules normally loaded in this section are __xservername__ server
+section is used to specify which Xorg server modules should be loaded.
+This section is ignored when the Xorg server is built in static form.
+The type of modules normally loaded in this section are Xorg server
 extension modules.
 Most other module types are loaded automatically when they are needed via
 other mechanisms.
@@ -1324,14 +1324,14 @@ recommends that you do.
 .BI "ClockChip  \*q" clockchip\-type \*q
 This optional entry is used to specify the clock chip type on graphics
 boards which have a programmable clock generator.
-Only a few __xservername__ drivers support programmable clock chips.
+Only a few Xorg drivers support programmable clock chips.
 For details, see the appropriate driver manual page.
 .TP 7
 .BI "VideoRam  " "mem"
 This optional entry specifies the amount of video ram that is installed
 on the graphics board.
 This is measured in kBytes.
-In most cases this is not required because the __xservername__ server probes
+In most cases this is not required because the Xorg server probes
 the graphics board to determine this quantity.
 The driver-specific documentation should indicate when it might be needed.
 .TP 7
@@ -1481,7 +1481,7 @@ if
 or
 .B Hz
 is added to the end of the line.
-The data given here is used by the __xservername__ server to determine if video
+The data given here is used by the Xorg server to determine if video
 modes are within the specifications of the monitor.
 This information should be available in the monitor's handbook.
 If this entry is omitted, a default range of 28\-33kHz is used.
@@ -1500,7 +1500,7 @@ if
 or
 .B kHz
 is added to the end of the line.
-The data given here is used by the __xservername__ server to determine if video
+The data given here is used by the Xorg server to determine if video
 modes are within the specifications of the monitor.
 This information should be available in the monitor's handbook.
 If this entry is omitted, a default range of 43\-72Hz is used.
@@ -1895,7 +1895,7 @@ Others are driver\-independent, and will eventually be described here.
 .TP 7
 .BI "Option \*qAccel\*q"
 Enables XAA (X Acceleration Architecture), a mechanism that makes video cards'
-2D hardware acceleration available to the  __xservername__ server.
+2D hardware acceleration available to the  Xorg server.
 This option is on by default, but it may be necessary to turn it off if
 there are bugs in the driver.
 There are many options to disable specific accelerated operations, listed
@@ -2070,7 +2070,7 @@ formats.
 This may also be specified from the command line with the
 .B \-weight
 option (see
-.BR __xservername__(__appmansuffix__)).
+.BR Xorg(__appmansuffix__)).
 .TP 7
 .BI "Virtual  " "xdim ydim"
 This optional entry specifies the virtual screen resolution to be used.
@@ -2414,7 +2414,7 @@ The data therein is not used in this release.
 General:
 .BR X (__miscmansuffix__),
 .BR Xserver (__appmansuffix__),
-.BR __xservername__ (__appmansuffix__),
+.BR Xorg (__appmansuffix__),
 .BR cvt (__appmansuffix__),
 .BR gtf (__appmansuffix__).
 .PP
diff --git a/xorg-server/hw/xfree86/utils/man/cvt.man b/xorg-server/hw/xfree86/utils/man/cvt.man
index f5075f5bf..310e46405 100644
--- a/xorg-server/hw/xfree86/utils/man/cvt.man
+++ b/xorg-server/hw/xfree86/utils/man/cvt.man
@@ -12,8 +12,8 @@ cvt - calculate VESA CVT mode lines
 .I Cvt
 is a utility for calculating VESA Coordinated Video Timing modes.  Given the
 desired horizontal and vertical resolutions, a modeline adhering to the CVT
-standard is printed. This modeline can be included in __xservername__
-.B __xconfigfile__(__filemansuffix__)
+standard is printed. This modeline can be included in Xorg
+.B xorg.conf(__filemansuffix__)
 .
 
 .SH OPTIONS
@@ -31,7 +31,7 @@ Create a mode with reduced blanking.  This allows for higher frequency signals,
 with a lower or equal dotclock. Not for Cathode Ray Tube based displays though.
 
 .SH "SEE ALSO"
-__xconfigfile__(__filemansuffix__), gtf(__appmansuffix__)
+xorg.conf(__filemansuffix__), gtf(__appmansuffix__)
 .SH AUTHOR
 Luc Verhaegen.
 .PP
diff --git a/xorg-server/hw/xfree86/utils/man/gtf.man b/xorg-server/hw/xfree86/utils/man/gtf.man
index 8e83650aa..004d2f059 100644
--- a/xorg-server/hw/xfree86/utils/man/gtf.man
+++ b/xorg-server/hw/xfree86/utils/man/gtf.man
@@ -14,8 +14,8 @@ gtf - calculate VESA GTF mode lines
 is a utility for calculating VESA GTF modes.  Given the desired
 horizontal and vertical resolutions and refresh rate (in Hz), the parameters
 for a matching VESA GTF mode are printed out.  Two output formats are
-supported: mode lines suitable for the __xservername__
-.B __xconfigfile__(__filemansuffix__)
+supported: mode lines suitable for the Xorg
+.B xorg.conf(__filemansuffix__)
 file, and mode parameters suitable for the Linux
 .B fbset(8)
 utility.
@@ -27,14 +27,14 @@ Enable verbose printouts  This shows a trace for each step of the
 computation.
 .TP 8
 .BR \-x | \-\-xorgmode
-Print the mode parameters as __xservername__-style mode lines.  This is the
+Print the mode parameters as Xorg-style mode lines.  This is the
 default format.
 .TP 8
 .BR \-f | \-\-fbset
 Print the mode parameters in a format suitable for
 .BR fbset(8) .
 .SH "SEE ALSO"
-__xconfigfile__(__filemansuffix__), cvt(__appmansuffix__)
+xorg.conf(__filemansuffix__), cvt(__appmansuffix__)
 .SH AUTHOR
 Andy Ritger.
 .PP