Various markup/wording/consistency changes found by Murray.

Reviewed by:	murray

en_US.ISO8859-1/books/handbook/boot/chapter.sgml

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.14 2001/07/17 20:51:52 chern Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.15 2001/07/19 01:11:46 chern Exp $
 -->
 
 <chapter id="boot">
@@ -65,22 +65,24 @@
       and also allow minor configuration of how they work.</para>
 
     <sect2 id="boot-boot0">
-      <title>boot0</title>
+      <title><filename>boot0</filename></title>
       <indexterm><primary>Master Boot Record (MBR)</primary></indexterm>
 
-      <para>There is actually a preceding bootblock, named boot0,
+      <para>There is actually a preceding bootblock, named 
+	<filename>boot0</filename>,
 	which lives on the <firstterm>Master Boot
 	  Record</firstterm>, the special part of the disk that the
 	system bootstrap looks for and runs, and it simply shows a
 	list of possible slices to boot from.</para>
 
-      <para>boot0 is very simple, since the program in the
+      <para><filename>boot0</filename> is very simple, since the
-	<abbrev>MBR</abbrev> can only be 512 bytes in size.</para>
+	program in the <abbrev>MBR</abbrev> can only be 512 bytes in
+	size.</para>
 
       <para>It displays something like this:</para>
 
       <example id="boot-boot0-example">
-	<title>boot0 screenshot</title>
+	<title><filename>boot0</filename> screenshot</title>
 
 	<screen>F1 DOS
 F2 FreeBSD
@@ -93,14 +95,16 @@ Default: F2</screen>
     </sect2>
   
     <sect2 id="boot-boot1">
-      <title>boot1</title>
+      <title><filename>boot1</filename></title>
       
-      <para>boot1 is found on the boot sector of the boot slice,
+      <para><filename>boot1</filename> is found on the boot sector of
-	which is where <link linkend="boot-boot0">boot0</link>, or
+	the boot slice, which is where <link
-	any other program on the <abbrev>MBR</abbrev> expects to
+	  linkend="boot-boot0">boot0</link>, or any other program on the
-	find the program to run to continue the boot process.</para>
+	<abbrev>MBR</abbrev> expects to find the program to run to
+	continue the boot process.</para>
 
-      <para>boot1 is very simple, since it too can only be 512 bytes
+      <para><filename>boot1</filename> is very simple, since it too 
+	can only be 512 bytes
 	in size, and knows just enough about the FreeBSD
 	<firstterm>disklabel</firstterm>, which stores information
 	about the slice, to find and execute <link
@@ -108,7 +112,7 @@ Default: F2</screen>
     </sect2>
   
     <sect2 id="boot-boot2">
-      <title>boot2</title>
+      <title><filename>boot2</filename></title>
       
       <para>boot2 is slightly more sophisticated, and understands
 	the FreeBSD filesystem enough to find files on it, and can
@@ -117,11 +121,12 @@ Default: F2</screen>
 
       <para>Since the <link linkend="boot-loader">loader</link> is
 	much more sophisticated, and provides a nice easy-to-use
-	boot configuration, boot2 usually runs it, but previously it
+	boot configuration, <filename>boot2</filename> usually runs
+	it, but previously it
 	was tasked to run the kernel directly.</para>
 
       <example id="boot-boot2-example">
-	<title>boot2 screenshot</title>
+	<title><filename>boot2</filename> screenshot</title>
 
 	<screen>&gt;&gt; FreeBSD/i386 BOOT
 Default: 0:wd(0,a)/kernel
@@ -162,7 +167,7 @@ boot:</screen>
       <indexterm><primary>loader</primary></indexterm>
       <indexterm><primary>loader configuration</primary></indexterm>
 
-      <para>loader will then read
+      <para>The loader will then read
 	<filename>/boot/loader.rc</filename>, which by default reads
 	in <filename>/boot/defaults/loader.conf</filename> which
 	sets reasonable defaults for variables and reads
@@ -329,8 +334,8 @@ boot:</screen>
       <para>Here are some practical examples of loader usage.</para>
 
       <itemizedlist>
+	<indexterm><primary>single-user mode</primary></indexterm>
 	<listitem>
-    <indexterm><primary>single-user mode</primary></indexterm>
 	  <para>To simply boot your usual kernel, but in single-user
 	    mode:</para>
 
@@ -345,7 +350,7 @@ boot:</screen>
     </indexterm>
 
 	  <screen><userinput>unload</userinput>
