PERFORCE change 16258 for review

Chris Costello chris at freebsd.org
Mon Aug 19 11:17:22 GMT 2002


http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16258

Change 16258 by chris at chris_holly on 2002/08/19 04:16:39

	Integ.

Affected files ...

.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#6 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hats/article.sgml#2 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#6 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#5 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#4 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#5 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#4 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#4 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#6 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#4 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#4 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#4 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#5 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#6 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#2 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#4 integrate
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#6 integrate
.. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch
.. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 integrate
.. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#3 integrate
.. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/apropos.1#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/biff.1#3 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chmod.1#3 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cp.1#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dig.1#4 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/login.1#3 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/paste.1#3 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pax.1#3 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rcp.1#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/scp.1#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/send-pr.1#3 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/sftp.1#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh-add.1#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh-agent.1#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh-keygen.1#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh-keyscan.1#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh.1#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tcsh.1#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/top.1#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/Makefile#3 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/ssh_config.5#1 branch
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/sshd_config.5#1 branch
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/termcap.5#3 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/Makefile#4 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/comsat.8#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ftpd.8#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/inetd.8#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/nsupdate.8#3 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/revnetgroup.8#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sftp-server.8#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ssh-keysign.8#1 branch
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sshd.8#2 integrate
.. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sync.8#2 integrate

Differences ...

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#6 (text+ko) ====

@@ -18,7 +18,7 @@
   <articleinfo>
     <title>Contributors to FreeBSD</title>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.236 2002/08/15 20:01:12 seanc Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.237 2002/08/18 16:39:09 marcus Exp $</pubdate>
 
     <abstract>
       <para>This article lists individuals and organizations who have
@@ -5114,6 +5114,10 @@
       </listitem>
 
       <listitem>
+        <para>Maxime Romano <email>verbophobe at hotmail.com</email></para>
+      </listitem>
+
+      <listitem>
 	<para>Micha Class
 	  <email>michael_class at hpbbse.bbn.hp.com</email></para>
       </listitem>

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hats/article.sgml#2 (text+ko) ====

@@ -27,7 +27,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/hats/article.sgml,v 1.1 2002/06/25 16:58:12 mwlucas Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/hats/article.sgml,v 1.3 2002/08/17 20:01:18 ceri Exp $</pubdate>
 
     <copyright>
       <year>2002</year>
@@ -112,7 +112,7 @@
   <para>If a committer feels that a hat is abusing his or her power,
     or being regularly rude to contributors, then they should bring
     the matter to core.  This problem can be technical, social,
-    process, or some combination or subset of these.  Core will hear
+    procedural, or some combination or subset of these.  Core will hear
     the case and reach a decision, and expects both sides to abide by
     their decision.  Core appreciates specific complaints rather than
     general ones as those are easier to resolve.</para>
@@ -125,4 +125,4 @@
     secretly solve vulnerabilities before they are announced.)  The
     hat should be a <quote>first among equals,</quote> not a chairman.
 
-</article>+</article>

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#6 (text+ko) ====

@@ -1,5 +1,5 @@
 # 
-# $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/Makefile,v 1.14 2002/07/29 06:19:29 murray Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/Makefile,v 1.15 2002/08/19 04:38:24 chris Exp $
 #
 # Build the FreeBSD Developers' Handbook.
 #

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#5 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/book.sgml,v 1.36 2002/07/29 06:19:29 murray Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/book.sgml,v 1.37 2002/08/19 04:38:24 chris Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#4 (text+ko) ====

@@ -6,7 +6,7 @@
    
      Chapters should be listed in the order in which they are referenced.
  
-     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent,v 1.17 2002/07/29 06:19:30 murray Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent,v 1.18 2002/08/19 04:38:25 chris Exp $
 -->
 
 <!-- Part one -->

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 (text+ko) ====

@@ -27,14 +27,14 @@
      ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml,v 1.5 2001/11/05 07:13:36 murray Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml,v 1.6 2002/08/17 19:58:12 blackend Exp $
 -->
 
 <chapter id="psgml-mode">
   <title>Using <literal>sgml-mode</literal> with
     <application>Emacs</application></title>
   
