Userguide Docs Patch

Tim Wickberg me at k9mach3.org
Sun Jul 4 21:15:50 PDT 2004


Patch to the DragonFlyBSD userguide.
Lots of:
	- FreeBSD -> &os;
	- Removal of FreeBSD-5 only stuff
	- Fix all build errors.
	- Other fixes
Patch is relative to one level above doc/ .

P.S. to Matt: The docs collection does not seem to be availible for 
download via cvsup ("cvs-doc"), making it harder to work on.

-- Tim Wickberg
   me at xxxxxxxxxxx
diff -ur olddoc/en/books/usersguide/disks/chapter.sgml doc/en/books/usersguide/disks/chapter.sgml
--- olddoc/en/books/usersguide/disks/chapter.sgml	2004-06-14 15:39:52.000000000 -0400
+++ doc/en/books/usersguide/disks/chapter.sgml	2004-06-29 16:01:35.000000000 -0400
@@ -11,13 +11,13 @@
     <title>Synopsis</title>
 
 
-    <para>This chapter covers the use of disks in FreeBSD.  This
+    <para>This chapter covers the use of disks in &os;.  This
       includes memory-backed disks, network-attached disks, and
       standard SCSI/IDE storage devices.</para>
 
     <para>After reading this chapter, you will know:</para>
     <itemizedlist>
-      <listitem><para>The terminology FreeBSD uses to describe the
+      <listitem><para>The terminology &os; uses to describe the
       organization of data on a physical disk (partitions and slices).</para>
       </listitem>
       <listitem><para>How to add additional hard disks to your system.</para>
@@ -52,7 +52,7 @@
     <title>Device Names</title>
 
     <para>The following is a list of physical storage devices
-      supported in FreeBSD, and the device names associated with
+      supported in &os;, and the device names associated with
       them.</para>
 
     <table id="disk-naming-physical-table">
@@ -83,21 +83,6 @@
 	    <entry><literal>cd</literal></entry>
 	  </row>
 	  <row>
-	    <entry>Assorted non-standard CDROM drives</entry>
-	    <entry><literal>mcd</literal> for Mitsumi CD-ROM,
-	      <literal>scd</literal> for Sony CD-ROM,
-	      <literal>matcd</literal> for Matsushita/Panasonic CD-ROM
-		<footnote>
-		  <para>The &man.matcd.4; driver has been removed
-		    in FreeBSD 4.X branch since October 5th,
-		    2002 and does not exist in FreeBSD 5.0 and
-		    5.1 releases.  However this driver is back in the
-		    FreeBSD 5.X branch since June 16th,
-		    2003.</para>
-		</footnote>
-	    </entry>
-	  </row>
-	  <row>
 	    <entry>Floppy drives</entry>
 	    <entry><literal>fd</literal></entry>
 	  </row>
@@ -167,16 +152,16 @@
       <primary><command>fdisk</command></primary>
     </indexterm>
 
-    <para>Because FreeBSD runs on IBM-PC compatible computers, it must
+    <para>Because &os; runs on IBM-PC compatible computers, it must
       take into account the PC BIOS partitions.  These are different
       from the traditional BSD partitions.  A PC disk has up to four
       BIOS partition entries.  If the disk is going to be truly
-      dedicated to FreeBSD, you can use the
-      <emphasis>dedicated</emphasis> mode.  Otherwise, FreeBSD will
-      have to live within one of the PC BIOS partitions.  FreeBSD
+      dedicated to &os;, you can use the
+      <emphasis>dedicated</emphasis> mode.  Otherwise, &os; will
+      have to live within one of the PC BIOS partitions.  &os;
       calls the PC BIOS partitions <emphasis>slices</emphasis> so as
       not to confuse them with traditional BSD partitions.  You may
-      also use slices on a disk that is dedicated to FreeBSD, but used
+      also use slices on a disk that is dedicated to &os;, but used
       in a computer that also has another operating system installed.
       This is to not confuse the <command>fdisk</command> utility of
       the other operating system.</para>
@@ -199,19 +184,6 @@
       </indexterm>
       <procedure>
 	<step>
-	  <title>Navigating <application>Sysinstall</application></title>
-
-	  <para>You may use <command>/stand/sysinstall</command> to
-	    partition and label a new disk using its easy to use menus.
-	    Either login as user <username>root</username> or use the
-	    <command>su</command> command.  Run
-	    <command>/stand/sysinstall</command> and enter the
-	    <literal>Configure</literal> menu.  Within the
-	    <literal>FreeBSD Configuration Menu</literal>, scroll down and
-	    select the <literal>Fdisk</literal> option.</para>
-	</step>
-
-	<step>
 	  <title><application>fdisk</application> Partition Editor</title>
 	  <para>Once inside <application>fdisk</application>, we can type <userinput>A</userinput> to
 	    use the entire disk for FreeBSD.  When asked if you want to
@@ -412,7 +384,7 @@
 ad2: 29333MB <WDC WD307AA> [59598/16/63] at ata1-master UDMA33
 ad3: 29333MB <WDC WD307AA> [59598/16/63] at ata1-slave UDMA33</programlisting>
 
- 	  <note><para>If FreeBSD does not detect all the disks, ensure
+ 	  <note><para>If &os; does not detect all the disks, ensure
  	    that you have jumpered them correctly.  Most IDE drives
  	    also have a <quote>Cable Select</quote> jumper.  This is
  	    <emphasis>not</emphasis> the jumper for the master/slave
