From 38ab49b9dac78ef78fac3aceeae1d2e81adb772b Mon Sep 17 00:00:00 2001
From: Gabor Pali <pgj@FreeBSD.org>
Date: Sat, 21 Jun 2008 07:58:33 +0000
Subject: [PATCH] Update Question 11.14: - Mark up XDM with <application> -
 Mark up xdm, kill(1) with <command> - Remove .sh extension from startup
 script - Mark up ttys(5), init(8), getty(8) - Turn "FreeBSD" into &os;

Reviewed by:  trhodes, danger
Approved by:  gabor
---
 en_US.ISO8859-1/books/faq/book.sgml | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index f5be9ac889..738904a849 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -6953,31 +6953,31 @@ ttyvb   "/usr/libexec/getty Pc"         cons25  off secure</programlisting>
 
       <qandaentry>
         <question id="xdm-boot">
-          <para>How do I start XDM on boot?</para>
+          <para>How do I start <application>XDM</application> on boot?</para>
         </question><answer>
 
           <para>There are two schools of thought on how to start
-            &man.xdm.1;. One school starts xdm from
+            &man.xdm.1;. One school starts <command>xdm</command> from
             <filename>/etc/ttys</filename> (see &man.ttys.5;) using
-            the supplied example, while the other simply runs xdm from
-            <filename>rc.local</filename> (see &man.rc.8;) or from a
-            <filename>X.sh</filename> script in
+            the supplied example, while the other simply runs <command>xdm</command> from
+            from <filename>rc.local</filename> (see &man.rc.8;) or from an
+            <filename>X</filename> script in
             <filename>/usr/local/etc/rc.d</filename>. Both are equally
             valid, and one may work in situations where the other does
             not.  In both cases the result is the same: X will pop up
-            a graphical login: prompt.</para>
+            a graphical login prompt.</para>
 
-          <para>The ttys method has the advantage of documenting which
+          <para>The &man.ttys.5; method has the advantage of documenting which
             vty X will start on and passing the responsibility of
-            restarting the X server on logout to init.  The rc.local
-            method makes it easy to kill xdm if there is a problem
+            restarting the X server on logout to &man.init.8;.  The &man.rc.8;
+            method makes it easy to <command>kill</command> <command>xdm</command> if there is a problem
             starting the X server.</para>
 
-          <para>If loaded from rc.local, <command>xdm</command> should
-            be started without any arguments (i.e., as a daemon). xdm must
-            start AFTER getty runs, or else getty and xdm will conflict,
+          <para>If loaded from &man.rc.8;, <command>xdm</command> should
+            be started without any arguments (i.e., as a daemon).  The <command>xdm</command> command must
+            start <emphasis>after</emphasis> &man.getty.8; runs, or else <command>getty</command> and <command>xdm</command> will conflict,
             locking out the console. The best way around this is to have
-            the script sleep 10 seconds or so then launch xdm.</para>
+            the script sleep 10 seconds or so then launch <command>xdm</command>.</para>
 
           <para>If you are to start <command>xdm</command> from
             <filename>/etc/ttys</filename>, there still is a chance of
@@ -6985,13 +6985,13 @@ ttyvb   "/usr/libexec/getty Pc"         cons25  off secure</programlisting>
             &man.getty.8;. One way to avoid this is to add the
             <literal>vt</literal> number in the
             <filename>/usr/local/lib/X11/xdm/Xservers</filename>
-            file.</para>
+            file:</para>
 
           <programlisting>:0 local /usr/local/bin/X vt4</programlisting>
 
           <para>The above example will direct the X server to run in
             <devicename>/dev/ttyv3</devicename>. Note the number is offset by
-            one. The X server counts the vty from one, whereas the FreeBSD
+            one. The X server counts the vty from one, whereas the &os;
             kernel numbers the vty from zero.</para>
         </answer>
       </qandaentry>