-  <para>Recent versions of Emacs or Xemacs (available from the ports
+  <para>Recent versions of <application>Emacs</application> or <application>XEmacs</application> (available from the ports
     collection) contain a very useful package called PSGML. Automatically
     invoked when a file with the <filename>.sgml</filename> extension is loaded,
     or by typing <command>M-x sgml-mode</command>, it is a major mode for

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 (text+ko) ====

@@ -27,7 +27,7 @@
      ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.47 2002/05/22 14:17:36 ceri Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.48 2002/08/17 15:23:49 blackend Exp $
 -->
 
 <chapter id="sgml-markup">
@@ -1497,8 +1497,8 @@
 	    
 	    <listitem>
 	      <para>Some of the things the user will be seeing on the screen
-		are prompts from the computer (either from the OS, command
-		shell, or application.  These should be marked up using
+		are prompts from the computer (either from the operating system, command
+		shell, or application).  These should be marked up using
 		<sgmltag>prompt</sgmltag>.</para>
 
 	      <para>As a special case, the two shell prompts for the normal
@@ -1936,7 +1936,7 @@
 	    
 	    <listitem>
 	      <para>With no role attribute (i.e.,
-		<sgmltag>hostid</sgmltag>...<sgmltag>hostid</sgmltag> the
+		<sgmltag>hostid</sgmltag>...<sgmltag>/hostid</sgmltag>) the
 		marked up information is the simple hostname, such as
 		<literal>freefall</literal> or <literal>wcarchive</literal>.
 		You can explicitly specify this with

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 (text+ko) ====

@@ -27,7 +27,7 @@
      ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml,v 1.21 2002/05/30 08:10:27 murray Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml,v 1.22 2002/08/17 19:59:05 blackend Exp $
 -->
 
 <chapter id="tools">
@@ -248,7 +248,7 @@
 	
 	<varlistentry>
 	  <term><application>Emacs</application> or
-	    <application>xemacs</application> 
+	    <application>XEmacs</application> 
 	    (<filename role="package">editors/emacs</filename> or
 	    <filename role="package">editors/xemacs</filename>)</term>
 	  

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 (text+ko) ====

@@ -27,7 +27,7 @@
      ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml,v 1.26 2001/12/08 12:12:47 keramida Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml,v 1.28 2002/08/18 00:56:58 bmah Exp $
 -->
 
 <chapter id="writing-style">
@@ -141,7 +141,7 @@
       <listitem>
 	<para>Always use two spaces at the end of sentences, as this
 	  improves readability, and eases use of tools such as
-	  <application>emacs</application>.</para>
+	  <application>Emacs</application>.</para>
 
 	<para>While it may be argued that a capital letter following
 	  a period denotes a new sentence, this is not the case, especially
@@ -220,9 +220,9 @@
 </chapter>]]></programlisting>
 
       <para>If you use <application>Emacs</application> or
-	<application>Xemacs</application> to edit the files then
+	<application>XEmacs</application> to edit the files then
 	<literal>sgml-mode</literal> should be loaded automatically, and the
-	Emacs local variables at the bottom of each file should enforce these
+	<application>Emacs</application> local variables at the bottom of each file should enforce these
 	styles.</para>
     </sect2>
 

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#5 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.149 2002/08/15 21:05:02 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.150 2002/08/18 16:47:20 ceri Exp $
 -->
 
 <chapter id="advanced-networking">
@@ -115,7 +115,7 @@
       <para>To illustrate different aspects of routing, we will use the
 	following example from <command>netstat</command>:</para>
 
-      <screen>&prompt.user; netstat -r
+      <screen>&prompt.user; <userinput>netstat -r</userinput>
 Routing tables
 
 Destination      Gateway            Flags     Refs     Use     Netif Expire
@@ -5433,7 +5433,7 @@
       <example id="inetd-hangup">
 	<title>Sending <application>inetd</application> a HangUP Signal</title>
 
-	<screen>&prompt.root; kill -HUP `cat /var/run/inetd.pid`</screen>
+	<screen>&prompt.root; <userinput>kill -HUP `cat /var/run/inetd.pid`</userinput></screen>
       </example>
 
       <para>Each line of the configuration file specifies an

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#4 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.74 2002/07/11 19:08:21 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.75 2002/08/18 16:47:20 ceri Exp $
 -->
 
 <chapter id="basics">
@@ -1316,8 +1316,8 @@
 	<para>On systems without <literal>DEVFS</literal>, device nodes are created
 	  using the &man.MAKEDEV.8; script as shown below:</para>
 
-	<screen>&prompt.root; cd /dev
-&prompt.root; sh MAKEDEV ad1
+	<screen>&prompt.root; <userinput>cd /dev</userinput>
+&prompt.root; <userinput>sh MAKEDEV ad1</userinput>
 	</screen>
 
 	<para>This example would make the proper device nodes

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#4 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.55 2002/08/07 03:32:37 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.56 2002/08/18 16:47:20 ceri Exp $
 -->
 
 <chapter id="config-tuning">
@@ -889,8 +889,8 @@
 	now we are only concerned with toggling Soft Updates on and
 	off, which is done by:</para>
 
-      <screen>&prompt.root; tunefs -n enable /filesystem
-&prompt.root; tunefs -n disable /filesystem</screen>
+      <screen>&prompt.root; <userinput>tunefs -n enable /filesystem</userinput>
+&prompt.root; <userinput>tunefs -n disable /filesystem</userinput></screen>
 
       <para>A filesystem cannot be modified with &man.tunefs.8; while
 	it is mounted.  A good time to enable Soft Updates is before any

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#6 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.136 2002/08/06 10:19:55 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.137 2002/08/18 16:47:20 ceri Exp $
 -->
 
 <chapter id="cutting-edge">