@@ -509,12 +481,7 @@
 	    <devicename>ccd0c</devicename> may not exist yet, so to
 	    create it, perform the following commands:</para>
 
-	  <programlisting>cd /dev
-sh MAKEDEV ccd0</programlisting>
-
-	  <note><para>In FreeBSD 5.0, &man.devfs.5; will automatically
-	    manage device nodes in <filename>/dev</filename>, so use of
-	    <command>MAKEDEV</command> is not necessary.</para></note>
+	  <programlisting>cd /dev sh MAKEDEV ccd0</programlisting>
 
 	  <para>Now that you have all of the disks labeled, you must
 	    build the &man.ccd.4;.  To do that,
@@ -624,9 +591,9 @@
 	<secondary>hardware</secondary>
       </indexterm>
 
-      <para>FreeBSD also supports a variety of hardware <acronym>RAID</acronym>
+      <para>&os also supports a variety of hardware <acronym>RAID</acronym>
         controllers.  These devices control a <acronym>RAID</acronym> subsystem
-        without the need for FreeBSD specific software to manage the
+        without the need for &os; specific software to manage the
         array.</para>
 
       <para>Using an on-card <acronym>BIOS</acronym>, the card controls most  of the disk operations
@@ -635,7 +602,7 @@
 	displays a prompt requesting information.  Follow the instructions
 	to enter the card's setup screen.  From here, you have the ability to
 	combine all the attached drives.  After doing so, the disk(s) will look like
-	a single drive to FreeBSD.  Other <acronym>RAID</acronym> levels can be set up
+	a single drive to &os;.  Other <acronym>RAID</acronym> levels can be set up
 	accordingly.
       </para>
     </sect2>
@@ -643,7 +610,7 @@
     <sect2>
       <title>Rebuilding ATA RAID1 Arrays</title>
 
-      <para>FreeBSD allows you to hot-replace a failed disk in an array. This requires
+      <para>&os; allows you to hot-replace a failed disk in an array. This requires
 	that you catch it before you reboot.</para>
 
       <para>You will probably see something like the following in <filename>/var/log/messages</filename> or in the &man.dmesg.8;
@@ -845,10 +812,10 @@
 	<option>-hfs</option> can be used to create HFS file systems used
 	by &macos;.</para>
 
-      <para>For CDs that are going to be used only on FreeBSD systems,
+      <para>For CDs that are going to be used only on &os; systems,
 	<option>-U</option> can be used to disable all filename
 	restrictions. When used with <option>-R</option>, it produces a
-	file system image that is identical to the FreeBSD tree you started
+	file system image that is identical to the &os; tree you started
 	from, though it may violate the ISO 9660 standard in a number of
 	ways.</para>
 
@@ -1021,11 +988,6 @@
 
 	  <screen>&prompt.root; <userinput>cd /dev</userinput>
 &prompt.root; <userinput>sh MAKEDEV acd0t99</userinput></screen>
-
-	  <note><para>In FreeBSD 5.0, &man.devfs.5; will automatically
-	    create and manage entries in <filename>/dev</filename>
-	    for you, so it is not necessary to use
-	    <command>MAKEDEV</command>.</para></note>
 	</step>
 
 	<step>
@@ -1146,7 +1108,7 @@
 
       <para>You cannot mount this disk as you would a normal CDROM.
 	  Such a CDROM cannot be read under any operating system
-	  except FreeBSD.  If you want to be able to mount the CD, or
+	  except FreeBSD and &os;.  If you want to be able to mount the CD, or
 	  share data with another operating system, you must use
 	  <filename role="package">sysutils/mkisofs</filename> as described above.</para>
     </sect2>
@@ -1617,7 +1579,7 @@
       computer.</para>
 
     <para>This section will explain how to use floppy disks in
-      FreeBSD.  It will primarily cover formatting and usage of
+      &os;.  It will primarily cover formatting and usage of
       3.5inch DOS floppies, but the concepts are similar for other
       floppy disk formats.</para>
 
@@ -1629,8 +1591,7 @@
 
 	<para>Floppy disks are accessed through entries in
 	  <filename>/dev</filename>, just like other devices.  To
-	  access the raw floppy disk in 4.X and earlier releases, one
-	  uses
+	  access the raw floppy disk one uses
 	  <filename>/dev/fd<replaceable>N</replaceable></filename>,
 	  where <replaceable>N</replaceable> stands for the drive
 	  number, usually 0, or
@@ -1638,9 +1599,6 @@
 	  where <replaceable>X</replaceable> stands for a
 	  letter.</para>
 
-	<para>In 5.0 or newer releases, simply use
-	  <filename>/dev/fd<replaceable>N</replaceable></filename>.</para>
-
 	<sect4>
 	  <title>The Disk Size in 4.X and Earlier Releases</title>
 
@@ -1655,18 +1613,6 @@
 
 	  <screen>&prompt.root; <userinput>cd /dev && ./MAKEDEV "fd*"</userinput></screen>
 	</sect4>
-
-	<sect4>
-	  <title>The Disk Size in 5.0 and Newer Releases</title>
-
-	  <para>In 5.0, &man.devfs.5; will automatically
-	    manage device nodes in <filename>/dev</filename>, so use of
-	    <command>MAKEDEV</command> is not necessary.</para>
-	  
-	  <para>The desired disk size is passed to &man.fdformat.1; through
-	    the <option>-f</option> flag.  Supported sizes are listed in
-	  &man.fdcontrol.8;, but be advised that 1440kB is what works best.</para>
-	</sect4>
       </sect3>
 
       <sect3>
