diff --git a/handbook/eresources.sgml b/handbook/eresources.sgml
index da5042ded3..718d45da34 100644
--- a/handbook/eresources.sgml
+++ b/handbook/eresources.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: eresources.sgml,v 1.26 1996-07-29 07:15:55 jkh Exp $ -->
+<!-- $Id: eresources.sgml,v 1.27 1996-08-28 00:43:56 asami Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt>
@@ -334,7 +334,7 @@ User Groups.
             </itemize>
 
         <sect1>
-          <heading>X-Window system</heading>
+          <heading>X Window System</heading>
 
           <p><itemize>
               <item><url url="news:comp.windows.x.i386unix" name="comp.windows.x.i386unix"></item>
diff --git a/handbook/handbook.sgml b/handbook/handbook.sgml
index 549ce67a5d..0c1ed20d84 100644
--- a/handbook/handbook.sgml
+++ b/handbook/handbook.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: handbook.sgml,v 1.54 1996-08-21 07:28:42 asami Exp $ -->
+<!-- $Id: handbook.sgml,v 1.55 1996-08-28 00:43:57 asami Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
@@ -94,7 +94,7 @@ name="FreeBSD FTP server"> or one of the numerous
     &printing;
 
     &quotas;
-    <chapt><heading>The X-Window System</heading>
+    <chapt><heading>The X Window System</heading>
        <p>Pending the completion of this section, please refer to
          documentation supplied by the <url url="http://www.xfree86.org/"
          name="The XFree86 Project, Inc">.
diff --git a/handbook/install.sgml b/handbook/install.sgml
index 5ebd985292..03fb94b4e7 100644
--- a/handbook/install.sgml
+++ b/handbook/install.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: install.sgml,v 1.33 1996-08-09 15:33:31 jfieber Exp $ -->
+<!-- $Id: install.sgml,v 1.34 1996-08-28 00:43:57 asami Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
@@ -157,7 +157,7 @@ Boot:
 	serial cards is also provided.
 
 	A minimum of four megabytes of RAM is required to run FreeBSD.
-	To run the X-window system, eight megabytes of RAM is the
+	To run the X Window System, eight megabytes of RAM is the
 	recommended minimum.
 
 	Following is a list of all disk controllers and Ethernet
diff --git a/handbook/kernelconfig.sgml b/handbook/kernelconfig.sgml
index 11de584a35..907bd8980f 100644
--- a/handbook/kernelconfig.sgml
+++ b/handbook/kernelconfig.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: kernelconfig.sgml,v 1.16 1996-08-27 12:00:18 wosch Exp $ -->
+<!-- $Id: kernelconfig.sgml,v 1.17 1996-08-28 00:43:58 asami Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- <!DOCTYPE linuxdoc PUBLIC '-//FreeBSD//DTD linuxdoc//EN'> -->
   <chapt><heading>Configuring the FreeBSD Kernel<label id="kernelconfig"></heading>
@@ -232,7 +232,7 @@
 	      you expect to have on your machine.  However, under
 	      normal circumstances, you will want to set
 	      <tt>maxusers</tt> to at least four, especially if
-	      you are using X Windows or compiling software.  The
+	      you are using the X Window System or compiling software.  The
 	      reason is that the most important table set by
 	      <tt>maxusers</tt> is the maximum number of
 	      processes, which is set to <bf><tt>20 + 16 *
@@ -240,7 +240,7 @@
 	      to one, then you can only have 36 simultaneous
 	      processes, including the 18 or so that the system
 	      starts up at boot time, and the 15 or so you will
-	      probably create when you start X Windows.  Even a
+	      probably create when you start the X Window System.  Even a
 	      simple task like reading a <tt>man</tt> page will
 	      start up nine processes to filter, decompress, and
 	      view it.  Setting <tt>maxusers</tt> to 4 will allow
@@ -337,7 +337,7 @@
 	      Windows, which many graphics-intensive programs
 	      (such as the movie player XAnim, and Linux DOOM)
 	      will automatically take advantage of for extra
-	      speed.  If you use X Windows, you will definitely
+	      speed.  If you use the X Window System, you will definitely
 	      want to include this.
 
 	    <tag>options SYSVSEM</tag> 
@@ -669,7 +669,7 @@
       <sect1><heading>Console, Bus Mouse, and X Server Support</heading>
 
 	<p>You must choose one of these two console types, and, if you plan
-	to use X Windows, enable the XSERVER option and optionally, a bus
+	to use the X Window System, enable the XSERVER option and optionally, a bus
 	mouse or PS/2 mouse device.
 
 	  <descrip>
diff --git a/handbook/linuxemu.sgml b/handbook/linuxemu.sgml
index b4ec73d386..30b05a2441 100644
--- a/handbook/linuxemu.sgml
+++ b/handbook/linuxemu.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: linuxemu.sgml,v 1.10 1996-08-21 07:28:52 asami Exp $ -->
+<!-- $Id: linuxemu.sgml,v 1.11 1996-08-28 00:43:59 asami Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>Linux Emulation<label id="linuxemu"></heading>
@@ -688,7 +688,7 @@ File .../Untitled-1.mb appears to be broken for OMPR.257.0
 </tscreen>
 
 We haven't found the cause for this, but it only affects the
-Notebook's X window front end, not the mathematica engine itself.  So
+Notebook's X Window front end, not the mathematica engine itself.  So
 the command line interface invoked by 'math' is unaffected by this
 bug.
 
diff --git a/handbook/term.sgml b/handbook/term.sgml
index cab61024a1..48f18c65c1 100644
--- a/handbook/term.sgml
+++ b/handbook/term.sgml
@@ -1,7 +1,7 @@
 <!-- This is an SGML document in the linuxdoc DTD describing
      hardwired terminals with FreeBSD.  By Sean Kelly, (c) 1996.
 
-     $Id: term.sgml,v 1.1 1996-07-29 07:15:57 jkh Exp $
+     $Id: term.sgml,v 1.2 1996-08-28 00:44:00 asami Exp $
 
      The FreeBSD Documentation Project
 
@@ -47,7 +47,7 @@
 	today; FreeBSD is no exception.  By using a terminal attached
 	to a unused serial port, you can log in and run any text
 	program that you would normally run on the console or in an
-	<tt/xterm/ window in the X window system.
+	<tt/xterm/ window in the X Window System.
 
 	For the business user, you can attach many terminals to a
 	FreeBSD system and place them on your employees' desktops.
@@ -86,7 +86,7 @@
 
 	  Dumb terminals are popular in work environments where
 	  workers do not need access to graphic applications such as
-	  those provided by the X window system.
+	  those provided by the X Window System.
 
       <sect2><heading>PCs Acting As Terminals<label
 	    id="term:pcs"></heading>