@@ -760,7 +760,7 @@
 
       <para>As the superuser, you can execute</para>
 
-      <screen>&prompt.root; <userinput/shutdown now/</screen>
+      <screen>&prompt.root; <userinput>shutdown now</userinput></screen>
 
       <para>from a running system, which will drop it to single user
 	mode.</para>
@@ -1364,7 +1364,7 @@
 	<step>
 	  <para>Remake all the devices.</para>
 	    
-	    <screen>&prompt.root; <userinput/sh MAKEDEV all/</screen>
+	    <screen>&prompt.root; <userinput>sh MAKEDEV all</userinput></screen>
 	</step>
 
 	<step>
@@ -1428,7 +1428,7 @@
         In this case, the fix would be to run:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src/usr.bin/file</userinput>
-&prompt.root; <userinput/make all install/</screen>
+&prompt.root; <userinput>make all install</userinput></screen>
     </sect2>    
     
     <sect2>

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#4 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.81 2002/08/15 10:10:38 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.82 2002/08/17 09:26:26 blackend Exp $
 -->
 
 <chapter id="kernelconfig">
@@ -234,7 +234,7 @@
       <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
+        linkend="cutting-edge">sync your source tree</link> with the
         latest sources of the FreeBSD project.
         In this file all important issues with updating FreeBSD
         are written down.  <filename>/usr/src/UPDATING</filename> always fits
@@ -357,7 +357,7 @@
     <para>The new kernel will be copied to the root directory as
       <filename>/kernel</filename> and the old kernel will be moved to
       <filename>/kernel.old</filename>.  Now, shutdown the system and
-      reboot to use your kernel.  In case something goes wrong, there are
+      reboot to use your new kernel.  In case something goes wrong, there are
       some <link linkend="kernelconfig-trouble">troubleshooting</link>
       instructions at the end of this chapter.  Be sure to read the
       section which explains how to recover in case your new kernel <link
@@ -472,7 +472,7 @@
       sure whether you should use <literal>I586_CPU</literal> or
       <literal>I686_CPU</literal>), however, for a custom kernel, it is
       best to specify only the CPU you have.  If you are unsure of your CPU type,
-      you can use the <command>dmesg</command> command to
+      you can use the &man.dmesg.8; command to
       view your boot up messages.</para>
     <indexterm>
       <primary>kernel options</primary>
@@ -615,10 +615,10 @@
 
     <programlisting>options          SOFTUPDATES  #Enable FFS soft updates support</programlisting>
 
-    <para>This option enables soft updates in the kernel, this will help speed
+    <para>This option enables Soft Updates in the kernel, this will help speed
       up write access on the disks.  They are enabled by default in the 4.X branch
       but may not be turned on.  Review the output from &man.mount.8; to see
-      if you have them enabled.  If you do not see the soft-updates option then
+      if you have them enabled.  If you do not see the <literal>soft-updates</literal> option then
       you will need to activate it using the &man.tunefs.8; or &man.newfs.8;
       for new filesystems.</para>      
 
@@ -702,9 +702,9 @@
     <programlisting>options          UCONSOLE            #Allow users to grab the console</programlisting>
 
     <para>Allow users to grab the console, which is useful for X users.
-      For example, you can create a console xterm by typing <command>xterm
-      -C</command>, which will display any <command>write</command>,
-      <command>talk</command>, and any other messages you receive, as well
+      For example, you can create a console <application>xterm</application> by typing <command>xterm
+      -C</command>, which will display any &man.write.1;,
+      &man.talk.1;, and any other messages you receive, as well
       as any console messages sent by the kernel.</para>
 
     <programlisting>options          USERCONFIG          #boot -c editor</programlisting>
@@ -778,8 +778,8 @@
     <programlisting>device          isa</programlisting>
 
     <para>All PCs supported by FreeBSD have one of these.  If you have an
-      IBM PS/2 (Micro Channel Architecture), you cannot run FreeBSD at
-      this time (support is being worked on).</para>
+      IBM PS/2 (Micro Channel Architecture), FreeBSD provides some limited support at
+      this time.  For more information about the MCA support, see <filename>/usr/src/sys/i386/conf/LINT</filename>.</para>
 
     <programlisting>device          eisa</programlisting>
 
@@ -1112,7 +1112,7 @@
       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>.  A
+      as <application>Emacs</application>.  A
       <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
@@ -1123,7 +1123,7 @@
 
     <para>Memory disk pseudo-devices.</para>
 
-    <programlisting>pesudo-device   gif</programlisting>
+    <programlisting>pseudo-device   gif</programlisting>
 
     <para>or</para>
 
@@ -1258,16 +1258,16 @@
 	<term><command>config</command> fails:</term>
 
 	<listitem>