@@ -1696,23 +1642,9 @@
 	  <screen>&prompt.root; <userinput>/usr/sbin/fdformat /dev/fd0.1440</userinput></screen>
 
 	</sect4>
-
-	<sect4>
-	  <title>Formatting in 5.0 and Newer Releases</title>
-
-	  <para>Use the
-	    <filename>/dev/fd<replaceable>N</replaceable></filename>
-	    devices to format the floppy.  Insert a new 3.5inch floppy
-	    disk in your drive and issue:</para>
-
-	  <screen>&prompt.root; <userinput>/usr/sbin/fdformat -f 1440 /dev/fd0</userinput></screen>
-
-	</sect4>
       </sect3>
     </sect2>
 
-
-
     <sect2>
       <title>The Disk Label</title>
 
@@ -1763,9 +1695,8 @@
     <sect2>
       <title>Using the Floppy</title>
 
-      <para>To use the floppy, mount it with &man.mount.msdos.8; (in
-	4.X and earlier releases) or &man.mount.msdosfs.8; (in 5.0 or
-	newer releases).  One can also use
+      <para>To use the floppy, mount it with &man.mount.msdos.fix. 
+	One can also use
 	<filename role="package">emulators/mtools</filename> from the ports
 	collection.</para>
     </sect2>
diff -ur olddoc/en/books/usersguide/installation/chapter.sgml doc/en/books/usersguide/installation/chapter.sgml
--- olddoc/en/books/usersguide/installation/chapter.sgml	2004-06-01 16:00:04.000000000 -0400
+++ doc/en/books/usersguide/installation/chapter.sgml	2004-06-29 14:45:07.000000000 -0400
@@ -509,4 +509,4 @@
       </sect2>
   </sect1>
 
-</chapter>
\ No newline at end of file
+</chapter>
diff -ur olddoc/en/books/usersguide/kernelconfig/chapter.sgml doc/en/books/usersguide/kernelconfig/chapter.sgml
--- olddoc/en/books/usersguide/kernelconfig/chapter.sgml	2004-06-14 15:39:11.000000000 -0400
+++ doc/en/books/usersguide/kernelconfig/chapter.sgml	2004-06-29 23:26:14.000000000 -0400
@@ -24,7 +24,7 @@
     </authorgroup>
   </chapterinfo>
 
-  <title>Configuring the FreeBSD Kernel</title>
+  <title>Configuring the &os; Kernel</title>
 
   <sect1 id="kernelconfig-synopsis">
     <title>Synopsis</title>
@@ -152,9 +152,7 @@
       of the code is common to all platforms to which &os; could
       potentially be ported.  Notice the logical organization of the
       directory structure, with each supported device, file system, and
-      option in its own subdirectory.  &os; 5.X and up has support for
-      <filename>sparc64</filename>, and a few other architectures under
-      development.</para>
+      option in its own subdirectory. </para>
 
     <note>
       <para>If there is <emphasis>not</emphasis> a
@@ -199,7 +197,7 @@
 	you do that you realize that you have deleted your custom kernel
 	config file.  Do not edit <filename>GENERIC</filename>
 	directly, as it may get overwritten the next time you
-	<link linkend="cutting-edge">update your source tree</link>, and
+	update your source tree, and
 	your kernel modifications will be lost.</para>
 
       <para>You might want to keep your kernel config file elsewhere, and then
@@ -223,16 +221,15 @@
     <para>Now, edit <filename>MYKERNEL</filename> with your favorite text
       editor.  If you are just starting out, the only editor available
       will probably be <application>vi</application>, which is too complex to
-      explain here, but is covered well in many books in the <link
-      linkend="bibliography">bibliography</link>.  However, &os; does
+      explain here, but is covered well in many books in 
+      the bibliography.  However, &os; does
       offer an easier editor called <application>ee</application> which, if
       you are a beginner, should be your editor of choice.  Feel free to
       change the comment lines at the top to reflect your configuration or
       the changes you have made to differentiate it from
       <filename>GENERIC</filename>.</para>
-    <indexterm><primary>SunOS</primary></indexterm>
 
-    <para>If you have built a kernel under &sunos; or some other BSD
+    <para>If you have built a kernel under some other BSD
       operating system, much of this file will be very familiar to you.
       If you are coming from some other operating system such as DOS, on
       the other hand, the <filename>GENERIC</filename> configuration file
@@ -243,8 +240,7 @@
     <note>
       <para>Be sure to always check the file
         <filename>/usr/src/UPDATING</filename>, before you perform any update
-        steps, in the case you <link
-        linkend="cutting-edge">sync your source tree</link> with the
+        steps, in the case you sync your source tree with the
         latest sources of the &os; project.
         In this file all important issues with updating &os;
         are typed out.  <filename>/usr/src/UPDATING</filename> always fits
@@ -252,74 +248,10 @@
         for new information than the handbook.</para>
     </note>
 
