Update BSD platform docs for 7.5 release

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

2 files changed, 25 insertions, 48 deletions

diff --git a/sgml/platforms/NetBSD.sgml b/sgml/platforms/NetBSD.sgml
index 0892602..1faf5f3 100644
--- a/sgml/platforms/NetBSD.sgml
+++ b/sgml/platforms/NetBSD.sgml
@@ -26,7 +26,7 @@ in turn was based on the X consortium sample implementation.
 </Para>
 
 <Para>
-See the <ULink URL="COPYRIGHT.html">Copyright Notice</ULink>.
+See the <ULink URL="../LICENSE.html">Copyright Notice</ULink>.
 </Para>
 
 <![ %notsnapshot [
@@ -50,13 +50,13 @@ X11R&relvers; also builds on other NetBSD architectures. See section
 
 <![ %haverelnotes [
 <Para>
-See the <ULink URL="RELNOTES.html">Release Notes</ULink> for
+See the <ULink URL="../RELNOTES.html">Release Notes</ULink> for
 non-OS dependent new features in X11R&relvers;.
 </Para>
 ]]>
 
 <Sect2>
-<Title>New OS dependent features in 4.2.0</Title>
+<Title>New OS dependent features in XFree86 4.2.0</Title>
 
 <Para>
 
@@ -81,7 +81,7 @@ Support for in-kernel MTRR and AGP support in NetBSD 1.5Y
 </Sect2>
 
 <Sect2>
-<Title>New OS dependent features in 4.1.0</Title>
+<Title>New OS dependent features in XFree86 4.1.0</Title>
 
 <Para>
 
@@ -100,7 +100,7 @@ Enable wide characters support in NetBSD 1.5P and later.
 </Sect2>
 
 <Sect2>
-<Title>New OS dependent features in 4.0.2</Title>
+<Title>New OS dependent features in XFree86 4.0.2</Title>
 
 <Para>
 
@@ -145,7 +145,7 @@ Add <Literal remap="tt">/usr/pkg/bin</Literal> to the default user path.
 </Sect2>
 
 <Sect2>
-<Title>New OS dependent features in 4.0.1</Title>
+<Title>New OS dependent features in XFree86 4.0.1</Title>
 
 <Para>
 
@@ -170,7 +170,7 @@ The Xsun server can be built on NetBSD/sparc
 </Sect2>
 
 <Sect2>
-<Title>New OS dependent features in 4.0</Title>
+<Title>New OS dependent features in XFree86 4.0</Title>
 
 <Para>
 
@@ -189,7 +189,7 @@ Preliminary APM support.
 </Sect2>
 
 <Sect2>
-<Title>New OS dependent features in 3.9.18</Title>
+<Title>New OS dependent features in XFree86 3.9.18</Title>
 
 <Para>
 
@@ -209,7 +209,7 @@ now possible using the x86emu real mode emulator.
 </Sect2>
 
 <Sect2>
-<Title>New OS dependent features in 3.9.17</Title>
+<Title>New OS dependent features in XFree86 3.9.17</Title>
 
 <Para>
 
@@ -237,6 +237,7 @@ support is included.
 
 </Sect1>
 
+<!--
 <Sect1>
 <Title>Installing the Binaries</Title>
 
@@ -246,6 +247,7 @@ for detailed installation instructions.
 </Para>
 
 </Sect1>
+-->
 
 <Sect1>
 <Title>Configuring X for Your Hardware</Title>
@@ -253,8 +255,8 @@ for detailed installation instructions.
 <Para>
 The <Literal remap="tt">/etc/X11/xorg.conf</Literal> file tells the X server what kind of
 monitor,
-video card and mouse you have.  You <Emphasis>must</Emphasis> create it to tell the
-server what specific hardware you have.
+video card and mouse you have, if it cannot determine the information by
+probing the hardware.
 </Para>
 
 <Para>
@@ -320,7 +322,7 @@ Intellimouse, or MouseMan+ with a wheel) are not supported by NetBSD
 </Para>
 
 <Para>
-See <ULink URL="mouse.html">README.mouse</ULink>  for general
+See <ULink URL="../mouse.html">README.mouse</ULink>  for general
 instruction on mouse configuration.
 </Para>
 
@@ -533,7 +535,7 @@ kernel.
 <Para>
 The second way is to install the aperture driver, included in source form in
 <Literal remap="tt">xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar</Literal> in the
-X11R&relvers; source distribution. Unpack it in a new directory of your
+X11R6.9 source distribution. Unpack it in a new directory of your
 choice by running:
 
 <Screen>
@@ -626,28 +628,6 @@ sources, invoke ``<Literal remap="tt">make World</Literal>'' in the xc directory
 </Para>
 
 <Sect2>
-<Title>Perl support</Title>
-
-<Para>
-Starting with XFree86 4.0.2, perl is needed to build the fonts in
-XFree86. Since perl is not included with standard NetBSD installation,
-fonts that need perl are not built by default.
-</Para>
-
-<Para>
-If you have installed perl (from the NetBSD packages, for instance),
-add the line
-
-<Screen>
-#define HasPerl YES
-</Screen>
-
-in <Literal remap="tt">xc/config/cf/host.def</Literal> before rebuilding X.
-</Para>
-
-</Sect2>
-
-<Sect2>
 <Title>Aperture driver</Title>
 
 <Para>
diff --git a/sgml/platforms/OpenBSD.sgml b/sgml/platforms/OpenBSD.sgml
index 577cab1..1ac6927 100644
--- a/sgml/platforms/OpenBSD.sgml
+++ b/sgml/platforms/OpenBSD.sgml
@@ -20,7 +20,7 @@
 <Title>What and Where is X11R7&relvers;?</Title>
 
 <Para>
-The X.Org Foundation X11R7&relvers; is an Open Source version of
+The X.Org Foundation X11R&relvers; is an Open Source version of
 the X Window System that supports
 several UNIX(R) and UNIX-like operating systems (such as Linux, the BSDs
 and Solaris x86) on Intel and other platforms.
@@ -28,13 +28,13 @@ and Solaris x86) on Intel and other platforms.
 
 <Para>
 See the <ULink