-	  <para>If the <command>config</command> command fails when you
+	  <para>If the &man.config.8; command fails when you
 	    give it your kernel description, you have probably made a
 	    simple error somewhere.  Fortunately,
-	    <command>config</command> will print the line number that it
+	    &man.config.8; will print the line number that it
 	    had trouble with, so you can quickly skip to it with
-	    <command>vi</command>.  For example, if you see:</para>
+	    <application>vi</application>.  For example, if you see:</para>
 
 	  <screen>config: line 17: syntax error</screen>
 
-	  <para>You can skip to the problem in <command>vi</command> by
+	  <para>You can skip to the problem in <application>vi</application> by
 	    typing <command>17G</command> in command mode.  Make sure the
 	    keyword is typed correctly, by comparing it to the
 	    <filename>GENERIC</filename> kernel or another
@@ -1281,7 +1281,7 @@
 	<listitem>
 	  <para>If the <command>make</command> command fails, it usually
 	    signals an error in your kernel description, but not severe
-	    enough for <command>config</command> to catch it.  Again, look
+	    enough for &man.config.8; to catch it.  Again, look
 	    over your configuration, and if you still cannot resolve the
 	    problem, send mail to the &a.questions; with your kernel
 	    configuration, and it should be diagnosed very quickly.</para>
@@ -1289,7 +1289,7 @@
       </varlistentry>
 
       <varlistentry>
-	<term>Installing the new kernel fails</term>
+	<term>Installing the new kernel fails:</term>
 	
 	<listitem>
 	  <para>If the kernel compiled fine, but failed to install
@@ -1306,17 +1306,17 @@
       </varlistentry>
 
       <varlistentry>
-	<term>The kernel will not boot:<anchor
+	<term>The kernel does not boot:<anchor
 	  id="kernelconfig-noboot"></term>
 
 	<listitem>
 	  <para>If your new kernel does not boot, or fails to
-	    recognize your devices, do not panic!  Fortunately, BSD has
+	    recognize your devices, do not panic!  Fortunately, FreeBSD has
 	    an excellent mechanism for recovering from incompatible
 	    kernels.  Simply choose the kernel you want to boot from at
 	    the FreeBSD boot loader. You can access this when the system
 	    counts down from 10.  Hit any key except for the
-            <keycap>enter</keycap> key, type <command>unload</command>
+            <keycap>Enter</keycap> key, type <command>unload</command>
             and then type
 	    <command>boot <replaceable>kernel.old</replaceable></command>,
             or the filename of any other kernel that will boot properly.
@@ -1365,8 +1365,8 @@
       </varlistentry>
 
       <varlistentry>
-	<term>The kernel works, but <command>ps</command> does not work
-	  any more!:</term>
+	<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

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#4 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v 1.74 2002/08/15 21:05:13 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v 1.75 2002/08/18 16:47:20 ceri Exp $
 -->
 
 <chapter id="linuxemu">
@@ -624,8 +624,8 @@
 
 
       <step><para>Test-start maple:</para>
-	<screen>&prompt.user; cd /usr/local/maple/bin
-&prompt.user; ./xmaple</screen>
+	<screen>&prompt.user; <userinput>cd /usr/local/maple/bin</userinput>
+&prompt.user; <userinput>./xmaple</userinput></screen>
 
 	<para>You should be up and running. Make sure to write
 	  Maplesoft to let them know you would like a native FreeBSD
@@ -1872,7 +1872,7 @@
         <para>Then the install-script is started, which will copy nearly
           all the relevant files into the install-directory:</para>
 
-	<screen>&prompt.root; /oracle/&lt;SID&gt;/sapreorg/KERNEL/UNIX/INSTTOOL.SH</screen>
+	<screen>&prompt.root; <userinput>/oracle/&lt;SID&gt;/sapreorg/KERNEL/UNIX/INSTTOOL.SH</userinput></screen>
 
 	<para>The IDES-Installation (4.6B) comes with a fully customized
 	  SAP R/3 Demo-System, so there are six instead of just three
@@ -2859,9 +2859,9 @@
         <para>To continue with the installation, I created a link and an
           additional directory:</para>
 
-        <screen>&prompt.root; pwd
+        <screen>&prompt.root; <userinput>pwd</userinput>
 /compat/linux/usr/sap
-&prompt.root; ls -l
+&prompt.root; <userinput>ls -l</userinput>
 total 4
 drwxr-xr-x 3  idsadm sapsys 512 May 5 11:20 D00
 drwxr-x--x 5  idsadm sapsys 512 May 5 11:35 IDS

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.37 2002/08/06 17:48:22 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.39 2002/08/18 17:24:23 ceri Exp $
 -->
 
 <chapter id="multimedia">
@@ -294,7 +294,7 @@
     <para>After you reboot, log in and run <command>dmesg | grep
       pcm</command> as shown below:</para>
 