-    <para>You must now compile the source code for the kernel.  There are two
-      procedures you can use to do this, and the one you will use depends on
-      why you are rebuilding the kernel, and the version of &os; you are
-      running.</para>
-
-    <itemizedlist>
-      <listitem>
-	<para>If you have installed <emphasis>only</emphasis> the kernel
-	  source code, use procedure 1.</para>
-      </listitem>
-
-      <listitem>
-	<para>If you are running a &os; version prior to 4.0, and you are
-	  <emphasis>not</emphasis> upgrading to &os; 4.0 or higher using
-	  the <maketarget>make world</maketarget> procedure, use procedure 1.
-        </para>
-      </listitem>
-
-      <listitem>
-	<para>If you are building a new kernel without updating the source
-	  code (perhaps just to add a new option, such as
-	  <literal>IPFIREWALL</literal>) you can use either procedure.</para>
-      </listitem>
-
-      <listitem>
-	<para>If you are rebuilding the kernel as part of a
-          <maketarget>make world</maketarget> process, use procedure 2.
-        </para>
-      </listitem>
-    </itemizedlist>
-    
-    <procedure>
-      <title>Procedure 1.  Building a Kernel the <quote>Traditional</quote> Way</title>
-      
-      <step>
-	<para>Run &man.config.8; to generate the kernel source code.</para>
-	
-	<screen>&prompt.root; <userinput>/usr/sbin/config <replaceable>MYKERNEL</replaceable></userinput></screen>
-      </step>
-
-      <step>
-	<para>Change into the build directory.  This is printed out after running the aforementioned
-	  command.</para>
-
-	<screen>&prompt.root; <userinput>cd ../compile/<replaceable>MYKERNEL</replaceable></userinput></screen>
-
-	<para>For &os; version prior to 5.0, use instead:</para>
-
-	<screen>&prompt.root; <userinput>cd ../../compile/<replaceable>MYKERNEL</replaceable></userinput></screen>
-      </step>
-
-      <step>
-	<para>Compile the kernel.</para>
-	
-	<screen>&prompt.root; <userinput>make depend</userinput>
-&prompt.root; <userinput>make</userinput></screen>
-      </step>
-
-      <step>
-	<para>Install the new kernel.</para>
-	
-	<screen>&prompt.root; <userinput>make install</userinput></screen>
-      </step>
-    </procedure>
+    <para>You must now compile the source code for the kernel.</para>
 
     <procedure>
-      <title>Procedure 2.  Building a Kernel the <quote>New</quote>
-	Way</title>
+      <title>Building a Kernel</title>
       
       <step>
 	<para>Change to the <filename>/usr/src</filename> directory.</para>
@@ -339,13 +271,6 @@
 	<screen>&prompt.root; <userinput>make installkernel KERNCONF=<replaceable>MYKERNEL</replaceable></userinput></screen>
       </step>
     </procedure>
-    
-    <note>
-      <para>In &os; 4.2 and older you must replace
-        <literal>KERNCONF=</literal> with <literal>KERNEL=</literal>.
-        4.2-STABLE that was fetched before Feb 2nd, 2001 does not
-        recognize <literal>KERNCONF=</literal>.</para>
-    </note>
 
     <indexterm>
       <primary><command>cvsup</command></primary>
@@ -395,9 +320,8 @@
     </note>
 
     <note>
-      <para>If you have added any new devices (such as sound cards)
-	and you are running &os; 4.X or previous versions, you
-	may have to add some device nodes to your
+      <para>If you have added any new devices (such as sound cards), 
+	you may have to add some device nodes to your
 	<filename>/dev</filename> directory before you can use
 	them. For more information, take a look at <link
 	linkend="kernelconfig-nodes">Making Device Nodes</link>
@@ -433,13 +357,6 @@
       to the purpose or necessity of a line, check first in
       <filename>LINT</filename>.</para>
 
-    <note><para>In &os; 5.X and above the <filename>LINT</filename> is
-      non-existent.  See the <filename>NOTES</filename> file for
-      architecture dependent options.  Some options, mainly
-      architecture independent ones, are stored in the
-      <filename>/usr/src/sys/conf/NOTES</filename> file.  It is
-      advisable to review the options in here also.</para></note>
-
     <indexterm>
       <primary>kernel</primary>
       <secondary>example config file</secondary>
@@ -522,7 +439,7 @@
       <listitem>
         <para>Build the userland and kernel on a newer machine and install on
           the 386 using the precompiled <filename>/usr/obj</filename>
-          files (see <xref linkend="small-lan"> for details).</para>
+          files.</para>
       </listitem>
 
       <listitem>
@@ -659,7 +576,8 @@
     <para>This line allows the kernel to simulate a math co-processor if
       your computer does not have one (386 or 486SX).  If you have a
       486DX, or a 386 or 486SX (with a separate 387 or 487 chip), or
-      higher (&pentium;, &pentium; II, etc.), you can comment this line
+      higher (Pentium, Pentium II, etc.), you can comment this 
+line
       out.</para>
 
     <note>
@@ -692,19 +610,6 @@
     <para>This is the basic hard drive Filesystem.  Leave it in if you
       boot from the hard disk.</para>
 
-    <note><para>In &os; 5.X, <literal>FFS_ROOT</literal> is no longer
-      required.</para></note>
-
-    <programlisting>options          UFS_ACL      #Support for access control lists</programlisting>
-
-    <para>This option, present only in &os; 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 the <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>
-
     <programlisting>options          UFS_DIRHASH  #Improve performance on big directories</programlisting>
 
     <para>This option includes functionality to speed up disk
@@ -744,12 +649,6 @@
     <para>Now you simply need to either reboot, or run the command
       <command>mount /tmp</command>.</para>
 