-URL="COPYRIGHT.html"
+URL="../LICENSE.html"
 >Copyright Notice</ULink
 >.
 </Para>
 
 <Para>
-The sources for X11R7&relvers; are available from
+The sources for X11R&relvers; are available from
 <ULink
 URL="http://wiki.x.org"
 >http://wiki.x.org</ULink
@@ -42,7 +42,7 @@ URL="http://wiki.x.org"
 </Para>
 
 <Para>
-X11R7&relvers; builds on most architectures supported by OpenBSD. See section
+X11R&relvers; builds on most architectures supported by OpenBSD. See section
 <XRef LinkEnd="otherarch"> for details.
 </Para>
 
@@ -69,7 +69,7 @@ See the <ULink
 URL="RELNOTES.html"
 >Release Notes</ULink
 > for
-non-OS dependent new features in X11R7&relvers;.
+non-OS dependent new features in X11R&relvers;.
 </Para>
 
 <Para>
@@ -175,7 +175,7 @@ modes with the <Literal remap="tt">xvidtune</Literal> utility.
 <Title>About mouse configuration</Title>
 
 <Para>
-X11R7&relvers; has support for the mouse driver included in
+X11R&relvers; has support for the mouse driver included in
 the new <Emphasis remap="bf">wscons</Emphasis> console driver.
 Specify ``<Literal remap="tt">wsmouse</Literal>'' as the protocol and
 ``<Literal remap="tt">/dev/wsmouse</Literal>'' as the  device in <Literal remap="tt">/etc/X11/xorg.conf</Literal>
@@ -316,10 +316,7 @@ extension.
 </Sect1>
 
 <Sect1>
-<Title>Rebuilding the X Distribution
-You should configure the distribution by editing
-<Literal remap="tt">xc/config/cf/host.def</Literal>  before compiling.  To compile the
-sources, invoke ``<Literal remap="tt">make World</Literal>'' in the xc directory.</Title>
+<Title>Rebuilding the X Distribution</Title>
 
 <Para>
 
@@ -338,7 +335,7 @@ URL="http://www.openbsd.org/anoncvs.html"
 </Para>
 
 <Para>
-X11R7&relvers; compiles on most OpenBSD architectures. The X.Org
+X11R&relvers; compiles on most OpenBSD architectures. The X.Org
 X server builds and run on the following systems. On other
 architectures supported by OpenBSD, only client side libraries and
 applications are supported.
@@ -434,7 +431,7 @@ Modeline "1152x768" 64.995 1152 1213 1349 1472  768 771 777 806 -HSync -VSync
 <Para>
 OpenBSD 3.2 on sparc switched to the wscons device driver and now uses
 the OS specific <Emphasis>wsfb</Emphasis> driver in the X server. This driver is
-not included in X11R7&relvers;. Please use the version shipped with
+not included in X11R&relvers;. Please use the version shipped with
 OpenBSD instead.
 </Para>
 
@@ -457,7 +454,7 @@ support for the X server on both SBus and UPA (unaccelerated) based cards.
 <Title>Thanks</Title>
 
 <Para>
-Many thanks to all people who contributed to make X11R7&relvers; work on
+Many thanks to all people who contributed to make X11R&relvers; work on
 *BSD, in particular:
 <Emphasis remap="bf">David Dawes</Emphasis>,
 <Emphasis remap="bf">Todd Fries</Emphasis>,