-    <screen>&prompt.root; dmesg | grep pcm
+    <screen>&prompt.root; <userinput>dmesg | grep pcm</userinput>
 pcm0: &lt;SB16 DSP 4.11&gt; on sbc0</screen>
 
     <para>The output from your system may look different.  If no
@@ -308,8 +308,8 @@
       <devicename>pcm0</devicename>, you will have to run the
       following as <username>root</username>:</para>
 
-    <screen>&prompt.root; cd /dev
-&prompt.root; sh MAKEDEV snd0</screen>
+    <screen>&prompt.root; <userinput>cd /dev</userinput>
+&prompt.root; <userinput>sh MAKEDEV snd0</userinput></screen>
 
     <para>If the command returned <devicename>pcm1</devicename>,
       follow the same steps as shown above, replacing
@@ -383,7 +383,7 @@
       your soundcard, you can put a CD in the drive and play it
       with &man.cdcontrol.1;.</para>
 
-      <screen>&prompt.user; cdcontrol -f /dev/acd0c play 1</screen>
+      <screen>&prompt.user; <userinput>cdcontrol -f /dev/acd0c play 1</userinput></screen>
 
     <para>Various applications, such as <filename
       role="package">audio/workman</filename> offer a better
@@ -470,8 +470,8 @@
     <para>To set the number of virtual channels, there are two sysctl
       knobs which, if you are the <username>root</username> user, can
       be set like this:</para>
-    <screen>&prompt.root; sysctl hw.snd.pcm0.vchans=4
-&prompt.root; sysctl hw.snd.maxautovchans=4</screen>
+    <screen>&prompt.root; <userinput>sysctl hw.snd.pcm0.vchans=4</userinput>
+&prompt.root; <userinput>sysctl hw.snd.maxautovchans=4</userinput></screen>
 
     <para>The above example allocates four virtual channels, which is a
       practical number for everyday use.  <varname>hw.snd.pcm0.vchans</varname>
@@ -538,7 +538,7 @@
 	the sound device and the MP3 file on the command line, as
 	shown below:</para>
 
-      <screen>&prompt.root; mpg123 -a <replaceable>/dev/dsp1.0</replaceable> Foobar-GreatestHits.mp3
+      <screen>&prompt.root; <userinput>mpg123 -a <replaceable>/dev/dsp1.0</replaceable> Foobar-GreatestHits.mp3</userinput>
 High Performance MPEG 1.0/2.0/2.5 Audio Player for Layer 1, 2 and 3.
 Version 0.59r (1999/Jun/15). Written and copyrights by Michael Hipp.
 Uses code from various people. See 'README' for more!
@@ -574,14 +574,14 @@
 	be issued (as <username>root</username>) to rip an entire CD
 	into individual (per track) WAV files:</para>
 
-      <screen>&prompt.root; cdda2wav -D <replaceable>0,1,0</replaceable> -B</screen>
+      <screen>&prompt.root; <userinput>cdda2wav -D <replaceable>0,1,0</replaceable> -B</userinput></screen>
 
       <para><application>cdda2wav</application> will support
 	ATAPI (IDE) CDROM drives.  To rip from an IDE drive, specify
 	the device name in place of the SCSI unit numbers.  For
 	example, to rip track 7 from an IDE drive:</para>
 
-      <screen>&prompt.root; cdda2wav -D <replaceable>/dev/acd0a</replaceable> -t 7</screen>
+      <screen>&prompt.root; <userinput>cdda2wav -D <replaceable>/dev/acd0a</replaceable> -t 7</userinput></screen>
 
       <para>The <option>-D <replaceable>0,1,0</replaceable></option>
 	indicates the SCSI device <devicename>0,1,0</devicename>,
@@ -591,13 +591,13 @@
       <para>To rip individual tracks, make use of the
 	<option>-t</option> option as shown:</para>
 
-      <screen>&prompt.root; cdda2wav -D <replaceable>0,1,0</replaceable> -t 7</screen>
+      <screen>&prompt.root; <userinput>cdda2wav -D <replaceable>0,1,0</replaceable> -t 7</userinput></screen>
 
       <para>This example rips track seven of the audio CDROM.  To rip
 	a range of tracks, for example, track one to seven, specify a
 	range:</para>
 
-      <screen>&prompt.root; cdda2wav -D <replaceable>0,1,0</replaceable> -t 1+7</screen>
+      <screen>&prompt.root; <userinput>cdda2wav -D <replaceable>0,1,0</replaceable> -t 1+7</userinput></screen>
 
     </sect2>
 
@@ -613,14 +613,14 @@
 	convert <filename>audio01.wav</filename> to
 	<filename>audio01.mp3</filename>:</para>
 