-    <note><para>In &os; 5.X, &man.md.4;-backed UFS file systems are
-      used for memory file systems rather than MFS.  Information on
-      configuring memory-backed file systems may be found in the manual pages
-      for &man.mdconfig.8; and &man.mdmfs.8;, and in <xref linkend="disks-virtual">.  As a result, the
-      <literal>MFS</literal> option is no longer supported.</para></note>
-
     <indexterm>
       <primary>kernel options</primary>
       <secondary>NFS</secondary>
@@ -771,7 +670,7 @@
     </indexterm>
     <programlisting>options          MSDOSFS      #MSDOS Filesystem</programlisting>
 
-    <para>The &ms-dos; Filesystem.  Unless you plan to mount a DOS formatted
+    <para>The MS-DOS Filesystem.  Unless you plan to mount a DOS formatted
       hard drive partition at boot time, you can safely comment this out.
       It will be automatically loaded the first time you mount a DOS
       partition, as described above.  Also, the excellent
@@ -793,33 +692,13 @@
     <para>The process filesystem.  This is a <quote>pretend</quote>
       filesystem mounted on <filename>/proc</filename> which allows
       programs like &man.ps.1; to give you more information on what
-      processes are running.  In &os; 5.X, use of <literal>PROCFS</literal>
-      is not required under most circumstances, as most
-      debugging and monitoring tools have been adapted to run without
-      <literal>PROCFS</literal>.  In addition, 5.X-CURRENT kernels
-      making use of <literal>PROCFS</literal> must now also include
-      support for <literal>PSEUDOFS</literal>:</para>
-
-    <programlisting>options          PSEUDOFS     #Pseudo-filesystem framework</programlisting>
-
-    <para><literal>PSEUDOFS</literal> is not available in &os; 4.X.
-      Unlike in &os; 4.X, new installations of &os; 5.X will not mount
-      the process file system by default.</para>
+      processes are running.</para>
 
     <programlisting>options          COMPAT_43    #Compatible with BSD 4.3 [KEEP THIS!]</programlisting>
 
     <para>Compatibility with 4.3BSD.  Leave this in; some programs will
       act strangely if you comment this out.</para>
 
-    <programlisting>options          COMPAT_FREEBSD4     #Compatible with &os;4</programlisting>
-
-    <para>This option is required on &os; 5.X &i386; and Alpha systems
-      to support applications compiled on older versions of &os;
-      that use older system call interfaces.  It is recommended that
-      this option be used on all &i386; and Alpha systems that may
-      run older applications; platforms that gained support only in
-      5.X, such as ia64 and &sparc64;, do not require this option.</para>
-
     <programlisting>options          SCSI_DELAY=15000    #Delay (in ms) before probing SCSI</programlisting>
 
     <para>This causes the kernel to pause for 15 seconds before probing
@@ -838,9 +717,6 @@
       &man.talk.1;, and any other messages you receive, as well
       as any console messages sent by the kernel.</para>
 
-    <note><para>In &os; 5.X, <literal>UCONSOLE</literal> is no
-      longer required.</para></note>
-
     <programlisting>options          USERCONFIG          #boot -c editor</programlisting>
 
     <para>This option allows you to boot the configuration editor from the
@@ -851,11 +727,6 @@
     <para>This option allows you to boot the visual configuration editor
       from the boot menu.</para>
 
-      <note><para>From &os; versions 5.0 and later, the <literal>USERCONFIG</literal> options has
-	been deprecated in favor of the new &man.device.hints.5;
-	method.  For more information on &man.device.hints.5; please
-	visit <xref linkend="device-hints">.</para></note>
-
     <programlisting>options          KTRACE              #ktrace(1) support</programlisting>
 
     <para>This enables kernel process tracing, which is useful in
@@ -887,14 +758,8 @@
     <programlisting>options 	P1003_1B		#Posix P1003_1B real-time extensions
 options 	_KPOSIX_PRIORITY_SCHEDULING</programlisting>
 
-    <para>Real-time extensions added in the 1993 &posix;.  Certain
-      applications in the ports collection use these
-      (such as <application>&staroffice;</application>).</para>
-
-    <note><para>In &os; 5.X, all of this functionality is now
-      provided by the <literal>_KPOSIX_PRIORITY_SCHEDULING</literal>
-      option, and <literal>P1003_1B</literal> is no longer
-      required.</para></note>
+    <para>Real-time extensions added in the 1993 Posix specification. Certain
+      applications in the ports collection use these.</para>
 
     <indexterm>
       <primary>kernel options</primary>
@@ -909,10 +774,6 @@
       typically want this option as it will help protect the machine from
       denial of service packet attacks.</para>
 
-    <note><para>In &os; 5.X, this feature is enabled by default and
-      the <literal>ICMP_BANDLIM</literal> option is not required.
-      </para></note>
-
     <indexterm>
       <primary>kernel options</primary>
       <secondary>SMP</secondary>
@@ -1125,7 +986,7 @@
 device          sio3     at isa? disable port IO_COM4 irq 9</programlisting>
 
     <para>These are the four serial ports referred to as COM1 through COM4
-      in the &ms-dos/&windows; world.</para>
+      in the MS-DOS/Windows world.</para>
 
     <note>
       <para>If you have an internal modem on COM4 and a serial port at
@@ -1257,74 +1118,58 @@
       With &os; 4.X use the line <literal>pseudo-device
       sl</literal>.</para>
 
