diff --git a/en_US.ISO8859-1/books/handbook/basics/chapter.xml b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
index 2ade36e715..dfa2d22d5a 100644
--- a/en_US.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
@@ -4,7 +4,10 @@
 
      $FreeBSD$
 -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="basics">
+<chapter xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:id="basics">
+
   <!--
   <chapterinfo>
     <authorgroup>
@@ -82,9 +85,15 @@
   <sect1 xml:id="consoles">
     <title>Virtual Consoles and Terminals</title>
 
-    <indexterm><primary>virtual consoles</primary></indexterm>
-    <indexterm><primary>terminals</primary></indexterm>
-    <indexterm><primary>console</primary></indexterm>
+    <indexterm>
+      <primary>virtual consoles</primary>
+    </indexterm>
+    <indexterm>
+      <primary>terminals</primary>
+    </indexterm>
+    <indexterm>
+      <primary>console</primary>
+    </indexterm>
 
     <para>Unless &os; has been configured to automatically start a
       graphical environment during startup, the system will boot
@@ -194,17 +203,17 @@ ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  xterm   off secure</programlisting>
 
       <para>To disable a virtual console, put a comment symbol
 	(<literal>#</literal>) at the beginning of the line
-	representing that virtual console.  For example, to reduce
-	the number of available virtual consoles from eight to four,
-	put a <literal>#</literal> in front of the last four lines
-	representing virtual consoles
-	<filename>ttyv5</filename> through
-	<filename>ttyv8</filename>.  <emphasis>Do not</emphasis>
-	comment out the line for the system console
-	<filename>ttyv0</filename>.  Note that the last virtual
-	console (<filename>ttyv8</filename>) is used to access
+	representing that virtual console.  For example, to reduce the
+	number of available virtual consoles from eight to four, put a
+	<literal>#</literal> in front of the last four lines
+	representing virtual consoles <filename>ttyv5</filename>
+	through <filename>ttyv8</filename>.
+	<emphasis>Do not</emphasis> comment out the line for the
+	system console <filename>ttyv0</filename>.  Note that the last
+	virtual console (<filename>ttyv8</filename>) is used to access
 	the graphical environment if <application>&xorg;</application>
-	has been installed and configured as described in <xref linkend="x11"/>.</para>
+	has been installed and configured as described in
+	<xref linkend="x11"/>.</para>
 
       <para>For a detailed description of every column in this file
 	and the available options for the virtual consoles, refer to
@@ -219,15 +228,16 @@ ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  xterm   off secure</programlisting>
 	the system will boot into a special mode known as
 	<quote>single user mode</quote>.  This mode is typically used
 	to repair a system that will not boot or to reset the
-	<systemitem class="username">root</systemitem> password when it is not known.
-	While in single user mode, networking and other virtual
-	consoles are not available.  However, full
-	<systemitem class="username">root</systemitem> access to the system is available,
-	and by default, the <systemitem class="username">root</systemitem> password is not
-	needed.  For these reasons, physical access to the keyboard
-	is needed to boot into this mode and determining who has
-	physical access to the keyboard is something to consider when
-	securing a &os; system.</para>
+	<systemitem class="username">root</systemitem> password when
+	it is not known.  While in single user mode, networking and
+	other virtual consoles are not available.  However, full
+	<systemitem class="username">root</systemitem> access to the
+	system is available, and by default, the
+	<systemitem class="username">root</systemitem> password is not
+	needed.  For these reasons, physical access to the keyboard is
+	needed to boot into this mode and determining who has physical
+	access to the keyboard is something to consider when securing
+	a &os; system.</para>
 
       <para>The settings which control single user mode are found in
 	this section of <filename>/etc/ttys</filename>:</para>
@@ -239,23 +249,23 @@ ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  xterm   off secure</programlisting>
 console none                            unknown  off  secure</programlisting>
 
       <para>By default, the status is set to
-	<literal>secure</literal>.  This assumes that who has
-	physical access to the keyboard is either not important or it
-	is controlled by a physical security policy.  If this setting
-	is changed to <literal>insecure</literal>, the assumption is
-	that the environment itself is insecure because anyone can
-	access the keyboard.  When this line is changed to
+	<literal>secure</literal>.  This assumes that who has physical
+	access to the keyboard is either not important or it is
+	controlled by a physical security policy.  If this setting is
+	changed to <literal>insecure</literal>, the assumption is that
+	the environment itself is insecure because anyone can access
+	the keyboard.  When this line is changed to
 	<literal>insecure</literal>, &os; will prompt for the
-	<systemitem class="username">root</systemitem> password when a user selects to
-	boot into single user mode.</para>
+	<systemitem class="username">root</systemitem> password when a
+	user selects to boot into single user mode.</para>
 
       <note>
 	<para><emphasis>Be careful when changing this setting to
 	    <literal>insecure</literal></emphasis>!  If the
-	  <systemitem class="username">root</systemitem> password is forgotten, booting
-	  into single user mode is still possible, but may be
-	  difficult for someone who is not familiar with the &os;
-	  booting process.</para>
+	  <systemitem class="username">root</systemitem> password is
+	  forgotten, booting into single user mode is still possible,
+	  but may be difficult for someone who is not familiar with
+	  the &os; booting process.</para>
       </note>
     </sect2>
 
@@ -360,28 +370,34 @@ console none                            unknown  off  secure</programlisting>
 
 	<indexterm>
 	  <primary>accounts</primary>
-	  <secondary><systemitem class="username">daemon</systemitem></secondary>
+	  <secondary><systemitem
+	      class="username">daemon</systemitem></secondary>
 	</indexterm>
 	<indexterm>
 	  <primary>accounts</primary>
-	  <secondary><systemitem class="username">operator</systemitem></secondary>
+	  <secondary><systemitem
+	      class="username">operator</systemitem></secondary>
 	</indexterm>
 
 	<para>Examples of system accounts are
-	  <systemitem class="username">daemon</systemitem>, <systemitem class="username">operator</systemitem>,
-	  <systemitem class="username">bind</systemitem>, <systemitem class="username">news</systemitem>, and
+	  <systemitem class="username">daemon</systemitem>,
+	  <systemitem class="username">operator</systemitem>,
+	  <systemitem class="username">bind</systemitem>,
+	  <systemitem class="username">news</systemitem>, and
 	  <systemitem class="username">www</systemitem>.</para>
 
 	<indexterm>
 	  <primary>accounts</primary>
-	  <secondary><systemitem class="username">nobody</systemitem></secondary>
+	  <secondary><systemitem
+	      class="username">nobody</systemitem></secondary>
 	</indexterm>
 
-	<para><systemitem class="username">nobody</systemitem> is the generic unprivileged
-	  system account.  However, the more services that use
-	  <systemitem class="username">nobody</systemitem>, the more files and processes
-	  that user will become associated with, and hence the more
-	  privileged that user becomes.</para>
+	<para><systemitem class="username">nobody</systemitem> is the
+	  generic unprivileged system account.  However, the more
+	  services that use
+	  <systemitem class="username">nobody</systemitem>, the more
+	  files and processes that user will become associated with,
+	  and hence the more privileged that user becomes.</para>
       </sect3>
 
       <sect3 xml:id="users-user">
@@ -410,300 +426,314 @@ console none                            unknown  off  secure</programlisting>
 	  <varlistentry>
 	    <term>User name</term>
 
-	<listitem>
-	  <para>The user name is typed at the <prompt>login:</prompt>
-	    prompt.  User names must be unique on the system as no two
-	    users can have the same user name.  There are a number of
-	    rules for creating valid user names which are documented
-	    in &man.passwd.5;.  It is recommended to use user names
-	    that consist of eight or fewer, all lower case characters
-	    in order to maintain backwards compatibility with
-	    applications.</para>
-	</listitem>
-      </varlistentry>
+	    <listitem>
+	      <para>The user name is typed at the
+		<prompt>login:</prompt> prompt.  User names must be
+		unique on the system as no two users can have the same
+		user name.  There are a number of rules for creating
+		valid user names which are documented in
+		&man.passwd.5;.  It is recommended to use user names
+		that consist of eight or fewer, all lower case
+		characters in order to maintain backwards
+		compatibility with applications.</para>
+	    </listitem>
+	  </varlistentry>
 
-      <varlistentry>
-	<term>Password</term>
+	  <varlistentry>
+	    <term>Password</term>
 
-	<listitem>
-	  <para>Each user account should have an associated password.
-	    While the password can be blank, this is highly
-	    discouraged.</para>
-	</listitem>
-      </varlistentry>
+	    <listitem>
+	      <para>Each user account should have an associated
+		password.  While the password can be blank, this is
+		highly discouraged.</para>
+	    </listitem>
+	  </varlistentry>
 
-      <varlistentry>
-	<term>User ID (<acronym>UID</acronym>)</term>
+	  <varlistentry>
+	    <term>User ID (<acronym>UID</acronym>)</term>
 
-	<listitem>
-	  <para>The User ID (<acronym>UID</acronym>) is a number used
-	    to uniquely identify the user to the &os; system.
-	    Commands that allow a user name to be specified will
-	    first convert it to the <acronym>UID</acronym>.  It is
-	    recommended to use a UID of 65535 or lower as higher UIDs
-	    may cause compatibility issues with software that does
-	    not support integers larger than 32-bits.</para>
-	</listitem>
-      </varlistentry>
+	    <listitem>
+	      <para>The User ID (<acronym>UID</acronym>) is a number
+		used to uniquely identify the user to the &os; system.
+		Commands that allow a user name to be specified will
+		first convert it to the <acronym>UID</acronym>.  It is
+		recommended to use a UID of 65535 or lower as higher
+		UIDs may cause compatibility issues with software that
+		does not support integers larger than 32-bits.</para>
+	    </listitem>
+	  </varlistentry>
 
-      <varlistentry>
-	<term>Group ID (<acronym>GID</acronym>)</term>
+	  <varlistentry>
+	    <term>Group ID (<acronym>GID</acronym>)</term>
 
-	<listitem>
-	  <para>The Group ID (<acronym>GID</acronym>) is a number
-	    used to uniquely identify the primary group that the user
-	    belongs to.  Groups are a mechanism for controlling
-	    access to resources based on a user's
-	    <acronym>GID</acronym> rather than their
-	    <acronym>UID</acronym>.  This can significantly reduce the
-	    size of some configuration files and allows users to be
-	    members of more than one group.  It is recommended to use
-	    a GID of 65535 or lower as higher GIDs may break some
-	    software.</para>
-	</listitem>
-      </varlistentry>
+	    <listitem>
+	      <para>The Group ID (<acronym>GID</acronym>) is a number
+		used to uniquely identify the primary group that the
+		user belongs to.  Groups are a mechanism for
+		controlling access to resources based on a user's
+		<acronym>GID</acronym> rather than their
+		<acronym>UID</acronym>.  This can significantly reduce
+		the size of some configuration files and allows users
+		to be members of more than one group.  It is
+		recommended to use a GID of 65535 or lower as higher
+		GIDs may break some software.</para>
+	    </listitem>
+	  </varlistentry>
 
-      <varlistentry>
-	<term>Login class</term>
+	  <varlistentry>
+	    <term>Login class</term>
 
-	<listitem>
-	  <para>Login classes are an extension to the group mechanism
-	    that provide additional flexibility when tailoring the
-	    system to different users.  Login classes are discussed
-	    further in <xref linkend="users-limiting"/></para>
-	</listitem>
-      </varlistentry>
+	    <listitem>
+	      <para>Login classes are an extension to the group
+		mechanism that provide additional flexibility when
+		tailoring the system to different users.  Login
+		classes are discussed further in
+		<xref linkend="users-limiting"/></para>
+	    </listitem>
+	  </varlistentry>
 
-      <varlistentry>
-	<term>Password change time</term>
+	  <varlistentry>
+	    <term>Password change time</term>
 
-	<listitem>
-	  <para>By default, &os; does not force users to change their
-	    passwords periodically.  Password expiration can be
-	    enforced on a per-user basis using &man.pw.8;, forcing
-	    some or all users to change their passwords after a
-	    certain amount of time has elapsed.</para>
-	</listitem>
-      </varlistentry>
+	    <listitem>
+	      <para>By default, &os; does not force users to change
+		their passwords periodically.  Password expiration can
+		be enforced on a per-user basis using &man.pw.8;,
+		forcing some or all users to change their passwords
+		after a certain amount of time has elapsed.</para>
+	    </listitem>
+	  </varlistentry>
 
-      <varlistentry>
-	<term>Account expiry time</term>
+	  <varlistentry>
+	    <term>Account expiry time</term>
 
-	<listitem>
-	  <para>By default, &os; does not expire accounts.  When
-	    creating accounts that need a limited lifespan, such as
-	    student accounts in a school, specify the account expiry
-	    date using &man.pw.8;.  After the expiry time has
-	    elapsed, the account cannot be used to log in to the
-	    system, although the account's directories and files will
-	    remain.</para>
-	</listitem>
-      </varlistentry>
+	    <listitem>
+	      <para>By default, &os; does not expire accounts.  When
+		creating accounts that need a limited lifespan, such
+		as student accounts in a school, specify the account
+		expiry date using &man.pw.8;.  After the expiry time
+		has elapsed, the account cannot be used to log in to
+		the system, although the account's directories and
+		files will remain.</para>
+	    </listitem>
+	  </varlistentry>
 
-      <varlistentry>
-	<term>User's full name</term>
+	  <varlistentry>
+	    <term>User's full name</term>
 
-	<listitem>
-	  <para>The user name uniquely identifies the account to &os;,
-	    but does not necessarily reflect the user's real name.
-	    Similar to a comment, this information can contain a
-	    space, uppercase characters, and be more than 8
-	    characters long.</para>
-	</listitem>
-      </varlistentry>
+	    <listitem>
+	      <para>The user name uniquely identifies the account to
+		&os;, but does not necessarily reflect the user's real
+		name.  Similar to a comment, this information can
+		contain a space, uppercase characters, and be more
+		than 8 characters long.</para>
+	    </listitem>
+	  </varlistentry>
 
-      <varlistentry>
-	<term>Home directory</term>
+	  <varlistentry>
+	    <term>Home directory</term>
 
-	<listitem>
-	  <para>The home directory is the full path to a directory on
-	    the system.  This is the user's starting directory when
-	    the user logs in.  A common convention is to put all user
-	    home directories under <filename>/home/username</filename>
-	    or <filename>/usr/home/username</filename>.
-	    Each user stores their personal files and subdirectories
-	    in their own home directory.</para>
-	</listitem>
-      </varlistentry>
+	    <listitem>
+	      <para>The home directory is the full path to a directory
+		on the system.  This is the user's starting directory
+		when the user logs in.  A common convention is to put
+		all user home directories under
+		<filename>/home/username</filename> or
+		<filename>/usr/home/username</filename>.  Each user
+		stores their personal files and subdirectories in
+		their own home directory.</para>
+	    </listitem>
+	  </varlistentry>
 
-      <varlistentry>
-	<term>User shell</term>
+	  <varlistentry>
+	    <term>User shell</term>
 
-	<listitem>
-	  <para>The shell provides the user's default environment for
-	    interacting with the system.  There are many different
-	    kinds of shells and experienced users will have their own
-	    preferences, which can be reflected in their account
-	    settings.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-    </sect3>
+	    <listitem>
+	      <para>The shell provides the user's default environment
+		for interacting with the system.  There are many
+		different kinds of shells and experienced users will
+		have their own preferences, which can be reflected in
+		their account settings.</para>
+	    </listitem>
+	  </varlistentry>
+	</variablelist>
+      </sect3>
 
-    <sect3 xml:id="users-superuser">
-      <title>The Superuser Account</title>
+      <sect3 xml:id="users-superuser">
+	<title>The Superuser Account</title>
 
-      <indexterm>
-	<primary>accounts</primary>
-	<secondary>superuser (root)</secondary>
-      </indexterm>
+	<indexterm>
+	  <primary>accounts</primary>
+	  <secondary>superuser (root)</secondary>
+	</indexterm>
 
-      <para>The superuser account, usually called
-	<systemitem class="username">root</systemitem>, is used to
-	manage the system with no limitations on privileges.  For this
-	reason, it should not be used for day-to-day
-	tasks like sending and receiving mail, general exploration of
-	the system, or programming.</para>
+	<para>The superuser account, usually called
+	  <systemitem class="username">root</systemitem>, is used to
+	  manage the system with no limitations on privileges.  For
+	  this reason, it should not be used for day-to-day tasks like
+	  sending and receiving mail, general exploration of the
+	  system, or programming.</para>
 
-      <para>The superuser, unlike other user
-	accounts, can operate without limits, and misuse of the
-	superuser account may result in spectacular disasters.  User
-	accounts are unable to destroy the operating system by
-	mistake, so it is recommended to login as a user account and
-	to only become the superuser when a command requires extra
-	privilege.</para>
+	<para>The superuser, unlike other user accounts, can operate
+	  without limits, and misuse of the superuser account may
+	  result in spectacular disasters.  User accounts are unable
+	  to destroy the operating system by mistake, so it is
+	  recommended to login as a user account and to only become
+	  the superuser when a command requires extra
+	  privilege.</para>
 
-      <para>Always double and triple-check any commands issued as the
-	superuser, since an extra space or missing character can mean
-	irreparable data loss.</para>
+	<para>Always double and triple-check any commands issued as
+	  the superuser, since an extra space or missing character can
+	  mean irreparable data loss.</para>
 
-      <para>There are several ways to become gain superuser privilege.
-	While one can log in as <systemitem class="username">root</systemitem>, this is
-	highly discouraged.</para>
+	<para>There are several ways to become gain superuser
+	  privilege.  While one can log in as
+	  <systemitem class="username">root</systemitem>, this is
+	  highly discouraged.</para>
 
-      <para>Instead, use &man.su.1; to become the superuser.  If
-	<literal>-</literal> is specified when running this command,
-	the user will also inherit the root user's environment.  The
-	user running this command must be in the
-	<systemitem class="groupname">wheel</systemitem> group or else the command will
-	fail.  The user must also know the password for the
-	<systemitem class="username">root</systemitem> user account.</para>
+	<para>Instead, use &man.su.1; to become the superuser.  If
+	  <literal>-</literal> is specified when running this command,
+	  the user will also inherit the root user's environment.  The
+	  user running this command must be in the
+	  <systemitem class="groupname">wheel</systemitem> group or
+	  else the command will fail.  The user must also know the
+	  password for the
+	  <systemitem class="username">root</systemitem> user
+	  account.</para>
 
-      <para>In this example, the user only becomes superuser in order
-	to run <command>make install</command> as this step requires
-	superuser privilege.  Once the command completes, the user
-	types <command>exit</command> to leave the superuser account
-	and return to the privilege of their user account.</para>
+	<para>In this example, the user only becomes superuser in
+	  order to run <command>make install</command> as this step
+	  requires superuser privilege.  Once the command completes,
+	  the user types <command>exit</command> to leave the
+	  superuser account and return to the privilege of their user
+	  account.</para>
 
-      <example>
-	<title>Install a Program As the Superuser</title>
+	<example>
+	  <title>Install a Program As the Superuser</title>
 
-	<screen>&prompt.user; <userinput>configure</userinput>
+	  <screen>&prompt.user; <userinput>configure</userinput>
 &prompt.user; <userinput>make</userinput>
 &prompt.user; <userinput>su -</userinput>
 Password:
 &prompt.root; <userinput>make install</userinput>
 &prompt.root; <userinput>exit</userinput>
 &prompt.user;</screen>
-      </example>
+	</example>
 
-      <para>The built-in &man.su.1; framework works well for single
-	systems or small networks with just one system administrator.
-	An alternative is to install the <package>security/sudo</package> package or port.
-	This software provides activity logging and allows the
-	administrator to configure which users can run which commands
-	as the superuser.</para>
-    </sect3>
-  </sect2>
+	<para>The built-in &man.su.1; framework works well for single
+	  systems or small networks with just one system
+	  administrator.  An alternative is to install the
+	  <package>security/sudo</package> package or port.  This
+	  software provides activity logging and allows the
+	  administrator to configure which users can run which
+	  commands as the superuser.</para>
+      </sect3>
+    </sect2>
 
-  <sect2 xml:id="users-modifying">
-    <title>Managing Accounts</title>
-
-    <indexterm>
-      <primary>accounts</primary>
-      <secondary>modifying</secondary>
-    </indexterm>
-
-    <para>&os; provides a variety of different commands to manage
-      user accounts.  The most common commands are summarized in Table
-      4.1, followed by some examples of their usage.  Refer to the
-      manual page for each utility for more details and usage
-      examples.</para>
-
-    <table frame="none" pgwide="1">
-      <title>Utilities for Managing User Accounts</title>
-
-      <tgroup cols="2">
-	<colspec colwidth="1*"/>
-	<colspec colwidth="2*"/>
-
-	<thead>
-	  <row>
-	    <entry>Command</entry>
-	    <entry>Summary</entry>
-	  </row>
-	</thead>
-	<tbody>
-	  <row>
-	    <entry>&man.adduser.8;</entry>
-	    <entry>The recommended command-line application for adding
-	      new users.</entry>
-	  </row>
-
-	  <row>
-	    <entry>&man.rmuser.8;</entry>
-	    <entry>The recommended command-line application for
-	      removing users.</entry>
-	  </row>
-
-	  <row>
-	    <entry>&man.chpass.1;</entry>
-	    <entry>A flexible tool for changing user database
-	      information.</entry>
-	  </row>
-
-	  <row>
-	    <entry>&man.passwd.1;</entry>
-	    <entry>The command-line tool to change user
-	      passwords.</entry>
-	  </row>
-
-	  <row>
-	    <entry>&man.pw.8;</entry>
-	    <entry>A powerful and flexible tool for modifying all
-	      aspects of user accounts.</entry>
-	  </row>
-	</tbody>
-      </tgroup>
-    </table>
-
-    <sect3 xml:id="users-adduser">
-      <title><command>adduser</command></title>
+    <sect2 xml:id="users-modifying">
+      <title>Managing Accounts</title>
 
       <indexterm>
 	<primary>accounts</primary>
-	<secondary>adding</secondary>
+	<secondary>modifying</secondary>
       </indexterm>
-      <indexterm>
-	<primary><command>adduser</command></primary>
-      </indexterm>
-      <indexterm>
-	<primary><filename>/usr/share/skel</filename></primary>
-      </indexterm>
-      <indexterm><primary>skeleton directory</primary></indexterm>
-      <para>The recommended program for adding new users is
-	&man.adduser.8;.  When a new user is added, this program
-	automatically updates <filename>/etc/passwd</filename> and
-	<filename>/etc/group</filename>.  It also creates a home
-	directory for the new user, copies in the default
-	configuration files from <filename>/usr/share/skel</filename>, and can
-	optionally mail the new user a welcome message.  This utility
-	must be run as the <systemitem class="username">superuser</systemitem></para>
 
-      <para>The &man.adduser.8; utility is interactive and walks
-	through the steps for creating a new user account.  As seen in
-	Example 4.2, either input the required information or press
-	<keycap>Return</keycap> to accept the default value shown in
-	square brackets.  In this example, the user has been invited
-	into the <systemitem class="groupname">wheel</systemitem> group, which is
-	required to provide the account with superuser access.  When
-	finished, the utility will prompt to either create another
-	user or to exit.</para>
+      <para>&os; provides a variety of different commands to manage
+	user accounts.  The most common commands are summarized in
+	Table 4.1, followed by some examples of their usage.  Refer to
+	the manual page for each utility for more details and usage
+	examples.</para>
 
-      <example>
-	<title>Adding a User on &os;</title>
+      <table frame="none" pgwide="1">
+	<title>Utilities for Managing User Accounts</title>
 
-	<screen>&prompt.root; <userinput>adduser</userinput>
+	<tgroup cols="2">
+	  <colspec colwidth="1*"/>
+	  <colspec colwidth="2*"/>
+
+	  <thead>
+	    <row>
+	      <entry>Command</entry>
+	      <entry>Summary</entry>
+	    </row>
+	  </thead>
+	  <tbody>
+	    <row>
+	      <entry>&man.adduser.8;</entry>
+	      <entry>The recommended command-line application for
+		adding new users.</entry>
+	    </row>
+
+	    <row>
+	      <entry>&man.rmuser.8;</entry>
+	      <entry>The recommended command-line application for
+		removing users.</entry>
+	    </row>
+
+	    <row>
+	      <entry>&man.chpass.1;</entry>
+	      <entry>A flexible tool for changing user database
+		information.</entry>
+	    </row>
+
+	    <row>
+	      <entry>&man.passwd.1;</entry>
+	      <entry>The command-line tool to change user
+		passwords.</entry>
+	    </row>
+
+	    <row>
+	      <entry>&man.pw.8;</entry>
+	      <entry>A powerful and flexible tool for modifying all
+		aspects of user accounts.</entry>
+	    </row>
+	  </tbody>
+	</tgroup>
+      </table>
+
+      <sect3 xml:id="users-adduser">
+	<title><command>adduser</command></title>
+
+	<indexterm>
+	  <primary>accounts</primary>
+	  <secondary>adding</secondary>
+	</indexterm>
+	<indexterm>
+	  <primary><command>adduser</command></primary>
+	</indexterm>
+	<indexterm>
+	  <primary><filename>/usr/share/skel</filename></primary>
+	</indexterm>
+	<indexterm>
+	  <primary>skeleton directory</primary>
+	</indexterm>
+
+	<para>The recommended program for adding new users is
+	  &man.adduser.8;.  When a new user is added, this program
+	  automatically updates <filename>/etc/passwd</filename> and
+	  <filename>/etc/group</filename>.  It also creates a home
+	  directory for the new user, copies in the default
+	  configuration files from
+	  <filename>/usr/share/skel</filename>, and can optionally
+	  mail the new user a welcome message.  This utility must be
+	  run as the
+	  <systemitem class="username">superuser</systemitem></para>
+
+	<para>The &man.adduser.8; utility is interactive and walks
+	  through the steps for creating a new user account.  As seen
+	  in Example 4.2, either input the required information or
+	  press <keycap>Return</keycap> to accept the default value
+	  shown in square brackets.  In this example, the user has
+	  been invited into the
+	  <systemitem class="groupname">wheel</systemitem> group,
+	  which is required to provide the account with superuser
+	  access.  When finished, the utility will prompt to either
+	  create another user or to exit.</para>
+
+	<example>
+	  <title>Adding a User on &os;</title>
+
+	  <screen>&prompt.root; <userinput>adduser</userinput>
 Username: <userinput>jru</userinput>
 Full name: <userinput>J. Random User</userinput>
 Uid (Leave empty for default):
@@ -733,125 +763,133 @@ adduser: INFO: Successfully added (jru) to the user database.
 Add another user? (yes/no): <userinput>no</userinput>
 Goodbye!
 &prompt.root;</screen>
-      </example>
+	</example>
 
-      <note>
-	<para>Since the password is not echoed when typed, be careful
-	  to not mistype the password when creating the user
-	  account.</para>
-      </note>
-    </sect3>
+	<note>
+	  <para>Since the password is not echoed when typed, be
+	    careful to not mistype the password when creating the user
+	    account.</para>
+	</note>
+      </sect3>
 
-    <sect3 xml:id="users-rmuser">
-      <title><command>rmuser</command></title>
+      <sect3 xml:id="users-rmuser">
+	<title><command>rmuser</command></title>
 
-      <indexterm><primary><command>rmuser</command></primary></indexterm>
-      <indexterm>
-	<primary>accounts</primary>
-	<secondary>removing</secondary>
-      </indexterm>
+	<indexterm>
+	  <primary><command>rmuser</command></primary>
+	</indexterm>
+	<indexterm>
+	  <primary>accounts</primary>
+	  <secondary>removing</secondary>
+	</indexterm>
 
-      <para>To completely remove a user from the system, run
-	&man.rmuser.8; as the superuser.  This command performs the
-	following steps:</para>
+	<para>To completely remove a user from the system, run
+	  &man.rmuser.8; as the superuser.  This command performs the
+	  following steps:</para>
 
-      <procedure>
-	<step>
-	  <para>Removes the user's &man.crontab.1; entry, if one
-	    exists.</para>
-	</step>
+	<procedure>
+	  <step>
+	    <para>Removes the user's &man.crontab.1; entry, if one
+	      exists.</para>
+	  </step>
 
-	<step>
-	  <para>Removes any &man.at.1; jobs belonging to the
-	    user.</para>
-	</step>
+	  <step>
+	    <para>Removes any &man.at.1; jobs belonging to the
+	      user.</para>
+	  </step>
 
-	<step>
-	  <para>Kills all processes owned by the user.</para>
-	</step>
+	  <step>
+	    <para>Kills all processes owned by the user.</para>
+	  </step>
 
-	<step>
-	  <para>Removes the user from the system's local password
-	    file.</para>
-	</step>
+	  <step>
+	    <para>Removes the user from the system's local password
+	      file.</para>
+	  </step>
 
-	<step>
-	  <para>Optionally removes the user's home directory, if it is
-	    owned by the user.</para>
-	</step>
+	  <step>
+	    <para>Optionally removes the user's home directory, if it
+	      is owned by the user.</para>
+	  </step>
 
-	<step>
-	  <para>Removes the incoming mail files belonging to the user
-	    from <filename>/var/mail</filename>.</para>
-	</step>
+	  <step>
+	    <para>Removes the incoming mail files belonging to the
+	      user from <filename>/var/mail</filename>.</para>
+	  </step>
 
-	<step>
-	  <para>Removes all files owned by the user from temporary
-	    file storage areas such as <filename>/tmp</filename>.</para>
-	</step>
+	  <step>
+	    <para>Removes all files owned by the user from temporary
+	      file storage areas such as
+	      <filename>/tmp</filename>.</para>
+	  </step>
 
-	<step>
-	  <para>Finally, removes the username from all groups to which
-	    it belongs in <filename>/etc/group</filename>.  If a group
-	    becomes empty and the group name is the same as the
-	    username, the group is removed.  This complements the
-	    per-user unique groups created by &man.adduser.8;.</para>
-	</step>
-      </procedure>
+	  <step>
+	    <para>Finally, removes the username from all groups to
+	      which it belongs in <filename>/etc/group</filename>.  If
+	      a group becomes empty and the group name is the same as
+	      the username, the group is removed.  This complements
+	      the per-user unique groups created by
+	      &man.adduser.8;.</para>
+	  </step>
+	</procedure>
 
-      <para>&man.rmuser.8; cannot be used to remove superuser
-	accounts since that is almost always an indication of massive
-	destruction.</para>
+	<para>&man.rmuser.8; cannot be used to remove superuser
+	  accounts since that is almost always an indication of
+	  massive destruction.</para>
 
-      <para>By default, an interactive mode is used, as shown
-	in the following example.</para>
+	<para>By default, an interactive mode is used, as shown
+	  in the following example.</para>
 
-      <example>
-	<title><command>rmuser</command> Interactive Account
-	  Removal</title>
+	<example>
+	  <title><command>rmuser</command> Interactive Account
+	    Removal</title>
 
-	<screen>&prompt.root; <userinput>rmuser jru</userinput>
+	  <screen>&prompt.root; <userinput>rmuser jru</userinput>
 Matching password entry:
 jru:*:1001:1001::0:0:J. Random User:/home/jru:/usr/local/bin/zsh
 Is this the entry you wish to remove? <userinput>y</userinput>
 Remove user's home directory (/home/jru)? <userinput>y</userinput>
 Removing user (jru): mailspool home passwd.
 &prompt.root;</screen>
-      </example>
-    </sect3>
+	</example>
+      </sect3>
 
-    <sect3 xml:id="users-chpass">
-      <title><command>chpass</command></title>
+      <sect3 xml:id="users-chpass">
+	<title><command>chpass</command></title>
 
-      <indexterm><primary><command>chpass</command></primary></indexterm>
-      <para>Any user can use &man.chpass.1; to change their default
-	shell and personal information associated with their user
-	account.  The superuser can use this utility to change
-	additional account information for any user.</para>
+	<indexterm>
+	  <primary><command>chpass</command></primary>
+	</indexterm>
 
-      <para>When passed no options, aside from an optional username,
-	&man.chpass.1; displays an editor containing user information.
-	When the user exists from the editor, the user database is
-	updated with the new information.</para>
+	<para>Any user can use &man.chpass.1; to change their default
+	  shell and personal information associated with their user
+	  account.  The superuser can use this utility to change
+	  additional account information for any user.</para>
 
-      <note>
-	<para>This utility will prompt for the user's password when
-	  exiting the editor, unless the utility is run as the
-	  superuser.</para>
-      </note>
+	<para>When passed no options, aside from an optional username,
+	  &man.chpass.1; displays an editor containing user
+	  information.  When the user exists from the editor, the user
+	  database is updated with the new information.</para>
 
-      <para>In Example 4.4, the superuser has typed
-	<command>chpass jru</command> and is now viewing the fields
-	that can be changed for this user.  If
-	<systemitem class="username">jru</systemitem> runs this command instead, only the
-	last six fields will be displayed and available for editing.
-	This is shown in Example 4.5.</para>
+	<note>
+	  <para>This utility will prompt for the user's password when
+	    exiting the editor, unless the utility is run as the
+	    superuser.</para>
+	</note>
 
-      <example>
-	<title>Using <command>chpass</command> as
-	  Superuser</title>
+	<para>In Example 4.4, the superuser has typed
+	  <command>chpass jru</command> and is now viewing the fields
+	  that can be changed for this user.  If
+	  <systemitem class="username">jru</systemitem> runs this
+	  command instead, only the last six fields will be displayed
+	  and available for editing.  This is shown in Example
+	  4.5.</para>
 
-	<screen>#Changing user database information for jru.
+	<example>
+	  <title>Using <command>chpass</command> as
+	    Superuser</title>
+
+	  <screen>#Changing user database information for jru.
 Login: jru
 Password: *
 Uid [#]: 1001
@@ -866,448 +904,509 @@ Office Location:
 Office Phone:
 Home Phone:
 Other information:</screen>
-      </example>
+	</example>
 
-      <example>
-	<title>Using <command>chpass</command> as Regular
-	  User</title>
+	<example>
+	  <title>Using <command>chpass</command> as Regular
+	    User</title>
 
-	<screen>#Changing user database information for jru.
+	  <screen>#Changing user database information for jru.
 Shell: /usr/local/bin/zsh
 Full Name: J. Random User
 Office Location:
 Office Phone:
 Home Phone:
 Other information:</screen>
-      </example>
+	</example>
 
-      <note>
-	<para>&man.chfn.1; and &man.chsh.1; are links to
-	  &man.chpass.1;, as are &man.ypchpass.1;, &man.ypchfn.1;, and
-	  &man.ypchsh.1;.  Since <acronym>NIS</acronym> support is
-	  automatic, specifying the <literal>yp</literal> before
-	  the command is not necessary.  How to configure NIS is
-	  covered in <xref linkend="network-servers"/>.</para>
-      </note>
-    </sect3>
-    <sect3 xml:id="users-passwd">
-      <title><command>passwd</command></title>
+	<note>
+	  <para>&man.chfn.1; and &man.chsh.1; are links to
+	    &man.chpass.1;, as are &man.ypchpass.1;, &man.ypchfn.1;,
+	    and &man.ypchsh.1;.  Since <acronym>NIS</acronym> support
+	    is automatic, specifying the <literal>yp</literal> before
+	    the command is not necessary.  How to configure NIS is
+	    covered in <xref linkend="network-servers"/>.</para>
+	</note>
+      </sect3>
 
-      <indexterm><primary><command>passwd</command></primary></indexterm>
-      <indexterm>
-	<primary>accounts</primary>
-	<secondary>changing password</secondary>
-      </indexterm>
-      <para>Any user can easily change their password using
-	&man.passwd.1;.  To prevent accidental or unauthorized
-	changes, this command will prompt for the user's original
-	password before a new password can be set:</para>
+      <sect3 xml:id="users-passwd">
+	<title><command>passwd</command></title>
 
-      <example>
-	<title>Changing Your Password</title>
+	<indexterm>
+	  <primary><command>passwd</command></primary>
+	</indexterm>
+	<indexterm>
+	  <primary>accounts</primary>
+	  <secondary>changing password</secondary>
+	</indexterm>
 
-	<screen>&prompt.user; <userinput>passwd</userinput>
+	<para>Any user can easily change their password using
+	  &man.passwd.1;.  To prevent accidental or unauthorized
+	  changes, this command will prompt for the user's original
+	  password before a new password can be set:</para>
+
+	<example>
+	  <title>Changing Your Password</title>
+
+	  <screen>&prompt.user; <userinput>passwd</userinput>
 Changing local password for jru.
 Old password:
 New password:
 Retype new password:
 passwd: updating the database...
 passwd: done</screen>
-      </example>
+	</example>
 
-      <para>The superuser can change any user's password by specifying
-	the username when running &man.passwd.1;.  When this utility
-	is run as the superuser, it will not prompt for the user's
-	current password.  This allows the password to be changed when
-	a user cannot remember the original password.</para>
+	<para>The superuser can change any user's password by
+	  specifying the username when running &man.passwd.1;.  When
+	  this utility is run as the superuser, it will not prompt for
+	  the user's current password.  This allows the password to be
+	  changed when a user cannot remember the original
+	  password.</para>
 
-      <example>
-	<title>Changing Another User's Password as the
-	  Superuser</title>
+	<example>
+	  <title>Changing Another User's Password as the
+	    Superuser</title>
 
-	<screen>&prompt.root; <userinput>passwd jru</userinput>
+	  <screen>&prompt.root; <userinput>passwd jru</userinput>
 Changing local password for jru.
 New password:
 Retype new password:
 passwd: updating the database...
 passwd: done</screen>
-      </example>
+	</example>
+
+	<note>
+	  <para>As with &man.chpass.1;, &man.yppasswd.1; is a link to
+	    &man.passwd.1;, so <acronym>NIS</acronym> works with
+	    either command.</para>
+	</note>
+      </sect3>
+
+      <sect3 xml:id="users-pw">
+	<title><command>pw</command></title>
+
+	<indexterm>
+	  <primary><command>pw</command></primary>
+	</indexterm>
+
+	<para>&man.pw.8; is a command line utility to create, remove,
+	  modify, and display users and groups.  It functions as a
+	  front end to the system user and group files.  &man.pw.8;
+	  has a very powerful set of command line options that make it
+	  suitable for use in shell scripts, but new users may find it
+	  more complicated than the other commands presented in this
+	  section.</para>
+      </sect3>
+    </sect2>
+
+    <sect2 xml:id="users-limiting">
+      <title>Limiting Users</title>
+
+      <indexterm>
+	<primary>limiting users</primary>
+      </indexterm>
+      <indexterm>
+	<primary>accounts</primary>
+	<secondary>limiting</secondary>
+      </indexterm>
+
+      <para>&os; provides several methods for an administrator to
+	limit the amount of system resources an individual may use.
+	These limits are discussed in two sections: disk quotas and
+	other resource limits.</para>
+
+      <indexterm>
+	<primary>quotas</primary>
+      </indexterm>
+      <indexterm>
+	<primary>limiting users</primary>
+	<secondary>quotas</secondary>
+      </indexterm>
+      <indexterm>
+	<primary>disk quotas</primary>
+      </indexterm>
+
+      <para>Disk quotas limit the amount of disk space available to
+	users and provide a way to quickly check that usage without
+	calculating it every time.  Quotas are discussed in
+	<xref linkend="quotas"/>.</para>
+
+      <para>The other resource limits include ways to limit the amount
+	of CPU, memory, and other resources a user may consume.  These
+	are defined using login classes and are discussed here.</para>
+
+      <indexterm>
+	<primary><filename>/etc/login.conf</filename></primary>
+      </indexterm>
+
+      <para>Login classes are defined in
+	<filename>/etc/login.conf</filename> and are described in
+	detail in &man.login.conf.5;.  Each user account is assigned
+	to a login class, <literal>default</literal> by default, and
+	each login class has a set of login capabilities associated
+	with it.  A login capability is a
+	<literal>name=value</literal> pair, where
+	<replaceable>name</replaceable> is a well-known identifier and
+	<replaceable>value</replaceable> is an arbitrary string which
+	is processed accordingly depending on the
+	<replaceable>name</replaceable>.  Setting up login classes and
+	capabilities is rather straightforward and is also described
+	in &man.login.conf.5;.</para>
 
       <note>
-	<para>As with &man.chpass.1;, &man.yppasswd.1; is a link to
-	  &man.passwd.1;, so <acronym>NIS</acronym> works with either
-	  command.</para>
+	<para>&os; does not normally read the configuration in
+	  <filename>/etc/login.conf</filename> directly, but instead
+	  reads the <filename>/etc/login.conf.db</filename> database
+	  which provides faster lookups.  Whenever
+	  <filename>/etc/login.conf</filename> is edited, the
+	  <filename>/etc/login.conf.db</filename> must be updated by
+	  executing the following command:</para>
+
+	<screen>&prompt.root; <userinput>cap_mkdb /etc/login.conf</userinput></screen>
       </note>
-    </sect3>
 
+      <para>Resource limits differ from the default login capabilities
+	in two ways.  First, for every limit, there is a soft
+	(current) and hard limit.  A soft limit may be adjusted by the
+	user or application, but may not be set higher than the hard
+	limit.  The hard limit may be lowered by the user, but can
+	only be raised by the superuser.  Second, most resource limits
+	apply per process to a specific user, not to the user as a
+	whole.  These differences are mandated by the specific
+	handling of the limits, not by the implementation of the login
+	capability framework.</para>
 
-    <sect3 xml:id="users-pw">
-      <title><command>pw</command></title>
+      <para>Below are the most commonly used resource limits.  The
+	rest of the limits, along with all the other login
+	capabilities, can be found in &man.login.conf.5;.</para>
 
-      <indexterm><primary><command>pw</command></primary></indexterm>
+      <variablelist>
+	<varlistentry>
+	  <term><literal>coredumpsize</literal></term>
 
-      <para>&man.pw.8; is a command line utility to create, remove,
-	modify, and display users and groups.  It functions as a front
-	end to the system user and group files.  &man.pw.8; has a very
-	powerful set of command line options that make it suitable for
-	use in shell scripts, but new users may find it more
-	complicated than the other commands presented in this
-	section.</para>
-    </sect3>
-  </sect2>
+	  <listitem>
+	    <para>The limit on the size of a core file
+	      <indexterm>
+		<primary>coredumpsize</primary>
+	      </indexterm>
+	      generated by a program is subordinate to other limits
+	      <indexterm>
+		<primary>limiting users</primary>
+		<secondary>coredumpsize</secondary>
+	      </indexterm>
+	      on disk usage, such as <literal>filesize</literal>, or
+	      disk quotas.  This limit is often used as a less-severe
+	      method of controlling disk space consumption.  Since
+	      users do not generate core files themselves, and often
+	      do not delete them, setting this may save them from
+	      running out of disk space should a large program
+	      crash.</para>
+	  </listitem>
+	</varlistentry>
 
-  <sect2 xml:id="users-limiting">
-    <title>Limiting Users</title>
+	<varlistentry>
+	  <term><literal>cputime</literal></term>
 
-    <indexterm><primary>limiting users</primary></indexterm>
-    <indexterm>
-      <primary>accounts</primary>
-      <secondary>limiting</secondary>
-    </indexterm>
-    <para>&os; provides several methods for an administrator to limit
-      the amount of system resources an individual may use.  These
-      limits are discussed in two sections: disk quotas and other
-      resource limits.</para>
+	  <listitem>
+	    <para>The maximum amount of CPU
+	      <indexterm>
+		<primary>cputime</primary>
+	      </indexterm>
+	      <indexterm>
+		<primary>limiting users</primary>
+		<secondary>cputime</secondary>
+	      </indexterm>
+	      time a user's process may consume.  Offending processes
+	      will be killed by the kernel.</para>
 
-    <indexterm><primary>quotas</primary></indexterm>
-    <indexterm>
-      <primary>limiting users</primary>
-      <secondary>quotas</secondary>
-    </indexterm>
-    <indexterm><primary>disk quotas</primary></indexterm>
-    <para>Disk quotas limit the amount of disk space available to
-      users and provide a way to quickly check that usage without
-      calculating it every time.  Quotas are discussed in <xref linkend="quotas"/>.</para>
+	    <note>
+	      <para>This is a limit on CPU <emphasis>time</emphasis>
+		consumed, not percentage of the CPU as displayed in
+		some fields by &man.top.1; and &man.ps.1;.</para>
+	    </note>
+	  </listitem>
+	</varlistentry>
 
-    <para>The other resource limits include ways to limit the amount
-      of CPU, memory, and other resources a user may consume.  These
-      are defined using login classes and are discussed here.</para>
+	<varlistentry>
+	  <term><literal>filesize</literal></term>
 
-    <indexterm>
-      <primary><filename>/etc/login.conf</filename></primary>
-    </indexterm>
-    <para>Login classes are defined in
-      <filename>/etc/login.conf</filename> and are described in detail
-      in &man.login.conf.5;.  Each user account is assigned to a login
-      class, <literal>default</literal> by default, and each login
-      class has a set of login capabilities associated with it.  A
-      login capability is a
-      <literal>name=value</literal>
-      pair, where <replaceable>name</replaceable> is a well-known
-      identifier and <replaceable>value</replaceable> is an arbitrary
-      string which is processed accordingly depending on the
-      <replaceable>name</replaceable>.  Setting up login classes and
-      capabilities is rather straightforward and is also described in
-      &man.login.conf.5;.</para>
+	  <listitem>
+	    <para>The maximum size of a file
+	      <indexterm>
+		<primary>filesize</primary>
+	      </indexterm>
+	      <indexterm>
+		<primary>limiting users</primary>
+		<secondary>filesize</secondary>
+	      </indexterm>
+	      the user may own.  Unlike
+	      <link linkend="quotas">disk quotas</link>, this limit is
+	      enforced on individual files, not the set of all files a
+	      user owns.</para>
+	  </listitem>
+	</varlistentry>
 
-    <note>
-      <para>&os; does not normally read the configuration in
-	<filename>/etc/login.conf</filename> directly, but instead
-	reads the <filename>/etc/login.conf.db</filename> database
-	which provides faster lookups.  Whenever
-	<filename>/etc/login.conf</filename> is edited, the
-	<filename>/etc/login.conf.db</filename> must be updated by
-	executing the following command:</para>
+	<varlistentry>
+	  <term><literal>maxproc</literal></term>
 
-      <screen>&prompt.root; <userinput>cap_mkdb /etc/login.conf</userinput></screen>
-    </note>
+	  <listitem>
+	    <para>The maximum number of processes
+	      <indexterm>
+		<primary>maxproc</primary>
+	      </indexterm>
+	      <indexterm>
+		<primary>limiting users</primary>
+		<secondary>maxproc</secondary>
+	      </indexterm>
+	      a user can run.  This includes foreground and background
+	      processes.  This limit may not be larger than the system
+	      limit specified by the <varname>kern.maxproc</varname>
+	      &man.sysctl.8;.  Setting this limit too small may hinder
+	      a user's productivity as it is often useful to be logged
+	      in multiple times or to execute pipelines.  Some tasks,
+	      such as compiling a large program, spawn multiple
+	      processes and other intermediate preprocessors.</para>
+	  </listitem>
+	</varlistentry>
 
-    <para>Resource limits differ from the default login capabilities
-      in two ways.  First, for every limit, there is a soft (current)
-      and hard limit.  A soft limit may be adjusted by the user or
-      application, but may not be set higher than the hard limit.  The
-      hard limit may be lowered by the user, but can only be raised
-      by the superuser.  Second, most resource limits apply per
-      process to a specific user, not to the user as a whole.  These
-      differences are mandated by the specific handling of the limits,
-      not by the implementation of the login capability
-      framework.</para>
+	<varlistentry>
+	  <term><literal>memorylocked</literal></term>
 
-    <para>Below are the most commonly used resource limits.  The rest
-      of the limits, along with all the other login capabilities, can
-      be found in &man.login.conf.5;.</para>
+	  <listitem>
+	    <para>The maximum amount of memory
+	      <indexterm>
+		<primary>memorylocked</primary>
+	      </indexterm>
+	      <indexterm>
+		<primary>limiting users</primary>
+		<secondary>memorylocked</secondary>
+	      </indexterm>
+	      a process may request to be locked into main memory
+	      using &man.mlock.2;.  Some system-critical programs,
+	      such as &man.amd.8;, lock into main memory so that if
+	      the system begins to swap, they do not contribute to
+	      disk thrashing.</para>
+	  </listitem>
+	</varlistentry>
 
-    <variablelist>
-      <varlistentry>
-	<term><literal>coredumpsize</literal></term>
+	<varlistentry>
+	  <term><literal>memoryuse</literal></term>
+
+	  <listitem>
+	    <para>The maximum amount of memory
+	      <indexterm>
+		<primary>memoryuse</primary>
+	      </indexterm>
+	      <indexterm>
+		<primary>limiting users</primary>
+		<secondary>memoryuse</secondary>
+	      </indexterm>
+	      a process may consume at any given time.  It includes
+	      both core memory and swap usage.  This is not a
+	      catch-all limit for restricting memory consumption, but
+	      is a good start.</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term><literal>openfiles</literal></term>
+
+	  <listitem>
+	    <para>The maximum number of files a process may have open
+	      <indexterm>
+		<primary>openfiles</primary>
+	      </indexterm>
+	      <indexterm>
+		<primary>limiting users</primary>
+		<secondary>openfiles</secondary>
+	      </indexterm>.
+	      In &os;, files are used to represent sockets and IPC
+	      channels, so be careful not to set this too low.  The
+	      system-wide limit for this is defined by the
+	      <varname>kern.maxfiles</varname> &man.sysctl.8;.</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term><literal>sbsize</literal></term>
+
+	  <listitem>
+	    <para>The limit on the amount of network memory, and
+	      thus mbufs
+	      <indexterm>
+		<primary>sbsize</primary>
+	      </indexterm>
+	      <indexterm>
+		<primary>limiting users</primary>
+		<secondary>sbsize</secondary>
+	      </indexterm>,
+	      a user may consume in order to limit network
+	      communications.</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term><literal>stacksize</literal></term>
+
+	  <listitem>
+	    <para>The maximum size of a process stack
+	      <indexterm>
+		<primary>stacksize</primary>
+	      </indexterm>
+	      <indexterm>
+		<primary>limiting users</primary>
+		<secondary>stacksize</secondary>
+	      </indexterm>.
+	      This alone is not sufficient to limit the amount of
+	      memory a program may use so it should be used in
+	      conjunction with other limits.</para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+
+      <para>There are a few other things to remember when setting
+	resource limits.  Following are some general tips,
+	suggestions, and miscellaneous comments.</para>
+
+      <itemizedlist>
+	<listitem>
+	  <para>Processes started at system startup by
+	    <filename>/etc/rc</filename> are assigned to the
+	    <literal>daemon</literal> login class.</para>
+	</listitem>
 
 	<listitem>
-	  <para>The limit on the size of a core file
-	    <indexterm><primary>coredumpsize</primary></indexterm>
-	    generated by a program is subordinate to other
-	    limits <indexterm><primary>limiting users
-	      </primary><secondary>coredumpsize</secondary></indexterm>
-	    on disk usage, such as <literal>filesize</literal>, or
-	    disk quotas.  This limit is often used as a less-severe
-	    method of controlling disk space consumption.  Since
-	    users do not generate core files themselves, and often do
-	    not delete them, setting this may save them from running
-	    out of disk space should a large program crash.</para>
+	  <para>Although the <filename>/etc/login.conf</filename> that
+	    comes with the system is a good source of reasonable
+	    values for most limits, they may not be appropriate for
+	    every system.  Setting a limit too high may open the
+	    system up to abuse, while setting it too low may put a
+	    strain on productivity.</para>
 	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term><literal>cputime</literal></term>
 
 	<listitem>
-	  <para>The maximum amount of CPU
-	    <indexterm><primary>cputime</primary></indexterm><indexterm><primary>
-	      limiting users
-	      </primary><secondary>cputime</secondary></indexterm>
-	    time a user's process may consume.  Offending processes
-	    will be killed by the kernel.</para>
-
-	  <note>
-	    <para>This is a limit on CPU <emphasis>time</emphasis>
-	      consumed, not percentage of the CPU as displayed in
-	      some fields by &man.top.1; and &man.ps.1;.</para>
-	  </note>
+	  <para>Users of <application>&xorg;</application> should
+	    probably be granted more resources than other users.
+	    <application>&xorg;</application> by itself takes a lot of
+	    resources, but it also encourages users to run more
+	    programs simultaneously.</para>
 	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term><literal>filesize</literal></term>
 
 	<listitem>
-	  <para>The maximum size of a file
-	    <indexterm><primary>filesize</primary></indexterm><indexterm><primary>
-		limiting users
-		</primary><secondary>filesize</secondary></indexterm>
-	    the user may own.  Unlike <link linkend="quotas">disk
-	      quotas</link>, this limit is enforced on individual
-	    files, not the set of all files a user owns.</para>
+	  <para>Many limits apply to individual processes, not the
+	    user as a whole.  For example, setting
+	    <varname>openfiles</varname> to 50 means that each process
+	    the user runs may open up to 50 files.  The total amount
+	    of files a user may open is the value of
+	    <literal>openfiles</literal> multiplied by the value of
+	    <literal>maxproc</literal>.  This also applies to memory
+	    consumption.</para>
 	</listitem>
-      </varlistentry>
+      </itemizedlist>
 
-      <varlistentry>
-	<term><literal>maxproc</literal></term>
+      <para>For further information on resource limits and login
+	classes and capabilities in general, refer to
+	&man.cap.mkdb.1;, &man.getrlimit.2;, and
+	&man.login.conf.5;.</para>
+    </sect2>
 
-	<listitem>
-	  <para>The maximum number of processes
-	    <indexterm><primary>maxproc</primary></indexterm><indexterm><primary>
-	      limiting users
-	      </primary><secondary>maxproc</secondary></indexterm> a
-	    user can run.  This includes foreground and background
-	    processes.  This limit may not be larger than the system
-	    limit specified by the
-	    <varname>kern.maxproc</varname> &man.sysctl.8;.  Setting
-	    this limit too small may hinder a user's productivity as
-	    it is often useful to be logged in multiple times or to
-	    execute pipelines.  Some tasks, such as compiling a large
-	    program, spawn multiple processes and other intermediate
-	    preprocessors.</para>
-	</listitem>
-      </varlistentry>
+    <sect2 xml:id="users-groups">
+      <title>Managing Groups</title>
 
-      <varlistentry>
-	<term><literal>memorylocked</literal></term>
+      <indexterm>
+	<primary>groups</primary>
+      </indexterm>
+      <indexterm>
+	<primary><filename>/etc/groups</filename></primary>
+      </indexterm>
+      <indexterm>
+	<primary>accounts</primary>
+	<secondary>groups</secondary>
+      </indexterm>
 
-	<listitem>
-	  <para>The maximum amount of memory
-	    <indexterm><primary>memorylocked</primary></indexterm><indexterm><primary>
-		limiting users
-		</primary><secondary>memorylocked</secondary></indexterm>
-	    a process may request to be locked into main memory using
-	    &man.mlock.2;.  Some system-critical programs, such as
-	    &man.amd.8;, lock into main memory so that if the system
-	    begins to swap, they do not contribute to disk
-	    thrashing.</para>
-	</listitem>
-      </varlistentry>
+      <para>A group is a list of users.  A group is identified by its
+	group name and <acronym>GID</acronym>.  In &os;, the kernel
+	uses the <acronym>UID</acronym> of a process, and the list of
+	groups it belongs to, to determine what the process is allowed
+	to do.  Most of the time, the <acronym>GID</acronym> of a user
+	or process usually means the first group in the list.</para>
 
-      <varlistentry>
-	<term><literal>memoryuse</literal></term>
+      <para>The group name to <acronym>GID</acronym> mapping is listed
+	in <filename>/etc/group</filename>.  This is a plain text file
+	with four colon-delimited fields.  The first field is the
+	group name, the second is the encrypted password, the third
+	the <acronym>GID</acronym>, and the fourth the comma-delimited
+	list of members.  For a more complete description of the
+	syntax, refer to &man.group.5;.</para>
 
-	<listitem>
-	  <para>The maximum amount of memory
-	    <indexterm><primary>memoryuse</primary></indexterm><indexterm><primary>
-		limiting
-		users</primary><secondary>memoryuse</secondary></indexterm>
-	    a process may consume at any given time.  It includes both
-	    core memory and swap usage.  This is not a catch-all limit
-	    for restricting memory consumption, but is a good
-	    start.</para>
-	</listitem>
-      </varlistentry>
+      <para>The superuser can modify <filename>/etc/group</filename>
+	using a text editor.  Alternatively, &man.pw.8; can be used to
+	add and edit groups.  For example, to add a group called
+	<systemitem class="groupname">teamtwo</systemitem> and then
+	confirm that it exists:</para>
 
-      <varlistentry>
-	<term><literal>openfiles</literal></term>
+      <example>
+	<title>Adding a Group Using &man.pw.8;</title>
 
-	<listitem>
-	  <para>The maximum number of files a process may have open
-	    <indexterm><primary>openfiles</primary></indexterm><indexterm><primary>
-		limiting
-		users</primary><secondary>openfiles</secondary></indexterm>.
-	    In &os;, files are used to represent sockets and IPC
-	    channels, so be careful not to set this too low.  The
-	    system-wide limit for this is defined by the
-	    <varname>kern.maxfiles</varname> &man.sysctl.8;.</para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term><literal>sbsize</literal></term>
-
-	<listitem>
-	  <para>The limit on the amount of network memory, and
-	    thus mbufs
-	    <indexterm><primary>sbsize</primary></indexterm><indexterm><primary>limiting
-	      users</primary><secondary>sbsize</secondary></indexterm>,
-	    a user may consume in order to limit network
-	    communications.</para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term><literal>stacksize</literal></term>
-
-	<listitem>
-	  <para>The maximum size of a process stack
-	    <indexterm><primary>stacksize</primary></indexterm><indexterm><primary>limiting
-	      users</primary><secondary>stacksize</secondary></indexterm>.
-	    This alone is not sufficient to limit the amount of memory
-	    a program may use so it should be used in conjunction with
-	    other limits.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para>There are a few other things to remember when setting
-      resource limits.  Following are some general tips, suggestions,
-      and miscellaneous comments.</para>
-
-    <itemizedlist>
-      <listitem>
-	<para>Processes started at system startup by
-	  <filename>/etc/rc</filename> are assigned to the
-	  <literal>daemon</literal> login class.</para>
-      </listitem>
-
-      <listitem>
-	<para>Although the <filename>/etc/login.conf</filename> that
-	  comes with the system is a good source of reasonable values
-	  for most limits, they may not be appropriate for every
-	  system.  Setting a limit too high may open the system up to
-	  abuse, while setting it too low may put a strain on
-	  productivity.</para>
-      </listitem>
-
-      <listitem>
-	<para>Users of <application>&xorg;</application> should
-	  probably be granted more resources than other users.
-	  <application>&xorg;</application> by itself takes a lot of
-	  resources, but it also encourages users to run more programs
-	  simultaneously.</para>
-      </listitem>
-
-      <listitem>
-	<para>Many limits apply to individual processes, not the user
-	  as a whole.  For example, setting
-	  <varname>openfiles</varname> to 50 means that each process
-	  the user runs may open up to 50 files.  The total amount
-	  of files a user may open is the value of
-	  <literal>openfiles</literal> multiplied by the value of
-	  <literal>maxproc</literal>.  This also applies to memory
-	  consumption.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>For further information on resource limits and login classes
-      and capabilities in general, refer to &man.cap.mkdb.1;,
-      &man.getrlimit.2;, and &man.login.conf.5;.</para>
-  </sect2>
-
-  <sect2 xml:id="users-groups">
-    <title>Managing Groups</title>
-
-    <indexterm><primary>groups</primary></indexterm>
-    <indexterm>
-      <primary><filename>/etc/groups</filename></primary>
-    </indexterm>
-    <indexterm>
-      <primary>accounts</primary>
-      <secondary>groups</secondary>
-    </indexterm>
-    <para>A group is a list of users.  A group is identified by its
-      group name and <acronym>GID</acronym>.  In &os;, the
-      kernel uses the <acronym>UID</acronym> of a process, and the
-      list of groups it belongs to, to determine what the process is
-      allowed to do.  Most of the time, the <acronym>GID</acronym> of
-      a user or process usually means the first group in the
-      list.</para>
-
-    <para>The group name to <acronym>GID</acronym> mapping is listed
-      in <filename>/etc/group</filename>.  This is a plain text file
-      with four colon-delimited fields.  The first field is the group
-      name, the second is the encrypted password, the third the
-      <acronym>GID</acronym>, and the fourth the comma-delimited list
-      of members.  For a more complete description of the syntax,
-      refer to &man.group.5;.</para>
-
-    <para>The superuser can modify <filename>/etc/group</filename>
-      using a text editor.  Alternatively, &man.pw.8; can be used to
-      add and edit groups.  For example, to add a group called
-      <systemitem class="groupname">teamtwo</systemitem> and then confirm that it
-      exists:</para>
-
-    <example>
-      <title>Adding a Group Using &man.pw.8;</title>
-
-      <screen>&prompt.root; <userinput>pw groupadd teamtwo</userinput>
+	<screen>&prompt.root; <userinput>pw groupadd teamtwo</userinput>
 &prompt.root; <userinput>pw groupshow teamtwo</userinput>
 teamtwo:*:1100:</screen>
-    </example>
+      </example>
 
-    <para>In this example, <literal>1100</literal> is the
-      <acronym>GID</acronym> of <systemitem class="groupname">teamtwo</systemitem>.  Right
-      now, <systemitem class="groupname">teamtwo</systemitem> has no members.  This
-      command will add <systemitem class="username">jru</systemitem> as a member of
-      <systemitem class="groupname">teamtwo</systemitem>.</para>
+      <para>In this example, <literal>1100</literal> is the
+	<acronym>GID</acronym> of
+	<systemitem class="groupname">teamtwo</systemitem>.  Right
+	now, <systemitem class="groupname">teamtwo</systemitem> has no
+	members.  This command will add
+	<systemitem class="username">jru</systemitem> as a member of
+	<systemitem class="groupname">teamtwo</systemitem>.</para>
 
-    <example>
-      <title>Adding User Accounts to a New Group Using
-	&man.pw.8;</title>
+      <example>
+	<title>Adding User Accounts to a New Group Using
+	  &man.pw.8;</title>
 
-      <screen>&prompt.root; <userinput>pw groupmod teamtwo -M jru</userinput>
+	<screen>&prompt.root; <userinput>pw groupmod teamtwo -M jru</userinput>
 &prompt.root; <userinput>pw groupshow teamtwo</userinput>
 teamtwo:*:1100:jru</screen>
-    </example>
+      </example>
 
-    <para>The argument to <option>-M</option> is a comma-delimited
-      list of users to be added to a new (empty) group or to replace
-      the members of an existing group.  To the user, this group
-      membership is different from (and in addition to) the user's
-      primary group listed in the password file.  This means that
-      the user will not show up as a member when using
-      <option>groupshow</option> with &man.pw.8;, but will show up
-      when the information is queried via &man.id.1; or a similar
-      tool.  When &man.pw.8; is used to add a user to a group, it only
-      manipulates <filename>/etc/group</filename> and does not attempt
-      to read additional data from
-      <filename>/etc/passwd</filename>.</para>
+      <para>The argument to <option>-M</option> is a comma-delimited
+	list of users to be added to a new (empty) group or to replace
+	the members of an existing group.  To the user, this group
+	membership is different from (and in addition to) the user's
+	primary group listed in the password file.  This means that
+	the user will not show up as a member when using
+	<option>groupshow</option> with &man.pw.8;, but will show up
+	when the information is queried via &man.id.1; or a similar
+	tool.  When &man.pw.8; is used to add a user to a group, it
+	only manipulates <filename>/etc/group</filename> and does not
+	attempt to read additional data from
+	<filename>/etc/passwd</filename>.</para>
 
-    <example>
-      <title>Adding a New Member to a Group Using &man.pw.8;</title>
+      <example>
+	<title>Adding a New Member to a Group Using &man.pw.8;</title>
 
-      <screen>&prompt.root; <userinput>pw groupmod teamtwo -m db</userinput>
+	<screen>&prompt.root; <userinput>pw groupmod teamtwo -m db</userinput>
 &prompt.root; <userinput>pw groupshow teamtwo</userinput>
 teamtwo:*:1100:jru,db</screen>
-    </example>
+      </example>
 
-    <para>In this example, the argument to <option>-m</option> is a
-      comma-delimited list of users who are to be added to the group.
-      Unlike the previous example, these users are appended to the
-      group list and do not replace the list of existing users in the
-      group.</para>
+      <para>In this example, the argument to <option>-m</option> is a
+	comma-delimited list of users who are to be added to the
+	group.  Unlike the previous example, these users are appended
+	to the group list and do not replace the list of existing
+	users in the group.</para>
 
-    <example>
-      <title>Using &man.id.1; to Determine Group Membership</title>
+      <example>
+	<title>Using &man.id.1; to Determine Group Membership</title>
 
-      <screen>&prompt.user; <userinput>id jru</userinput>
+	<screen>&prompt.user; <userinput>id jru</userinput>
 uid=1001(jru) gid=1001(jru) groups=1001(jru), 1100(teamtwo)</screen>
       </example>
 
-      <para>In this example, <systemitem class="username">jru</systemitem> is a member of
+      <para>In this example,
+	<systemitem class="username">jru</systemitem> is a member of
 	the groups <systemitem class="groupname">jru</systemitem> and
 	<systemitem class="groupname">teamtwo</systemitem>.</para>
 
@@ -1320,7 +1419,9 @@ uid=1001(jru) gid=1001(jru) groups=1001(jru), 1100(teamtwo)</screen>
   <sect1 xml:id="permissions">
     <title>Permissions</title>
 
-    <indexterm><primary>UNIX</primary></indexterm>
+    <indexterm>
+      <primary>UNIX</primary>
+    </indexterm>
 
     <para>In &os;, every file and directory has an associated set of
       permissions and several utilities are available for viewing
@@ -1354,10 +1455,13 @@ uid=1001(jru) gid=1001(jru) groups=1001(jru), 1100(teamtwo)</screen>
 	Listing</quote> column, a <literal>-</literal> is used to
       represent a permission that is set to off.</para>
 
-    <indexterm><primary>permissions</primary></indexterm>
+    <indexterm>
+      <primary>permissions</primary>
+    </indexterm>
     <indexterm>
       <primary>file permissions</primary>
     </indexterm>
+
     <table frame="none" pgwide="1">
       <title>&unix; Permissions</title>
 
@@ -1425,7 +1529,9 @@ uid=1001(jru) gid=1001(jru) groups=1001(jru), 1100(teamtwo)</screen>
     <indexterm>
       <primary>&man.ls.1;</primary>
     </indexterm>
-    <indexterm><primary>directories</primary></indexterm>
+    <indexterm>
+      <primary>directories</primary>
+    </indexterm>
 
     <para>Use the <option>-l</option> argument to &man.ls.1; to view a
       long directory listing that includes a column of information
@@ -1482,14 +1588,20 @@ total 530
       to set them, refer to &man.chmod.1;.</para>
 
     <sect2>
-      <info><title>Symbolic Permissions</title>
+      <info>
+	<title>Symbolic Permissions</title>
+
 	<authorgroup>
-	  <author><personname><firstname>Tom</firstname><surname>Rhodes</surname></personname><contrib>Contributed by </contrib></author>
+	  <author>
+	    <personname>
+	      <firstname>Tom</firstname>
+	      <surname>Rhodes</surname>
+	    </personname>
+	    <contrib>Contributed by </contrib>
+	  </author>
 	</authorgroup>
       </info>
 
-      
-
       <indexterm>
 	<primary>permissions</primary>
 	<secondary>symbolic</secondary>
@@ -1611,18 +1723,25 @@ total 530
     </sect2>
 
     <sect2>
-      <info><title>&os; File Flags</title>
+      <info>
+	<title>&os; File Flags</title>
+
 	<authorgroup>
-	  <author><personname><firstname>Tom</firstname><surname>Rhodes</surname></personname><contrib>Contributed by </contrib></author>
+	  <author>
+	    <personname>
+	      <firstname>Tom</firstname>
+	      <surname>Rhodes</surname>
+	    </personname>
+	    <contrib>Contributed by </contrib>
+	  </author>
 	</authorgroup>
       </info>
 
-      
-
       <para>In addition to file permissions, &os; supports the use of
 	<quote>file flags</quote>.  These flags add an additional
 	level of security and control over files, but not directories.
-	With file flags, even <systemitem class="username">root</systemitem> can be
+	With file flags, even
+	<systemitem class="username">root</systemitem> can be
 	prevented from removing or altering files.</para>
 
       <para>File flags are modified using &man.chflags.1;.  For
@@ -1646,21 +1765,29 @@ total 530
       <programlisting>-rw-r--r--  1 trhodes  trhodes  sunlnk 0 Mar  1 05:54 file1</programlisting>
 
       <para>Several file flags may only be added or removed by the
-	<systemitem class="username">root</systemitem> user.  In other cases, the file
-	owner may set its file flags.  Refer to &man.chflags.1; and
-	&man.chflags.2; for more information.</para>
+	<systemitem class="username">root</systemitem> user.  In other
+	cases, the file owner may set its file flags.  Refer to
+	&man.chflags.1; and &man.chflags.2; for more
+	information.</para>
     </sect2>
 
     <sect2>
-      <info><title>The <literal>setuid</literal>, <literal>setgid</literal>,
-	and <literal>sticky</literal> Permissions</title>
+      <info>
+	<title>The <literal>setuid</literal>,
+	  <literal>setgid</literal>, and <literal>sticky</literal>
+	  Permissions</title>
+
 	<authorgroup>
-	  <author><personname><firstname>Tom</firstname><surname>Rhodes</surname></personname><contrib>Contributed by </contrib></author>
+	  <author>
+	    <personname>
+	      <firstname>Tom</firstname>
+	      <surname>Rhodes</surname>
+	    </personname>
+	    <contrib>Contributed by </contrib>
+	  </author>
 	</authorgroup>
       </info>
 
-      
-
       <para>Other than the permissions already discussed, there are
 	three other specific settings that all administrators should
 	know about.  They are the <literal>setuid</literal>,
@@ -1678,8 +1805,8 @@ total 530
 	&man.passwd.1; runs with the real user ID when a user changes
 	their password.  However, in order to update the password
 	database, the command runs as the effective ID of the
-	<systemitem class="username">root</systemitem> user.  This allows users to change
-	their passwords without seeing a
+	<systemitem class="username">root</systemitem> user.  This
+	allows users to change their passwords without seeing a
 	<errorname>Permission Denied</errorname> error.</para>
 
       <para>The setuid permission may be set by prefixing a permission
@@ -1784,7 +1911,9 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
   <sect1 xml:id="dirstructure">
     <title>Directory Structure</title>
 
-    <indexterm><primary>directory hierarchy</primary></indexterm>
+    <indexterm>
+      <primary>directory hierarchy</primary>
+    </indexterm>
 
     <para>The &os; directory hierarchy is fundamental to obtaining
       an overall understanding of the system.  The most important
@@ -1797,19 +1926,18 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
     <para>A mount point is a directory where additional file systems
       can be grafted onto a parent file system (usually the root file
-      system).  This is further described in <xref linkend="disk-organization"/>.  Standard mount points
-      include <filename>/usr/</filename>,
-      <filename>/var/</filename>,
-      <filename>/tmp/</filename>,
-      <filename>/mnt/</filename>, and
-      <filename>/cdrom/</filename>.  These
-      directories are usually referenced to entries in
-      <filename>/etc/fstab</filename>.  This file is a table of
-      various file systems and mount points and is read by the system.
-      Most of the file systems in <filename>/etc/fstab</filename> are
-      mounted automatically at boot time from the script &man.rc.8;
-      unless their entry includes <option>noauto</option>.  Details
-      can be found in <xref linkend="disks-fstab"/>.</para>
+      system).  This is further described in
+      <xref linkend="disk-organization"/>.  Standard mount points
+      include <filename>/usr/</filename>, <filename>/var/</filename>,
+      <filename>/tmp/</filename>, <filename>/mnt/</filename>, and
+      <filename>/cdrom/</filename>.  These directories are usually
+      referenced to entries in <filename>/etc/fstab</filename>.  This
+      file is a table of various file systems and mount points and is
+      read by the system.  Most of the file systems in
+      <filename>/etc/fstab</filename> are mounted automatically at
+      boot time from the script &man.rc.8; unless their entry includes
+      <option>noauto</option>.  Details can be found in
+      <xref linkend="disks-fstab"/>.</para>
 
     <para>A complete description of the file system hierarchy is
       available in &man.hier.7;.  The following table provides a brief
@@ -1908,7 +2036,8 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
 	    <row>
 	      <entry><filename>/root/</filename></entry>
-	      <entry>Home directory for the <systemitem class="username">root</systemitem>
+	      <entry>Home directory for the
+		<systemitem class="username">root</systemitem>
 		account.</entry>
 	    </row>
 
@@ -1924,11 +2053,10 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 	      <entry>Temporary files which are usually
 		<emphasis>not</emphasis> preserved across a system
 		reboot.  A memory-based file system is often mounted
-		at <filename>/tmp</filename>.  This
-		can be automated using the tmpmfs-related variables of
-		&man.rc.conf.5; or with an entry in
-		<filename>/etc/fstab</filename>; refer to
-		&man.mdmfs.8; for details.</entry>
+		at <filename>/tmp</filename>.  This can be automated
+		using the tmpmfs-related variables of &man.rc.conf.5;
+		or with an entry in <filename>/etc/fstab</filename>;
+		refer to &man.mdmfs.8; for details.</entry>
 	    </row>
 
 	    <row>
@@ -1969,13 +2097,14 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 	      <entry><filename>/usr/local/</filename></entry>
 	      <entry>Local executables and libraries.  Also used as
 		the default destination for the &os; ports framework.
-		Within <filename>/usr/local</filename>, the
-		general layout sketched out by &man.hier.7; for
-		<filename>/usr</filename> should be
-		used.  Exceptions are the man directory, which is
-		directly under <filename>/usr/local</filename>
-		rather than under <filename>/usr/local/share</filename>,
-		and the ports documentation is in <filename>share/doc/port</filename>.</entry>
+		Within <filename>/usr/local</filename>, the general
+		layout sketched out by &man.hier.7; for
+		<filename>/usr</filename> should be used.  Exceptions
+		are the man directory, which is directly under
+		<filename>/usr/local</filename> rather than under
+		<filename>/usr/local/share</filename>, and the ports
+		documentation is in
+		<filename>share/doc/port</filename>.</entry>
 	    </row>
 
 	    <row>
@@ -2364,9 +2493,15 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
       are then divided into partitions, which contain file systems,
       and are labeled using letters.</para>
 
-    <indexterm><primary>slices</primary></indexterm>
-    <indexterm><primary>partitions</primary></indexterm>
-    <indexterm><primary>dangerously dedicated</primary></indexterm>
+    <indexterm>
+      <primary>slices</primary>
+    </indexterm>
+    <indexterm>
+      <primary>partitions</primary>
+    </indexterm>
+    <indexterm>
+      <primary>dangerously dedicated</primary>
+    </indexterm>
 
     <para>Slice numbers follow the device name, prefixed with an
       <literal>s</literal>, starting at 1.  So
@@ -2555,7 +2690,10 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
       <filename>/usr/local</filename>, and so
       on.</para>
 
-    <indexterm><primary>root file system</primary></indexterm>
+    <indexterm>
+      <primary>root file system</primary>
+    </indexterm>
+
     <para>There are various reasons to house some of these
       directories on separate file systems.
       <filename>/var</filename> contains the
@@ -2963,8 +3101,8 @@ Swap: 2048M Total, 2048M Free
 	documentation.  A user can only send a signal to a process
 	they own and sending a signal to someone else's process will
 	result in a permission denied error.  The exception is the
-	<systemitem class="username">root</systemitem> user, who can send signals to
-	anyone's processes.</para>
+	<systemitem class="username">root</systemitem> user, who can
+	send signals to anyone's processes.</para>
 
       <para>The operating system can also send a signal to a process.
 	If an application is badly written and tries to access memory
@@ -2988,15 +3126,14 @@ Swap: 2048M Total, 2048M Free
       <para><literal>SIGKILL</literal> can not be ignored by a
 	process.  Sending a <literal>SIGKILL</literal> to a
 	process will usually stop that process there and then.
-	<footnote>
-	<para>There are a few tasks that can not be interrupted.  For
-	  example, if the process is trying to read from a file that
-	  is on another computer on the network, and the other
-	  computer is unavailable, the process is said to be
-	  <quote>uninterruptible</quote>.  Eventually the process will
-	  time out, typically after two minutes.  As soon as this time
-	  out occurs the process will be killed.</para>
-	</footnote>.</para>
+	<footnote><para>There are a few tasks that can not be
+	    interrupted.  For example, if the process is trying to
+	    read from a file that is on another computer on the
+	    network, and the other computer is unavailable, the
+	    process is said to be <quote>uninterruptible</quote>.
+	    Eventually the process will time out, typically after two
+	    minutes.  As soon as this time out occurs the process will
+	    be killed.</para></footnote>.</para>
 
       <para>Other commonly used signals are <literal>SIGHUP</literal>,
 	<literal>SIGUSR1</literal>, and <literal>SIGUSR2</literal>.
@@ -3034,8 +3171,10 @@ Swap: 2048M Total, 2048M Free
 
 	<step>
 	  <para>Use &man.kill.1; to send the signal.  Because
-	    &man.inetd.8; is owned by <systemitem class="username">root</systemitem>, use
-	    &man.su.1; to become <systemitem class="username">root</systemitem>
+	    &man.inetd.8; is owned by
+	    <systemitem class="username">root</systemitem>, use
+	    &man.su.1; to become
+	    <systemitem class="username">root</systemitem>
 	    first.</para>
 
 	  <screen>&prompt.user; <userinput>su</userinput>
@@ -3088,8 +3227,12 @@ Swap: 2048M Total, 2048M Free
   <sect1 xml:id="shells">
     <title>Shells</title>
 
-    <indexterm><primary>shells</primary></indexterm>
-    <indexterm><primary>command line</primary></indexterm>
+    <indexterm>
+      <primary>shells</primary>
+    </indexterm>
+    <indexterm>
+      <primary>command line</primary>
+    </indexterm>
 
     <para>A <firstterm>shell</firstterm> provides a command line
       interface for interacting with the operating system.  A shell
@@ -3111,31 +3254,35 @@ Swap: 2048M Total, 2048M Free
 
     <para>One common shell feature is filename completion.  After a
       user types the first few letters of a command or filename and
-      presses <keycap>Tab</keycap>, the shell completes
-      the rest of the command or filename.  Consider two files called
+      presses <keycap>Tab</keycap>, the shell completes the rest of
+      the command or filename.  Consider two files called
       <filename>foobar</filename> and <filename>football</filename>.
-      To delete <filename>foobar</filename>, the user might type <command>rm
-	foo</command> and press <keycap>Tab</keycap> to complete the filename.</para>
+      To delete <filename>foobar</filename>, the user might type
+      <command>rm foo</command> and press <keycap>Tab</keycap> to
+      complete the filename.</para>
 
-    <para>But the shell only shows
-      <command>rm foo</command>.
-      It was unable to complete the filename because
-      both <filename>foobar</filename> and
-      <filename>football</filename> start with <literal>foo</literal>.
-      Some shells sound a beep or show all the choices if more than one name matches.
-      The user must then type more characters to identify  the desired filename.  Typing a <literal>t</literal> and pressing
-      <keycap>Tab</keycap> again is enough to let the shell determine which filename is desired and fill in the
-      rest.</para>
+    <para>But the shell only shows <command>rm foo</command>.  It was
+      unable to complete the filename because both
+      <filename>foobar</filename> and <filename>football</filename>
+      start with <literal>foo</literal>.  Some shells sound a beep or
+      show all the choices if more than one name matches.  The user
+      must then type more characters to identify the desired filename.
+      Typing a <literal>t</literal> and pressing <keycap>Tab</keycap>
+      again is enough to let the shell determine which filename is
+      desired and fill in the rest.</para>
 
-    <indexterm><primary>environment variables</primary></indexterm>
+    <indexterm>
+      <primary>environment variables</primary>
+    </indexterm>
 
     <para>Another feature of the shell is the use of environment
       variables.  Environment variables are a variable/key pair stored
       in the shell's environment.  This environment can be read by any
       program invoked by the shell, and thus contains a lot of program
-      configuration.  <xref linkend="shell-env-vars"/> provides a list of common environment
-      variables and their meanings.  Note that the names of
-      environment variables are always in uppercase.</para>
+      configuration.  <xref linkend="shell-env-vars"/> provides a list
+      of common environment variables and their meanings.  Note that
+      the names of environment variables are always in
+      uppercase.</para>
 
     <table xml:id="shell-env-vars" frame="none" pgwide="1">
       <title>Common Environment Variables</title>
@@ -3216,7 +3363,9 @@ Swap: 2048M Total, 2048M Free
       </tgroup>
     </table>
 
-    <indexterm><primary>Bourne shells</primary></indexterm>
+    <indexterm>
+      <primary>Bourne shells</primary>
+    </indexterm>
 
     <para>How to set an environment variable differs between shells.
       In &man.tcsh.1; and &man.csh.1;, use
@@ -3291,8 +3440,12 @@ Swap: 2048M Total, 2048M Free
   <sect1 xml:id="editors">
     <title>Text Editors</title>
 
-    <indexterm><primary>text editors</primary></indexterm>
-    <indexterm><primary>editors</primary></indexterm>
+    <indexterm>
+      <primary>text editors</primary>
+    </indexterm>
+    <indexterm>
+      <primary>editors</primary>
+    </indexterm>
 
     <para>Most &os; configuration is done by editing text files.
       Because of this, it is a good idea to become familiar with a
@@ -3315,11 +3468,13 @@ Swap: 2048M Total, 2048M Free
       manipulating the editor's functions are listed at the top of the
       display.  The caret (<literal>^</literal>) represents
       <keycap>Ctrl</keycap>, so <literal>^e</literal> expands to
-      <keycombo action="simul"><keycap>Ctrl</keycap><keycap>e</keycap></keycombo>.
-      To leave &man.ee.1;, press <keycap>Esc</keycap>, then choose the
-      <quote>leave editor</quote> option from the main menu.  The
-      editor will prompt to save any changes if the file has been
-      modified.</para>
+      <keycombo action="simul">
+	<keycap>Ctrl</keycap>
+	<keycap>e</keycap>
+      </keycombo>.  To leave &man.ee.1;, press <keycap>Esc</keycap>,
+      then choose the <quote>leave editor</quote> option from the main
+      menu.  The editor will prompt to save any changes if the file
+      has been modified.</para>
 
     <indexterm>
       <primary><command>vi</command></primary>
@@ -3370,7 +3525,9 @@ Swap: 2048M Total, 2048M Free
   <sect1 xml:id="basics-more-information">
     <title>Manual Pages</title>
 
-    <indexterm><primary>manual pages</primary></indexterm>
+    <indexterm>
+      <primary>manual pages</primary>
+    </indexterm>
 
     <para>The most comprehensive documentation on &os; is in the form
       of manual pages.  Nearly every program on the system comes with
@@ -3452,7 +3609,8 @@ Swap: 2048M Total, 2048M Free
       keyword <quote>mail</quote> in their descriptions.  This is
       equivalent to using &man.apropos.1;.</para>
 
-    <para>To read the descriptions for the commands in <filename>/usr/bin</filename>, type:</para>
+    <para>To read the descriptions for the commands in
+      <filename>/usr/bin</filename>, type:</para>
 
     <screen>&prompt.user; <userinput>cd /usr/bin</userinput>
 &prompt.user; <userinput>man -f * | more</userinput></screen>
@@ -3473,8 +3631,9 @@ Swap: 2048M Total, 2048M Free
 	the Free Software Foundation (FSF).  In addition to manual
 	pages, these programs may include hypertext documents called
 	<literal>info</literal> files.  These can be viewed using
-	&man.info.1; or, if <package>editors/emacs</package> is installed, the
-	info mode of <application>emacs</application>.</para>
+	&man.info.1; or, if <package>editors/emacs</package> is
+	installed, the info mode of
+	<application>emacs</application>.</para>
 
       <para>To use &man.info.1;, type:</para>