-      <screen>&prompt.root; lame -h -b <replaceable>128</replaceable> \
+      <screen>&prompt.root; <userinput>lame -h -b <replaceable>128</replaceable> \
 --tt "<replaceable>Foo Song Title</replaceable>" \
 --ta "<replaceable>FooBar Artist</replaceable>" \
 --tl "<replaceable>FooBar Album</replaceable>" \
 --ty "<replaceable>2001</replaceable>" \
 --tc "<replaceable>Ripped and encoded by Foo</replaceable>" \
 --tg "<replaceable>Genre</replaceable>" \
-<replaceable>audio01.wav audio01.mp3</replaceable></screen>
+<replaceable>audio01.wav audio01.mp3</replaceable></userinput></screen>
 
       <para>128 kbits seems to be the standard MP3 bitrate in use.
 	Many enjoy the higher quality 160, or 192.  The higher the
@@ -746,14 +746,14 @@
       name hardcoded in them, you might find it useful to make
       symbolic links to the proper devices:</para>
 
-      <screen>&prompt.root; ln -sf /dev/acd0c /dev/dvd
-&prompt.root; ln -sf /dev/racd0c /dev/rdvd</screen>
+      <screen>&prompt.root; <userinput>ln -sf /dev/acd0c /dev/dvd</userinput>
+&prompt.root; <userinput>ln -sf /dev/racd0c /dev/rdvd</userinput></screen>
 
     <para>On FreeBSD 5.X, which uses &man.devfs.5; there
         is a slightly different set of recommended links:</para>
 
-      <screen>&prompt.root; ln -sf /dev/acd0c /dev/dvd
-&prompt.root; ln -sf /dev/acd0c /dev/rdvd</screen>
+      <screen>&prompt.root; <userinput>ln -sf /dev/acd0c /dev/dvd</userinput>
+&prompt.root; <userinput>ln -sf /dev/acd0c /dev/rdvd</userinput></screen>
 
     <para>Additionally, DVD decryption, which requires invoking
       special DVD-ROM functions, requires write permission on the DVD
@@ -851,7 +851,7 @@
       To check whether the extension is running, 
       use <command>xvinfo</command>:</para>
 
-        <screen>&prompt.user; xvinfo</screen>
+        <screen>&prompt.user; <userinput>xvinfo</userinput></screen>
 
       <para>XVideo is supported for your card if the result looks like:</para>
 <screen>X-Video Extension version 2.2
@@ -924,7 +924,7 @@
         red, green, blue masks: 0x0, 0x0, 0x0</screen>
 
     <para>Also note that the formats listed (YUV2, YUV12, etc) are not
-     present with every implementation of XVideo and their absense may
+     present with every implementation of XVideo and their absence may
      hinder some players.</para>
 
     <para>If the result looks like:</para>
@@ -1096,8 +1096,8 @@
           <command>make</command> which echo at the start of the
           build.</para>
 
-	<screen>&prompt.root; cd /usr/ports/graphics/mplayer
-&prompt.root; make
+	<screen>&prompt.root; <userinput>cd /usr/ports/graphics/mplayer</userinput>
+&prompt.root; <userinput>make</userinput>
 You can enable additional compilation optimizations
 by defining WITH_OPTIMIZED_CFLAGS
 You can enable GTK GUI by defining WITH_GUI.
@@ -1117,7 +1117,7 @@
           before enabling this option.</para> </footnote>.  Some
           reasonable options are:</para>
 
-        <screen>&prompt.root; make WITH_DVD=yes WITH_SVGALIB=yes</screen>
+        <screen>&prompt.root; <userinput>make WITH_DVD=yes WITH_SVGALIB=yes</userinput></screen>
 
         <para>As of this writing, the <application>MPlayer</application> port will build its HTML
           documentation and one executable,
@@ -1147,8 +1147,8 @@
           home directory.  To create this necessary subdirectory,
 	  you can do the following:</para>
 
-<screen>&prompt.user; cd /usr/ports/graphics/mplayer
-&prompt.user; make install-user</screen>
+<screen>&prompt.user; <userinput>cd /usr/ports/graphics/mplayer</userinput>
+&prompt.user; <userinput>make install-user</userinput></screen>
 
 	<para>The command options for <command>mplayer</command> are
 	  listed in the manual page.  For even more detail there is HTML
@@ -1159,11 +1159,11 @@
 	  <filename>testfile.avi</filename> through one of the various
 	  video interfaces set the <option>-vo</option>:
 
-	  <screen>&prompt.user; mplayer -vo xv testfile.avi</screen>
-	  <screen>&prompt.user; mplayer -vo sdl testfile.avi</screen>
-	  <screen>&prompt.user; mplayer -vo x11 testfile.avi</screen>
-	  <screen>&prompt.root; mplayer -vo dga testfile.avi</screen>
-	  <screen>&prompt.root; mplayer -vo 'sdl:dga' testfile.avi</screen>
+	  <screen>&prompt.user; <userinput>mplayer -vo xv testfile.avi</userinput></screen>
+	  <screen>&prompt.user; <userinput>mplayer -vo sdl testfile.avi</userinput></screen>
+	  <screen>&prompt.user; <userinput>mplayer -vo x11 testfile.avi</userinput></screen>
+	  <screen>&prompt.root; <userinput>mplayer -vo dga testfile.avi</userinput></screen>
+	  <screen>&prompt.root; <userinput>mplayer -vo 'sdl:dga' testfile.avi</userinput></screen>
 
 	<para>It is worth trying all of these options, as their relative
 	  performance depends on many factors and will vary significantly