-    <programlisting>device   ppp     1     # Kernel PPP</programlisting>
+    <programlisting>pseudo-device   ppp     1       # Kernel PPP</programlisting>
 
     <para>This is for kernel PPP support for dial-up connections.  There
       is also a version of PPP implemented as a userland application that
       uses <literal>tun</literal> and offers more flexibility and features
       such as demand dialing.  The <replaceable>number</replaceable> after
       <literal>ppp</literal> specifies how many simultaneous PPP
-      connections to support.  With &os; 4.X use the line
-      <literal>pseudo-device ppp</literal>.</para>
+      connections to support.</para>
 
-    <programlisting>device   tun           # Packet tunnel.</programlisting>
+    <programlisting>pseudo-device   tun             # Packet tunnel.</programlisting>
 
     <para>This is used by the userland PPP software.  A
       <replaceable>number</replaceable> after <literal>tun</literal>
-      specifies the number of simultaneous PPP sessions to support.  See
-      the <link linkend="userppp">PPP</link> section of this book for more
-      information.  With &os; 4.X use the line <literal>pseudo-device
-      tun</literal>.</para>
+      specifies the number of simultaneous PPP sessions to support.</para>
 
     <programlisting><anchor id="kernelconfig-ptys">
-device   pty           # Pseudo-ttys (telnet etc)</programlisting>
+pseudo-device   pty           # Pseudo-ttys (telnet etc)</programlisting>
 
     <para>This is a <quote>pseudo-terminal</quote> or simulated login port.
       It is used by incoming <command>telnet</command> and
       <command>rlogin</command> sessions,
       <application>xterm</application>, and some other applications such
-      as <application>Emacs</application>.  Under &os; 4.X, you
-      have to use the line <literal>pseudo-device pty
-      <replaceable>number</replaceable></literal>.  The
+      as <application>Emacs</application>.   The
       <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,
       up to a maximum of 256.</para>
 
-    <programlisting>device   md            # Memory <quote>disks</quote></programlisting>
+    <programlisting>pseudo-device   md              # Memory <quote>disks</quote></programlisting>
 
-    <para>Memory disk pseudo-devices.  With &os; 4.X use the
-      line <literal>pseudo-device md</literal>.</para>
+    <para>Memory disk pseudo-devices.</para>
 
-    <programlisting>device   gif     # IPv6 and IPv4 tunneling</programlisting>
+    <programlisting>pseudo-device   gif     # IPv6 and IPv4 tunneling</programlisting>
 
     <para>This implements IPv6 over IPv4 tunneling, IPv4 over IPv6 tunneling,
-      IPv4 over IPv4 tunneling, and IPv6 over IPv6 tunneling.  Beginning with
-      &os; 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; 4.X require a number, for example
-      <literal>pseudo-device gif 4</literal>.</para>
+      IPv4 over IPv4 tunneling, and IPv6 over IPv6 tunneling.</para>
 
-    <programlisting>device   faith   # IPv6-to-IPv4 relaying (translation)</programlisting>
+    <programlisting>pseudo-device   faith   1       # IPv6-to-IPv4 relaying (translation)</programlisting>
 
     <para>This pseudo-device captures packets that are sent to it and
-      diverts them to the IPv4/IPv6 translation daemon.  With
-      &os; 4.X use the line
-      <literal>pseudo-device faith 1</literal>.</para>
+      diverts them to the IPv4/IPv6 translation daemon.</para>
 
     <programlisting># The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
-device   bpf           # Berkeley packet filter</programlisting>
+pseudo-device   bpf             #Berkeley packet filter</programlisting>
 
     <para>This is the Berkeley Packet Filter.  This pseudo-device allows
       network interfaces to be placed in promiscuous mode, capturing every
       packet on a broadcast network (e.g., an Ethernet).  These packets
       can be captured to disk and or examined with the &man.tcpdump.1;
-      program.  With &os; 4.X use the line
-      <literal>pseudo-device bpf</literal>.</para>
+      program.</para>
 
     <note>
       <para>The &man.bpf.4; device is also used by
@@ -1334,19 +1179,19 @@
     </note>
 
     <programlisting># USB support
-#device         uhci          # UHCI PCI->USB interface
-#device         ohci          # OHCI PCI->USB interface
-#device         usb           # USB Bus (required)
-#device         ugen          # Generic
-#device         uhid          # <quote>Human Interface Devices</quote>
-#device         ukbd          # Keyboard
-#device         ulpt          # Printer
-#device         umass         # Disks/Mass storage - Requires scbus and da
-#device         ums           # Mouse
+device         uhci          # UHCI PCI->USB interface
+device         ohci          # OHCI PCI->USB interface
+device         usb           # USB Bus (required)
+device         ugen          # Generic
+device         uhid          # <quote>Human Interface Devices</quote>
+device         ukbd          # Keyboard
+device         ulpt          # Printer
+device         umass         # Disks/Mass storage - Requires scbus and da
+device         ums           # Mouse
 # USB Ethernet, requires mii
-#device         aue           # ADMtek USB ethernet
-#device         cue           # CATC USB ethernet
-#device         kue           # Kawasaki LSI USB ethernet</programlisting>
+device         aue           # ADMtek USB ethernet
+device         cue           # CATC USB ethernet
+device         kue           # Kawasaki LSI USB ethernet</programlisting>
 
     <para>Support for various USB devices.</para>
 
