Clean up the worst of the whitespace nastiness caused by revision 1.135.

This commit is contained in:
Ceri Davies 2004-09-10 19:26:20 +00:00
parent 87ea558ada
commit fc0aa32ad8
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=22301

View file

@ -378,7 +378,8 @@
<primary><filename class="directory">/boot/kernel.old</filename></primary>
</indexterm>
<para>The new kernel will be copied to the <filename class="directory">/boot/kernel</filename> directory as
<para>The new kernel will be copied to the <filename
class="directory">/boot/kernel</filename> directory as
<filename>/boot/kernel/kernel</filename> and the old kernel will be moved to
<filename>/boot/kernel.old/kernel</filename>. Now, shutdown the system and
reboot to use your new kernel. If something goes wrong, there are
@ -389,7 +390,8 @@
<note>
<para>In &os; 4.X and earlier, kernels are installed
in <filename>/kernel</filename>, modules in <filename class="directory">/modules</filename>, and old kernels
in <filename>/kernel</filename>, modules in <filename
class="directory">/modules</filename>, and old kernels
are backed up in <filename>/kernel.old</filename>.
Other files relating to the boot process, such as the boot
&man.loader.8; and configuration are stored in
@ -405,8 +407,8 @@
<para>If you have added any new devices (such as sound cards)
and you are running &os;&nbsp;4.X or previous versions, you
may have to add some device nodes to your
<filename class="directory">/dev</filename> directory before you can use
them. For more information, take a look at <link
<filename class="directory">/dev</filename> directory before
you can use them. For more information, take a look at <link
linkend="kernelconfig-nodes">Making Device Nodes</link>
section later on in this chapter.</para>
</note>
@ -490,8 +492,8 @@
<para>The following is an example of the <filename>GENERIC</filename> kernel
configuration file with various additional comments where needed for
clarity. This example should match your copy in
<filename>/usr/src/sys/<replaceable>i386</replaceable>/conf/GENERIC</filename> fairly
closely.</para>
<filename>/usr/src/sys/<replaceable>i386</replaceable>/conf/GENERIC</filename>
fairly closely.</para>
<programlisting>#
# GENERIC -- Generic kernel configuration file for &os;/i386
@ -679,7 +681,8 @@ device loop # Network loopback</programlisting>
<filename>device.hints</filename> file in
<filename>/boot</filename>.</para>
<!-- XXX: Add a comment here that explains when compiling hints into the kernel is a good idea and why. -->
<!-- XXX: Add a comment here that explains when compiling hints into
the kernel is a good idea and why. -->
<programlisting>#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols</programlisting>
@ -692,7 +695,8 @@ device loop # Network loopback</programlisting>
use of the <option>-g</option> option which enables debugging
information when passed to &man.gcc.1;. The same can be
accomplished by the &man.config.8; <option>-g</option> option, if
you are using the <quote>traditional</quote> way for building your kernels (see <xref linkend="kernelconfig-building">
you are using the <quote>traditional</quote> way for building your
kernels (see <xref linkend="kernelconfig-building">
for more information).</para>
<programlisting>options SCHED_4BSD # 4BSD scheduler</programlisting>
@ -723,8 +727,9 @@ device loop # Network loopback</programlisting>
<para>This option, present only in &os;&nbsp;5.X, enables kernel support
for access control lists. This relies on the use of extended
attributes and <acronym>UFS2</acronym>, and the feature is described in detail
in <xref linkend="fs-acl">. <acronym>ACL</acronym>s are enabled by default and should not be
attributes and <acronym>UFS2</acronym>, and the feature is described
in detail in <xref linkend="fs-acl">. <acronym>ACL</acronym>s are
enabled by default and should not be
disabled in the kernel if they have been used previously on a file
system, as this will remove the access control lists, changing the
way files are protected in unpredictable ways.</para>
@ -802,7 +807,8 @@ options NFS_ROOT # NFS usable as /, requires NFSCLIENT</progra
is not required under most circumstances, as most
debugging and monitoring tools have been adapted to run without
<literal>PROCFS</literal>: unlike in &os; 4.X, new installations of
&os; 5.X will not mount the process file system by default. In addition, 6.X-CURRENT kernels
&os; 5.X will not mount the process file system by default.
In addition, 6.X-CURRENT kernels
making use of <literal>PROCFS</literal> must now also include
support for <literal>PSEUDOFS</literal>:</para>
@ -858,12 +864,12 @@ options NFS_ROOT # NFS usable as /, requires NFSCLIENT</progra
<programlisting>options SYSVMSG # SYSV-style message queues</programlisting>
<para>Support for System V messages. Again, this option only adds a few hundred
bytes to the kernel.</para>
<para>Support for System V messages. Again, this option only adds
a few hundred bytes to the kernel.</para>
<note>
<para>The <option>-p</option> option of the &man.ipcs.1; command will list any processes using each of
these System V facilities.</para>
<para>The <option>-p</option> option of the &man.ipcs.1; command will
list any processes using each of these System V facilities.</para>
</note>
<programlisting>options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions</programlisting>
@ -1130,25 +1136,29 @@ device cardbus # CardBus (32-bit) bus</programlisting>
<programlisting># Serial (COM) ports
device sio # 8250, 16[45]50 based serial ports</programlisting>
<para>These are the serial ports referred to as <devicename>COM</devicename> ports
in the &ms-dos;/&windows; world.</para>
<para>These are the serial ports referred to as
<devicename>COM</devicename> ports in the &ms-dos;/&windows;
world.</para>
<note>
<para>If you have an internal modem on <devicename>COM4</devicename> and a serial port at
<devicename>COM2</devicename>, you will have to change the IRQ of the modem to 2 (for
obscure technical reasons, IRQ2 = IRQ 9) in order to access it
<para>If you have an internal modem on <devicename>COM4</devicename>
and a serial port at <devicename>COM2</devicename>, you will have
to change the IRQ of the modem to 2 (for obscure technical reasons,
IRQ2 = IRQ 9) in order to access it
from &os;. If you have a multiport serial card, check the
manual page for &man.sio.4; for more information on the proper
values to add to your <filename>/boot/device.hints</filename>. Some video cards (notably those based on
values to add to your <filename>/boot/device.hints</filename>.
Some video cards (notably those based on
S3 chips) use IO addresses in the form of
<literal>0x*2e8</literal>, and since many cheap serial cards do
not fully decode the 16-bit IO address space, they clash with
these cards making the <devicename>COM4</devicename> port practically unavailable.</para>
these cards making the <devicename>COM4</devicename> port
practically unavailable.</para>
<para>Each serial port is required to have a unique IRQ (unless you
are using one of the multiport cards where shared interrupts are
supported), so the default IRQs for <devicename>COM3</devicename> and <devicename>COM4</devicename> cannot be
used.</para>
supported), so the default IRQs for <devicename>COM3</devicename>
and <devicename>COM4</devicename> cannot be used.</para>
</note>
<programlisting># Parallel port
@ -1187,9 +1197,9 @@ device ppc</programlisting>
<programlisting>#device puc</programlisting>
<para>Uncomment this device if you have a <quote>dumb</quote> serial or
parallel PCI card that is supported by the &man.puc.4 glue driver.
</para>
<para>Uncomment this device if you have a <quote>dumb</quote> serial
or parallel PCI card that is supported by the &man.puc.4 glue
driver.</para>
<programlisting># PCI Ethernet NICs.
device de # DEC/Intel DC21x4x (<quote>Tulip</quote>)
@ -1322,7 +1332,8 @@ device pty # Pseudo-ttys (telnet etc)</programlisting>
<note><para>Under &os;&nbsp;4.X, you
have to use the line <literal>pseudo-device pty
<replaceable>number</replaceable></literal>. The
<replaceable>number</replaceable> after <literal>pty</literal> indicates the number of
<replaceable>number</replaceable> after <literal>pty</literal>
indicates the number of
<literal>pty</literal>s to create. If you need more than the
default of 16 simultaneous <application>xterm</application> windows
and/or remote logins, be sure to increase this number accordingly,
@ -1340,8 +1351,7 @@ device pty # Pseudo-ttys (telnet etc)</programlisting>
&os;&nbsp;4.4 the <literal>gif</literal> device is
<quote>auto-cloning</quote>, and you should use the line
<literal>pseudo-device gif</literal>.
Earlier versions of
&os;&nbsp;4.X require a number, for example
Earlier versions of &os;&nbsp;4.X require a number, for example
<literal>pseudo-device gif 4</literal>.</para>
<programlisting>device faith # IPv6-to-IPv4 relaying (translation)</programlisting>
@ -1510,7 +1520,8 @@ device fwe # Ethernet over FireWire (non-standard!)</programl
<para><emphasis>If you are running &os;&nbsp;5.0 or later
you can safely skip this section. These versions use
&man.devfs.5; to allocate device nodes transparently for the user.</emphasis></para>
&man.devfs.5; to allocate device nodes transparently for
the user.</emphasis></para>
<para>Almost every device in the kernel has a corresponding
<quote>node</quote> entry in the <filename>/dev</filename> directory.
@ -1668,7 +1679,8 @@ device fwe # Ethernet over FireWire (non-standard!)</programl
new kernel, <filename>kernel.old</filename> is overwritten
with the last installed kernel which may be non-functional.
Also, as soon as possible, move the working kernel to the
proper <filename class="directory">/boot/kernel</filename> location or commands such
proper <filename class="directory">/boot/kernel</filename>
location or commands such
as &man.ps.1; may not work properly. To do this, simply
rename the directory containing the good kernel:</para>
@ -1710,8 +1722,7 @@ device fwe # Ethernet over FireWire (non-standard!)</programl
commands like &man.ps.1; and &man.vmstat.8; will not work any
more. You should <xref linkend="makeworld">recompile and install
a world built with the same version of the source tree as
your kernel.
This is one reason it is
your kernel. This is one reason it is
not normally a good idea to use a different version of the
kernel from the rest of the operating system.</para>
</listitem>