Xorg & Xserver man page updates for 1.2 release

- Added -extension & +extension to Xserver man page
- Changed Xorg synopsis from X11R6 to X11R7
- Clarified Xorg ancestry description
- Moved Solaris to free/Open Source OS list
- Removed references to MetroLink module loader & getconfig
- Converted (1) to (__appmansuffix__) in a few more places
- Replaced http://www.freedesktop.org/cvs/ with http://gitweb.freedesktop.org/
(cherry picked from 1b029fd896b76096905c516925ce0214fe14632c commit)

2 files changed, 33 insertions, 35 deletions

diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index b9597f15c..7dd927048 100644
--- a/doc/Xserver.man.pre
+++ b/doc/Xserver.man.pre
@@ -159,6 +159,14 @@ default state is platform and configuration specific.
 disables DPMS (display power management services).  The default state
 is platform and configuration specific.
 .TP 8
+.BI \-extension extensionName
+disables named extension.   If an unknown extension name is specified,
+a list of accepted extension names is printed.
+.TP 8
+.BI \+extension extensionName
+enables named extension.   If an unknown extension name is specified,
+a list of accepted extension names is printed.
+.TP 8
 .B \-f \fIvolume\fP
 sets feep (bell) volume (allowable range: 0-100).
 .TP 8
diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
index 86457321c..0758eb064 100644
--- a/hw/xfree86/doc/man/Xorg.man.pre
+++ b/hw/xfree86/doc/man/Xorg.man.pre
@@ -1,7 +1,7 @@
 .\" $XdotOrg: xserver/xorg/hw/xfree86/doc/man/Xorg.man.pre,v 1.3 2005/07/04 18:41:01 ajax Exp $
 .TH __xservername__ __appmansuffix__ __vendorversion__
 .SH NAME
-__xservername__ - X11R6 X server
+__xservername__ - X11R7 X server
 .SH SYNOPSIS
 .B __xservername__
 .RI [\fB:\fP display ]
@@ -13,30 +13,26 @@ 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.
 .PP
-This work was derived from
+This work was derived by the X.Org Foundation from the XFree86 Project's 
 .I "XFree86\ 4.4rc2"
-by the X.Org Foundation.
-The XFree86 4.4rc2 release was originally derived from
+release.
+The XFree86 release was originally derived from
 .I "X386\ 1.2"
 by Thomas Roell which was contributed to X11R5 by Snitily Graphics
-Consulting Service.  The
-.B __xservername__
-server architecture includes
-among many other things a loadable module system derived from code
-donated by Metro Link, Inc.  The current __xservername__ release is compatible
-with X11R6.6.
+Consulting Service.
 .SH PLATFORMS
 .PP
 .B __xservername__
 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,
+platform.  Other hardware platforms include Compaq Alpha, Intel IA64, AMD64,
 SPARC and PowerPC.  The most widely supported operating systems are the
-free/OpenSource UNIX-like systems such as Linux, FreeBSD, NetBSD and
-OpenBSD.  Commercial UNIX operating systems such as Solaris (x86) and
+free/OpenSource UNIX-like systems such as Linux, FreeBSD, NetBSD,
+OpenBSD, and Solaris.  Commercial UNIX operating systems such as
 UnixWare are also supported.  Other supported operating systems include
 LynxOS, and GNU Hurd.  Darwin and Mac OS X are supported with the
-XDarwin(1) X server.  Win32/Cygwin is supported with the XWin X server.
+XDarwin(__appmansuffix__) X server.  Win32/Cygwin is supported with the 
+XWin(__appmansuffix__) X server.
 .PP
 .SH "NETWORK CONNECTIONS"
 .B __xservername__
@@ -119,13 +115,14 @@ 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 here and in
-the Xserver(1) manual page.  Most configuration file parameters, with
-their defaults, are described in the __xconfigfile__(__filemansuffix__) manual
-page.  Driver and module specific configuration parameters are described
-in the relevant driver or module manual page.
+the Xserver(__appmansuffix__) manual page.  Most configuration file 
+parameters, with their defaults, are described in the
+__xconfigfile__(__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(1)
-manual page,
+In addition to the normal server options described in the 
+Xserver(__appmansuffix__) manual page,
 .B __xservername__
 accepts the following command line switches:
 .TP 8
@@ -385,7 +382,8 @@ options.
 When this option is specified, the
 .B __xservername__
 server scans the PCI bus, and prints out some information about each
-device that was detected.  See also scanpci(1) and pcitweak(1).
+device that was detected.  See also scanpci(__appmansuffix__) 
+and pcitweak(__appmansuffix__).
 .TP 8
 .BI \-screen " screen-name"
 Use the __xconfigfile__(__filemansuffix__) file
@@ -508,13 +506,12 @@ for its initial setup.
 Refer to the __xconfigfile__(__filemansuffix__) manual page for information
 about the format of this file.
 .PP
-Starting with version 4.4,
 .B __xservername__
 has a mechanism for automatically generating a built-in configuration
 at run-time when no
 .B __xconfigfile__
 file is present.  The current version of this automatic configuration
-mechanism works in three ways.
+mechanism works in two ways.
 .PP
 The first is via enhancements that have made many components of the
 .B __xconfigfile__
@@ -523,14 +520,7 @@ reasonably deduced doesn't need to be specified explicitly, greatly
 reducing the amount of built-in configuration information that needs to
 be generated at run-time.
 .PP
-The second is to use an external utility called getconfig(1), when
-available, to use meta-configuration information to generate a suitable
-configuration for the primary video device.  The meta-configuration
-information can be updated to allow an existing installation to get the
-best out of new hardware or to work around bugs that are found
-post-release.
-.PP
-The third is to have "safe" fallbacks for most configuration information.
+The second is to have "safe" fallbacks for most configuration information.
 This maximises the likelihood that the
 .B __xservername__
 server will start up in some usable configuration even when information
@@ -644,7 +634,7 @@ __xservername__ 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.
+__xservername__ 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.
@@ -685,9 +675,9 @@ Orest Zborowski    \fIorestz@eskimo.com\fP
 .RE
 .PP
 __xservername__ source is available from the FTP server
-\fI<ftp://ftp.x.org/>\fP, and from the X.org
-server \fI<http://www.freedesktop.org/cvs/>\fP.  Documentation and other
-information can be found from the X.org web site
+\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
 \fI<http://www.x.org/>\fP.
 
 .SH LEGAL