@@ -1369,10 +1214,10 @@
 	  more than the 4 gigabyte limit on User+Kernel Virtual
 	  Address (<acronym>KVA</acronym>) space.  Due to this
 	  limitation, Intel added support for 36-bit physical address
-	  space access in the &pentium; Pro and later line of CPUs.</para>
+	  space access in the Pentium Pro and later line of CPUs.</para>
 	
 	<para>The Physical Address Extension (<acronym>PAE</acronym>)
-	  capability of the &intel; &pentium; Pro and later CPUs
+	  capability of the Intel Pentium Pro and later CPUs
 	  allows memory configurations of up to 64 gigabytes.
 	  &os; provides support for this capability via the
 	  <option>PAE</option> kernel configuration option, available
@@ -1391,7 +1236,7 @@
 
 	<note>
 	  <para>The <acronym>PAE</acronym> support in &os; is only
-	    available for &intel; IA-32 processors.  It should also be
+	    available for Intel IA-32 processors.  It should also be
 	    noted, that the <acronym>PAE</acronym> support in &os; has
 	    not received wide testing, and should be considered beta
 	    quality compared to other stable features of &os;.</para>
@@ -1460,10 +1305,6 @@
       <primary><command>MAKEDEV</command></primary>
     </indexterm>
 
-    <note><para>If you are running &os; 5.0 or later
-      you can safely skip this section.  These versions use
-      &man.devfs.5; to allocate device nodes transparently for the user.</para></note>
-
     <para>Almost every device in the kernel has a corresponding
       <quote>node</quote> entry in the <filename>/dev</filename> directory.
       These nodes look like regular files, but are actually special
@@ -1637,26 +1478,7 @@
 	      be moved or tampered with:</para>
 
 	    <screen>&prompt.root; <userinput>chflags schg /kernel</userinput></screen>
-
-	    <para>In &os; 5.X, kernels are not installed with the
-	    system immutable flag, so this is unlikely to be the source
-	    of the problem you are experiencing.</para></note>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>The kernel works, but &man.ps.1; does not work
-	  any more:</term>
-
-	<listitem>
-	  <para>If you have installed a different version of the kernel
-	    from the one that the system utilities have been built with,
-	    for example, a 4.X kernel on a 3.X system, many system-status
-	    commands like &man.ps.1; and &man.vmstat.8; will not work any
-	    more.  You must recompile the <filename>libkvm</filename>
-	    library as well as these utilities.  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>
+	  </note>
 	</listitem>
       </varlistentry>
     </variablelist>
Only in olddoc/en/books/usersguide/kernelconfig: freebsd.sgml
diff -ur olddoc/en/books/usersguide/multimedia/chapter.sgml doc/en/books/usersguide/multimedia/chapter.sgml
--- olddoc/en/books/usersguide/multimedia/chapter.sgml	2004-06-14 13:51:40.000000000 -0400
+++ doc/en/books/usersguide/multimedia/chapter.sgml	2004-06-29 23:25:41.000000000 -0400
@@ -37,8 +37,8 @@
       landscape in this area is changing rapidly.</para>
 
     <para>This chapter will describe the necessary steps to configure
-      your sound card.  The configuration and installation of <application>&xfree86;</application>
-      (<xref linkend="x11">) has already taken care of the
+      your sound card.  The configuration and installation of <application>XFree86</application>
+      has already taken care of the
       hardware issues for your video card, though there may be some
       tweaks to apply for better playback.</para>
 
@@ -64,7 +64,7 @@
       </listitem>
 
       <listitem>
-        <para>How video is supported by <application>&xfree86;</application>.</para>
+        <para>How video is supported by <application>XFree86</application>.</para>
       </listitem>
 
       <listitem>
@@ -91,12 +91,8 @@
         linkend="kernelconfig">).</para></listitem>
     </itemizedlist>
 
-    <para>For the video sections, it is assumed that <application>&xfree86; 4.X</application>
-      (<filename role='package'>x11/XFree86-4</filename>) has been
-      installed.  <application>&xfree86; 3.X</application> may work, but it has not been tested
-      with what is described in this chapter.  If you find that
-      something described here does work with <application>&xfree86; 3.X</application> please
-      let us know.</para>
+    <para>For the video sections, it is assumed that <application>XFree86 4.X</application>
+      (<filename role='package'>x11/XFree86-4</filename>) has been installed.</para>
 
     <warning>
       <para>Trying to mount audio CDs
@@ -161,7 +157,7 @@
       </listitem>
 
       <listitem>
-	<para>&soundblaster; Pro, 16, 32, AWE64, AWE128, Live</para>
+	<para>Soundblaster Pro, 16, 32, AWE64, AWE128, Live</para>
       </listitem>
 
       <listitem>
@@ -202,7 +198,7 @@
 
     <programlisting>snd_emu10k1_load="YES"</programlisting>
 
-    <para>These examples are for a Creative &soundblaster; Live! sound
+    <para>These examples are for a Creative Soundblaster Live! sound
       card.  Other available loadable sound modules are listed in
       <filename>/boot/defaults/loader.conf</filename>.</para>
 
@@ -365,7 +361,7 @@
 	<tbody>
 	  <row>
 	    <entry><devicename>/dev/audio</devicename></entry>
-	    <entry>&sparc; compatible audio device</entry>
+	    <entry>Sparc compatible audio device</entry>
 	  </row>
 
 	  <row>
@@ -544,7 +540,7 @@
     <sect2 id="mp3-players">
       <title>MP3 Players</title>
 