@@ -1177,7 +1177,7 @@
 	 device node for the DVD-ROM.  For example, to play title 3
 	 from <filename>/dev/dvd</filename>:</para>
 
-	  <screen>&prompt.root; mplayer -vo dga -dvd 2 /dev/dvd</screen>
+	  <screen>&prompt.root; <userinput>mplayer -vo dga -dvd 2 /dev/dvd</userinput></screen>
 
 	<para>To stop, pause, advance and so on, consult the
 	  keybindings, which are output by running <command>mplayer
@@ -1198,7 +1198,7 @@
 	<para>Finally, <command>mplayer</command> can be used to rip a
 	  DVD title into a <filename>.vob</filename> file.  To dump out title 2 from a DVD:</para>
 
-	  <screen>&prompt.root; mplayer -dumpstream -dumpfile out.vob -dvd 2 /dev/dvd</screen>
+	  <screen>&prompt.root; <userinput>mplayer -dumpstream -dumpfile out.vob -dvd 2 /dev/dvd</userinput></screen>
 
         <para>The output file, <filename>out.vob</filename>, will be
 	  MPEG and can be manipulated by the other packages described
@@ -1224,7 +1224,7 @@
 	 or bad performance.  Here are a couple of examples to get
 	 you going.  First a simple copy:</para>
 
-	 <screen>&prompt.user; mencoder input.avi -oac copy -ovc copy -o output.avi</screen>
+	 <screen>&prompt.user; <userinput>mencoder input.avi -oac copy -ovc copy -o output.avi</userinput></screen>
 
          <para>It is easy to find examples where the output is
 	 unplayable even by <command>mplayer</command>.  Thus, if you
@@ -1234,8 +1234,8 @@
 	 <para>To convert <filename>input.avi</filename> to the MPEG4
 	 codec with MPEG3 audio encoding (<filename role="package">audio/lame</filename> is required):</para>
 
-	 <screen>&prompt.user; mencoder input.avi -oac mp3lame -lameopts br=192 \
-	 -ovc lavc -lavcopts vcodec=mpeg4:vhq -o output.avi</screen>
+	 <screen>&prompt.user; <userinput>mencoder input.avi -oac mp3lame -lameopts br=192 \
+	 -ovc lavc -lavcopts vcodec=mpeg4:vhq -o output.avi</userinput></screen>
 
 	 <para>This has produced output playable by <command>mplayer</command>
 	 and <command>xine</command>.</para>
@@ -1278,13 +1278,13 @@
      
     <para>The <application>xine</application> player can be started by itself:</para>
 
-      <screen>&prompt.user; xine</screen>
+      <screen>&prompt.user; <userinput>xine</userinput></screen>
 
     <para>The menus can then be used to open a file, or it can be
       started to play a file immediately without the GUI
       with the command:</para>
 
-      <screen>&prompt.user; xine -g -p mymovie.avi</screen>
+      <screen>&prompt.user; <userinput>xine -g -p mymovie.avi</userinput></screen>
 
     </sect3>
 
@@ -1303,26 +1303,26 @@
       many options to the <command>make</command> command.  I
       recommend:</para>
 
-      <screen>&prompt.root; make WITH_LIBMPEG2=yes</screen>
+      <screen>&prompt.root; <userinput>make WITH_LIBMPEG2=yes</userinput></screen>
 
     <para>If you plan to install <filename
       role="package">graphics/avifile</filename>, then add the
       <literal>WITH_AVIFILE</literal> option to your
       <command>make</command> command line, as shown here:</para>
 
-      <screen>&prompt.root; make WITH_AVIFILE=yes WITH_LIBMPEG2=yes</screen>
+      <screen>&prompt.root; <userinput>make WITH_AVIFILE=yes WITH_LIBMPEG2=yes</userinput></screen>
 
     <para>Here are two examples of using <command>transcode</command>
       for video conversion which produce rescaled output.  The first
       encodes the output to an openDIVX AVI file, while the second
       encodes to the much more portable MPEG format.</para>
 
-      <screen>&prompt.user; transcode -i input.vob -x vob -V -Z 320x240 \
--y opendivx -N 0x55 -o output.avi</screen>
+      <screen>&prompt.user; <userinput>transcode -i input.vob -x vob -V -Z 320x240 \
+-y opendivx -N 0x55 -o output.avi</userinput></screen>
 