-  <userinput>load <replaceable>kernel.old</replaceable></userinput></screen>
+<userinput>load <replaceable>kernel.old</replaceable></userinput></screen>
 
 	  <para>You can use <filename>kernel.GENERIC</filename> to
 	    refer to the generic kernel that comes on the install
@@ -359,8 +364,7 @@ boot:</screen>
 
 	    <screen><userinput>unload</userinput>
 <userinput>set kernel="<replaceable>kernel.old</replaceable>"</userinput>
-<userinput>boot-conf</userinput></screen>
+<userinput>boot-conf</userinput></screen></note>
-	  </note>
 	</listitem>
 
 	<listitem>
@@ -443,8 +447,7 @@ boot:</screen>
 
       <note>
 	<para>There are other boot flags, read &man.boot.8; for more
-	  information on them.</para>
+	  information on them.</para></note>
-      </note>
     </sect2>
 
 <!--    <sect2 id="boot-kernel-userconfig">
@@ -547,7 +550,7 @@ console none                            unknown off insecure</programlisting>
 	  finally runs the startup scripts of locally installed
 	  packages.</para>
 
-	<para>&man.rc.8; is a good reference to the resource
+	<para>The &man.rc.8; manpage is a good reference to the resource
 	  configuration system, as is examining the scripts
 	  themselves.</para>
       </sect3>
@@ -563,8 +566,9 @@ console none                            unknown off insecure</programlisting>
     <para>Upon controlled shutdown, via <command>shutdown</command>,
       <command>init</command> will attempt to run the script
       <filename>/etc/rc.shutdown</filename>, and then proceed to send
-      all processes the terminate signal, and subsequently the kill
+      all processes the <literal>TERM</literal> signal, and subsequently 
-      signal to any that don't terminate timely.</para>
+      the <literal>KILL</literal> signal to any that don't terminate 
+      timely.</para>
   </sect1>
 </chapter>
 

en_US.ISO8859-1/books/handbook/config/chapter.sgml

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.9 2001/07/20 22:19:11 murray Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.10 2001/07/20 22:27:48 murray Exp $
 -->
 
 <chapter id="config-tuning">
@@ -34,7 +34,7 @@
     <indexterm><primary>System optimization</primary></indexterm>
 
     <para>Configuring a system correctly can substantially reduce the
-      amount of work and hassle involved in maintaining and upgrading it
+      amount of work involved in maintaining and upgrading it
       in the future.  This chapter describes some of the aspects of
       administrative configuration of FreeBSD systems.</para>
 
@@ -70,7 +70,8 @@
 	  tracks than the inner.  Knowing this, you should place your
 	  smaller, heavily-accessed filesystems, such as root and swap,
 	  closer to the outside of the drive, while placing larger
-	  partitions, such as /usr, towards the inner.  To do so, it is
+	  partitions, such as <filename>/usr</filename>, towards the 
+	  inner.  To do so, it is
 	  a good idea to create partitions in a similar order: root,
 	  swap, <filename>/var</filename>,
 	  <filename>/usr</filename>.</para>
@@ -82,7 +83,7 @@
 	  files, in particular, can grow to unexpected sizes based upon
 	  how many users are on your system and how long your log files
 	  are kept.  If you intend to run a mailserver, a
-	  <filename>/var</filename> partition of over a gig can be
+	  <filename>/var</filename> partition of over a gigabyte can be
 	  suitable.  Additionally, <filename>/var/tmp</filename> must be
 	  large enough to contain any packages you may wish to
 	  add.</para>
@@ -93,10 +94,13 @@
 	  <filename>/usr/local</filename> holds the bulk of the files
 	  installed from the &man.ports.7; hierarchy.  If you do not
 	  use ports all that much and do not intend to keep system
-	  source (/usr/src) on the machine, you can get away with a 1
+	  source (<filename>/usr/src</filename>) on the machine, 
-	  gigabyte /usr partition.  However, if you install a lot of
+	  you can get away with a 1
+	  gigabyte <filename>/usr</filename> partition.  However, 
+	  if you install a lot of
 	  ports (especially window managers and Linux binaries), we
-	  recommend at least a two gigabyte /usr and if you also
+	  recommend at least a two gigabyte <filename>/usr</filename>
+	  and if you also
 	  intend to keep system source on the machine, we recommend a
 	  three gigabyte <filename>/usr</filename>.  Do not
 	  underestimate the amount of space you will need in this
@@ -199,19 +203,21 @@
       directly implies this; it is configuration information for the
       <filename>rc*</filename> files.</para>
 