-      <para>By far, the most popular <application>&xfree86;</application> MP3 player is
+      <para>By far, the most popular <application>XFree86</application> MP3 player is
 	<application>XMMS</application> (X Multimedia System).  
 	<application>Winamp</application>
 	skins can be used with <application>XMMS</application> since the
@@ -630,8 +626,7 @@
       <screen>&prompt.root; <userinput>cdda2wav -D <replaceable>0,1,0</replaceable> -t 1+7</userinput></screen>
 
       <para>The utility &man.dd.1; can also be used to extract audio tracks
-	on ATAPI drives, read <xref linkend="duplicating-audiocds">
-	for more information on that possibility.</para>
+	on ATAPI drives.</para>
 
     </sect2>
 
@@ -750,7 +745,7 @@
 
       <screen>&prompt.user; <userinput>sox -t wav -r 44100 -s -w -c 2 <replaceable>track.wav track.raw</replaceable></userinput></screen>
 
-      <para>Read <xref linkend="creating-cds"> for more information on using a
+      <para>Read creating-cds for more information on using a
 	  CD burner in FreeBSD.</para>
     </sect2>
  </sect1>
@@ -774,7 +769,7 @@
       it did with sound.</para>
 
     <para>Before you begin, you should know the model of the video
-      card you have and the chip it uses.  While <application>&xfree86;</application> supports a
+      card you have and the chip it uses.  While <application>XFree86</application> supports a
       wide variety of video cards, fewer give good playback
       performance.  To obtain a list of extensions supported by the
       X server using your card use the command &man.xdpyinfo.1; while
@@ -825,11 +820,6 @@
       <programlisting>option CPU_ENABLE_SSE
 option USER_LDT</programlisting>
 
-    <note>
-      <para><literal>option USER_LDT</literal> does not exist on
-	&os; 5.X.</para>
-    </note>
-
     <para>To enhance the shared memory X11 interface, it is
       recommended that the values of some &man.sysctl.8; variables
       should be increased:</para>
@@ -849,7 +839,8 @@
       method described below will have varying quality across
       different hardware.  Secondly, the rendering of video in X11 is
       a topic receiving a lot of attention lately, and with each
-      version of <application>&xfree86;</application> there may be significant improvement.</para>
+      version of <application>XFree86</application> there may be 
+      significant improvement.</para>
 
     <para>A list of common video interfaces:</para>
 
@@ -875,7 +866,7 @@
     <sect3 id="video-interface-xvideo">
     <title>XVideo</title>
 
-      <para><application>&xfree86; 4.X</application> has an extension called
+      <para><application>XFree86 4.X</application> has an extension called
         <emphasis>XVideo</emphasis> (aka Xvideo, aka Xv, aka xv) which
         allows video to be directly displayed in drawable objects
         through a special acceleration.  This extension provides very
@@ -889,7 +880,7 @@
 	   <para>3DFX Voodoo 3</para>
         </listitem>
         <listitem>
-           <para>&intel; i810 and i815</para>
+           <para>Intel i810 and i815</para>
         </listitem>
         <listitem>
           <para>some S3 chips (such as Savage/IX and Savage/MX)</para>
@@ -897,12 +888,14 @@
         </orderedlist>
 
       <para>If your card is not one of these, do not be disappointed yet.
-      <application>&xfree86; 4.X</application> adds new xv capabilities with each release
+      <application>XFree86; 4.X</application> adds new xv capabilities with each release
       <footnote>
         <para>A popular familiar graphics card with generally very good
-         <application>&xfree86;</application> performance, nVidia, has yet to release the specifications
-	 on their XVideo support to the <application>&xfree86;</application> team.  It may be some time
-	 before <application>&xfree86;</application> fully support XVideo for these cards.</para>
+         <application>XFree86</application> performance, nVidia, has 
+	 yet to release the specifications on their XVideo support to the 
+	 <application>XFree86</application> team.  It may be some time
+	 before <application>XFree86;</application> fully 
+	 support XVideo for these cards.</para>
       </footnote>.
       To check whether the extension is running, 
       use <command>xvinfo</command>:</para>
@@ -1004,7 +997,7 @@
     <title>Simple Directmedia Layer</title>
 
     <para>The Simple Directmedia Layer, SDL, was intended to be a
-      porting layer between &microsoft.windows;, BeOS, and &unix;,
+      porting layer between Microsoft Windows, BeOS, and &unix;,
       allowing cross-platform applications to be developed which made
       efficient use of sound and graphics.  The SDL layer provides a
       low-level abstraction to the hardware which can sometimes be
@@ -1017,7 +1010,8 @@
     <sect3 id="video-interface-DGA">
     <title>Direct Graphics Access</title>
 
-    <para>Direct Graphics Access is an <application>&xfree86;</application> extension which allows
+    <para>Direct Graphics Access is an <application>XFree86;</application> 
+      extension which allows
       a program to bypass the X server and directly alter the
       framebuffer.  Because it relies on a low level memory mapping to
       effect this sharing, programs using it must be run as
@@ -1388,7 +1382,8 @@
       has a better chance of producing a more widely playable file.
       MPEGs created by <command>transcode</command> have been known to
       play on
-      <application>&windows.media; Player</application> and Apple's <application>&quicktime;</application>, for example.</para>
+      <application>Windows Media Player</application> and Apple's 
+      <application>Quicktime</application>, for example.</para>
 
     </sect3>
 




More information about the Submit mailing list