-      <screen>&prompt.user; transcode -i input.vob -x vob -V -Z 320x240 \
--y mpeg -N 0x55 -o output.tmp
-&prompt.user; tcmplex -o output.mpg -i output.tmp.m1v -p output.tmp.mpa -m 1</screen>
+      <screen>&prompt.user; <userinput>transcode -i input.vob -x vob -V -Z 320x240 \
+-y mpeg -N 0x55 -o output.tmp</userinput>
+&prompt.user; <userinput>tcmplex -o output.mpg -i output.tmp.m1v -p output.tmp.mpa -m 1</userinput></screen>
 
     <para>There is a manual page for <command>transcode</command>, but
       for the various <command>tc*</command> utilities (such as

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#4 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.177 2002/07/11 12:09:24 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.178 2002/08/18 16:47:21 ceri Exp $
 -->
 
 <chapter id="ports">
@@ -477,7 +477,7 @@
 	  <para>As <username>root</username>, run <command>/stand/sysinstall</command> as
 	    shown below:</para>
 
-	  <screen>&prompt.root; /stand/sysinstall</screen>
+	  <screen>&prompt.root; <userinput>/stand/sysinstall</userinput></screen>
 	</step>
 
 	<step>
@@ -556,7 +556,7 @@
 	<step>
 	  <para>Run <command>cvsup</command>:</para>
 
-	  <screen>&prompt.root; cvsup -g -L 2 <replaceable>/root/ports-supfile</replaceable></screen>
+	  <screen>&prompt.root; <userinput>cvsup -g -L 2 <replaceable>/root/ports-supfile</replaceable></userinput></screen>
 	</step>
 
 	<step>

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#5 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml,v 1.85 2002/08/15 22:05:11 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml,v 1.87 2002/08/18 18:02:56 ceri Exp $
 -->
 
 <chapter id="ppp-and-slip">
@@ -222,7 +222,7 @@
 	      role="netmask">255.255.255.255</hostid>.</para>
 	  </listitem>
 
-	  <indexterm id="ppp-statis-ip">
+	  <indexterm id="ppp-static-ip">
 	    <primary>static IP address</primary>
 	  </indexterm>
 	  <listitem>
@@ -326,17 +326,17 @@
 
         <para>We have now started <command>ppp</command></para>
 
-<screen>ppp ON example&gt; set device <devicename>/dev/cuaa1</devicename></screen>
+<screen>ppp ON example&gt; <userinput>set device <devicename>/dev/cuaa1</devicename></userinput></screen>
 
         <para>We set our modem device, in this case it is
           <devicename>cuaa1</devicename></para>
 
-<screen>ppp ON example&gt; set speed 115200</screen>
+<screen>ppp ON example&gt; <userinput>set speed 115200</userinput></screen>
 
         <para>Set the connection speed, in this case we
           are using 115,200 <acronym>kbps</acronym></para>
 
-<screen>ppp ON example&gt; enable dns</screen>
+<screen>ppp ON example&gt; <userinput>enable dns</userinput></screen>
 
         <para>Tell <command>ppp</command> to configure our
           resolver and add the nameserver lines to
@@ -344,7 +344,7 @@
           cannot determine our hostname, we can set one manually later
         </para>
 
-<screen>ppp ON example&gt; term</screen>
+<screen>ppp ON example&gt; <userinput>term</userinput></screen>
 
         <para>Switch to "terminal" mode so that we can manually
           control the modem</para>
@@ -406,7 +406,7 @@
         <para>We have made an agreement on an <acronym>IP</acronym>
           address and successfully completed our connection</para>
 
-<screen>PPP ON example&gt;add default HISADDR</screen>
+<screen>PPP ON example&gt;<userinput>add default HISADDR</userinput></screen>
 
         <para>Here we add our default route, we need to do this
           before we can talk to the outside world as currently the

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.57 2002/04/29 12:22:28 ceri Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.58 2002/08/18 16:47:22 ceri Exp $
 -->
 
 <chapter id="printing">
@@ -522,7 +522,7 @@
 	    <para>Change to the <filename>/dev</filename>
 	      directory:</para>
 
-	    <screen>&prompt.root; cd <filename>/dev</filename></screen>
+	    <screen>&prompt.root; <userinput>cd /dev</userinput></screen>
 	  </step>
 
 	  <step>

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#6 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.112 2002/07/02 01:48:29 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.114 2002/08/18 17:22:15 ceri Exp $
 -->
 
 <chapter id="security">
@@ -2545,12 +2545,12 @@
 	  
       <para>Now try doing the <command>su</command>:</para>
 	  
-      <screen>&prompt.user; <prompt>su</prompt>
+      <screen>&prompt.user; <userinput>su</userinput>
 <prompt>Password:</prompt></screen>
 	  
       <para>and take a look at what tokens we have:</para>
 	  
-      <screen>&prompt.root; klist
+      <screen>&prompt.root; <userinput>klist</userinput>

>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message



More information about the trustedbsd-cvs mailing list