-    <para>An administrator should make entries in the rc.conf file to
+    <para>An administrator should make entries in the 
+      <filename>rc.conf</filename> file to
       override the default settings from
       <filename>/etc/defaults/rc.conf</filename>.  The defaults file
       should not be copied verbatim to <filename>/etc</filename> - it
       contains default values, not examples.  All system-specific
-      changes should be made in the rc.conf file itself.</para>
+      changes should be made in the <filename>rc.conf</filename>
+      file itself.</para>
 
     <para>A number of strategies may be applied in clustered
       applications to separate site-wide configuration from
       system-specific configuration in order to keep administration
       overheads down.  The recommended approach is to place site-wide
       configuration into another file,
-      eg. <filename>/etc/rc.conf.site</filename>, and then include
+      such as <filename>/etc/rc.conf.site</filename>, and then include
       this file into <filename>/etc/rc.conf</filename>, which will
       contain only system-specific information.</para>
 
@@ -231,12 +237,13 @@
     </itemizedlist>
 
     <para>The <filename>rc.conf.site</filename> file can then be
-      distributed to every system using eg. <command>rsync</command>, 
+      distributed to every system using <command>rsync</command> or similar
-      whilst the <filename>rc.conf</filename> file remains unique.</para>
+      program, whilst the <filename>rc.conf</filename> file remains 
+      unique.</para>
 
-    <para>Upgrading the system eg. via &man.sysinstall.8;
+    <para>Upgrading the system using &man.sysinstall.8;
-      or 'make world' will not overwrite the rc.conf file, so system
+      or 'make world' will not overwrite the <filename>rc.conf</filename>
-      configuration information will not be lost.</para>
+      file, so system configuration information will not be lost.</para>
 
   </sect1>
 
@@ -384,8 +391,9 @@ exit 0
 <programlisting>ifconfig_fxp0_alias0="inet xxx.xxx.xxx.xxx netmask xxx.xxx.xxx.xxx"</programlisting>
 
     <para>Note that alias entries must start with alias0 and proceed
-      upwards in order, eg. _alias1, _alias2, etc.  The configuration
+      upwards in order, (for example, _alias1, _alias2, and so on).
-      process will stop at the first missing number.</para>
+      The configuration process will stop at the first missing number.
+    </para>
 
     <para>The calculation of alias netmasks is important, but
       fortunately quite simple.  For a given interface, there must be
@@ -462,7 +470,7 @@ exit 0
 	    </row>
 	    <row>
 	      <entry><filename>/var/db</filename></entry>
-	      <entry>Persistent system-specific data files, eg. bind(8) zone 
+	      <entry>Persistent system-specific data files, such as bind zone 
 		files, database files, and so on.</entry>
 	    </row>
 	  </tbody>
@@ -517,7 +525,7 @@ exit 0
 nameserver 147.11.1.11
 nameserver 147.11.100.30</programlisting>
 
-	<para>&man.dhclient.8; usually rewrites 
+	<para>If you are using DHCP, &man.dhclient.8; usually rewrites 
 	  <filename>resolv.conf</filename> with information received from the 
 	  DHCP server.</para>
       </sect3>
@@ -655,7 +663,7 @@ cron.*                                          /var/log/cron
 	<programlisting># configuration file for newsyslog
 # $FreeBSD&dollar;
 #
-# logfilename          [owner:group]    mode count size when [ZB] [/pid_file] [sig_num]
+# filename          [owner:group]    mode count size when [ZB] [/pid_file] [sig_num]
 /var/log/cron                           600  3     100  *     Z
 /var/log/amd.log                        644  7     100  *     Z
 /var/log/kerberos.log                   644  7     100  *     Z
@@ -685,7 +693,8 @@ cron.*                                          /var/log/cron
       <indexterm><primary>sysctl</primary></indexterm>
 
       <para><filename>sysctl.conf</filename> looks much like 
-	<filename>rc.conf</filename>.  Values are set in a variable=value
+	<filename>rc.conf</filename>.  Values are set in a 
+	<literal>variable=value</literal>
 	form.  The specified values are set after the system goes into
 	multi-user mode.  Not all variables are settable in this mode.</para>
 
@@ -710,7 +719,7 @@ compat.linux.osrelease=4.3-STABLE</programlisting>
       options of the TCP/IP stack and virtual memory system that can
       dramatically improve performance for an experienced system
       administrator.  Over five hundred system variables can be read
-      and set using &man.sysctl.8;</para>
+      and set using &man.sysctl.8;.</para>
     
     <para>At its core, &man.sysctl.8; serves to do two functions: read and
       modify system settings.</para>