Refer more consistently to the different FreeBSD (hardware platform)

ports.  Also use "official" names for platforms where appropriate.

Partly suggested by:	phantom

8 files changed, 14 insertions, 13 deletions

diff --git a/release/doc/en_US.ISO8859-1/hardware/article.sgml b/release/doc/en_US.ISO8859-1/hardware/article.sgml
index debdb954..a32a1b2 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.sgml
@@ -37,7 +37,7 @@
   <title>Supported Devices</title>
 
   <para>This section describes the devices currently known to be
-  supported by with &os; on the &arch; platform.  Other configurations
+  supported by with &os; on the &arch.print; platform.  Other configurations
   may also work, but simply have not been tested yet.  Feedback,
   updates, and corrections to this list are encouraged.</para>
 
diff --git a/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml b/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml
index 1e03991..c09ae2c 100644
--- a/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml
@@ -1,7 +1,7 @@
 <!-- $FreeBSD$ -->
 
 <articleinfo>
-  <title>&os; &release.current; &arch; Hardware Notes</title>
+  <title>&os;/&arch; &release.current; Hardware Notes</title>
 
   <corpauthor>The FreeBSD Documentation Project</corpauthor>
 
diff --git a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
index debdb954..a32a1b2 100644
--- a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
@@ -37,7 +37,7 @@
   <title>Supported Devices</title>
 
   <para>This section describes the devices currently known to be
-  supported by with &os; on the &arch; platform.  Other configurations
+  supported by with &os; on the &arch.print; platform.  Other configurations
   may also work, but simply have not been tested yet.  Feedback,
   updates, and corrections to this list are encouraged.</para>
 
diff --git a/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml b/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml
index 5d86673..f4b5e6c 100644
--- a/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml
@@ -4,13 +4,14 @@
   <title>Introduction</title>
 
   <para>This document contains the hardware compatability notes for
-  &os; &release.current; on the &arch; hardware platform.  It lists
+  &os; &release.current; on the &arch.print; hardware platform
+  (also referred to as &os;/&arch; &release.current;).  It lists
   devices known to work on this platform, as well as some notes on
   boot-time kernel customization that may be useful when attempting to
   configure support for new devices.</para>
 
   <note>
-    <para>This document includes information specific to the &arch;
+    <para>This document includes information specific to the &arch.print;
     hardware platform.  Versions of the hardware compatability notes
     for other architectures will differ in some details.</para>
   </note>
diff --git a/release/doc/en_US.ISO8859-1/installation/common/abstract.sgml b/release/doc/en_US.ISO8859-1/installation/common/abstract.sgml
index 60aab09..527d9ea 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/abstract.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/abstract.sgml
@@ -2,7 +2,7 @@
 
 <abstract>
   <para>This article gives some brief instructions on installing
-  &os; &release.current; for the &arch; architecture, with particular
+  &os;/&arch; &release.current;, with particular
   emphasis given to obtaining a &os; distribution.  Some notes on
   troubleshooting and frequently-asked questions are also given.</para>
 </abstract>
diff --git a/release/doc/en_US.ISO8859-1/installation/common/install.sgml b/release/doc/en_US.ISO8859-1/installation/common/install.sgml
index 9049db9..2f927d8 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/install.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/install.sgml
@@ -74,14 +74,14 @@ from {alpha,i386}/INSTALL.TXT.
   <sect2>
     <title>Hardware Requirements</title>
 
-    <para arch="i386">&os; for the &arch; requires a 386 or better
+    <para arch="i386">&os; for the &arch.print; requires a 386 or better
     processor to run (sorry, there is no support for 286 processors)
     and at least 5 megs of RAM to install and 4 megs of RAM to
     run. You will need at least 100MB of free hard drive space for the
     most minimal installation.  See below for ways of shrinking
     existing DOS partitions in order to install &os;.</para>
 
-    <para arch="alpha">&os; for the &arch; supports the alpha platforms
+    <para arch="alpha">&os; for the &arch.print; supports the platforms
     described in <filename>HARDWARE.TXT</filename>.</para>
 
     <para arch="alpha">You will need a dedicated disk for
@@ -717,7 +717,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
   </sect2>
 
   <sect2>
-    <title>Question and Answer Section for &arch; Architecture Users</title>
+    <title>Question and Answer Section for &arch.print; Architecture Users</title>
 
     <qandaset arch="i386">
       <qandaentry>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index a0251cb..e940af3 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -1,5 +1,5 @@
 <articleinfo>
-  <title>&os; &release.current; &arch; Release Notes</title>
+  <title>&os;/&arch; &release.current; Release Notes</title>
 
   <corpauthor>The FreeBSD Project</corpauthor>
 
@@ -24,7 +24,7 @@
   <title>Introduction</title>
 
   <para>This document contains the release notes for &os; &release.current; on
-  the &arch; hardware platform.  It describes new features of &os;
+  the &arch.print; hardware platform.  It describes new features of &os;
   that have been added (or changed) since &release.prev;.  It also
   provides some notes on upgrading from previous versions of &os;.</para>
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
index a0251cb..e940af3 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -1,5 +1,5 @@
 <articleinfo>
-  <title>&os; &release.current; &arch; Release Notes</title>
+  <title>&os;/&arch; &release.current; Release Notes</title>
 
   <corpauthor>The FreeBSD Project</corpauthor>
 
@@ -24,7 +24,7 @@
   <title>Introduction</title>
 
   <para>This document contains the release notes for &os; &release.current; on
-  the &arch; hardware platform.  It describes new features of &os;
+  the &arch.print; hardware platform.  It describes new features of &os;
   that have been added (or changed) since &release.prev;.  It also
   provides some notes on upgrading from previous versions of &os;.</para>