svn commit: r41571 - projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/basics

Dru Lavigne dru at FreeBSD.org
Wed May 8 21:39:52 UTC 2013


Author: dru
Date: Wed May  8 21:39:52 2013
New Revision: 41571
URL: http://svnweb.freebsd.org/changeset/doc/41571

Log:
  This patch addresses the following:
  
  - you
  
  - replace command/app tags with entities
  
  - fix xref tags
  
  - fix some acronyms
  
  Approved by:  gjb (mentor)

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/basics/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/basics/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Wed May  8 17:55:10 2013	(r41570)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Wed May  8 21:39:52 2013	(r41571)
@@ -57,7 +57,7 @@
       </listitem>
 
       <listitem>
-	<para>What a shell is, and how to change your default login
+	<para>What a shell is, and how to change the default login
 	  environment.</para>
       </listitem>
 
@@ -87,10 +87,10 @@
 
     <para>&os; can be used in various ways.  One of them is typing
       commands to a text terminal.  A lot of the flexibility and power
-      of a &unix; operating system is readily available at your hands
+      of a &unix; operating system is readily available
       when using &os; this way.  This section describes what
       <quote>terminals</quote> and <quote>consoles</quote> are, and
-      how you can use them in &os;.</para>
+      how to use them in &os;.</para>
 
     <sect2 id="consoles-intro">
       <title>The Console</title>
@@ -144,8 +144,9 @@ login:</screen>
 
       <screen>login:</screen>
 
-      <para>Type the username that was configured during <link
-	  linkend="bsdinstall-addusers">system installation</link> and
+      <para>Type the username that was configured during system
+	installation, as described in <xref
+	  linkend="bsdinstall-addusers"/>, and
 	press <keycap>Enter</keycap>.  Then enter the password
 	associated with the username and press <keycap>Enter</keycap>.
 	The password is <emphasis>not echoed</emphasis> for security
@@ -165,8 +166,8 @@ login:</screen>
       <para>&os; can be configured to provide many virtual consoles
 	for inputting commands.  Each virtual console has its own
 	login prompt and output channel, and &os; takes care of
-	properly redirecting keyboard input and monitor output as you
-	switch between virtual consoles.</para>
+	properly redirecting keyboard input and monitor output as
+	switching occurs between virtual consoles.</para>
 
       <para>Special key combinations have been reserved by &os; for
 	switching consoles.<footnote>
@@ -228,7 +229,7 @@ ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  
       <title>Single User Mode Console</title>
 
       <para>A detailed description of <quote>single user mode</quote>
-	can be found <link linkend="boot-singleuser">here</link>.
+	can be found in <xref linkend="boot-singleuser"/>.
 	There is only one console when &os; is in single user mode as
 	no other virtual consoles are available in this mode.  The
 	settings for single user mode are found in this section of
@@ -249,8 +250,9 @@ console none                            
 	  without prompting for a password.</para>
 
 	<para><emphasis>Be careful when changing this setting to
-	    <literal>insecure</literal></emphasis>.  If you ever
-	  forget the <username>root</username> password, booting into
+	    <literal>insecure</literal></emphasis>.  If
+	  the <username>root</username> password is forgotten, booting
+	  into
 	  single user mode is still possible, but may be difficult for
 	  someone who is not comfortable with the &os; booting
 	  process.</para>
@@ -375,7 +377,7 @@ console none                            
       </tgroup>
     </informaltable>
     <indexterm>
-      <primary><command>ls</command></primary>
+      <primary>&man.ls.1;</primary>
     </indexterm>
     <indexterm><primary>directories</primary></indexterm>
 
@@ -418,7 +420,7 @@ total 530
       directory has a slightly different meaning than that of files.
       When a directory is marked executable, it means it is possible
       to change into that directory using
-      <application>cd</application>.  This also means that it is
+      &man.cd.1;.  This also means that it is
       possible to access the files within that directory, subject to
       the permissions on the files themselves.</para>
 
@@ -662,7 +664,7 @@ total 530
       <para>Note that a <literal>s</literal> is now part of the
 	permission set designated for the file owner, replacing the
 	executable bit.  This allows utilities which need elevated
-	permissions, such as <command>passwd</command>.</para>
+	permissions, such as &man.passwd.1;.</para>
 
       <note>
 	<para>The <literal>nosuid</literal> &man.mount.8; option will
@@ -673,10 +675,10 @@ total 530
       </note>
 
       <para>To view this in real time, open two terminals.  On
-	one, start the <command>passwd</command> process as a normal
+	one, type <command>passwd</command> as a normal
 	user.  While it waits for a new password, check the process
 	table and look at the user information for
-	<command>passwd</command>:</para>
+	&man.passwd.1;:</para>
 
       <para>In terminal A:</para>
 
@@ -690,8 +692,8 @@ Old Password:</screen>
       <screen>trhodes  5232  0.0  0.2  3420  1608   0  R+    2:10AM   0:00.00 grep passwd
 root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
-      <para>As stated above, the <command>passwd</command> is run
-	by a normal user, but is using the effective
+      <para>Although &man.passwd.1; is run
+	as a normal user, it is using the effective
 	<acronym>UID</acronym> of <username>root</username>.</para>
 
       <para>The <literal>setgid</literal> permission performs the
@@ -702,7 +704,7 @@ root     5211  0.0  0.2  3620  1724   2 
 	user who started the process.</para>
 
       <para>To set the <literal>setgid</literal> permission on a
-	file, provide <command>chmod</command> with a leading two
+	file, provide &man.chmod.1; with a leading two
 	(2):</para>
 
       <screen>&prompt.root; <userinput>chmod 2755 sgidexample.sh</userinput></screen>
@@ -848,8 +850,7 @@ root     5211  0.0  0.2  3620  1724   2 
 	    <row>
 	      <entry><filename
 		  class="directory">/etc/namedb/</filename></entry>
-	      <entry><command>named</command> configuration files.
-		Refer to &man.named.8; for details.</entry>
+	      <entry>&man.named.8; configuration files.</entry>
 	    </row>
 
 	    <row>
@@ -863,8 +864,7 @@ root     5211  0.0  0.2  3620  1724   2 
 	    <row>
 	      <entry><filename
 		  class="directory">/etc/ppp/</filename></entry>
-	      <entry><command>ppp</command> configuration files as
-		described in &man.ppp.8;.</entry>
+	      <entry>&man.ppp.8; configuration files.</entry>
 	    </row>
 
 	    <row>
@@ -1071,7 +1071,7 @@ root     5211  0.0  0.2  3620  1724   2 
 
     <para>Files are stored in directories.  A directory may contain no
       files, or it may contain many hundreds of files.  A directory
-      can also contain other directories, allowing you to build up a
+      can also contain other directories, allowing a
       hierarchy of directories within one another in order to organize
       data.</para>
 
@@ -1087,7 +1087,7 @@ root     5211  0.0  0.2  3620  1724   2 
       different from &windows; which uses
       <literal>\</literal> to separate file and directory
       names.  &os; does not use drive letters, or other drive names in
-      the path.  For example, you would not type
+      the path.  For example, one would not type
       <filename>c:/foo/bar/readme.txt</filename> on &os;.</para>
 
     <para>Directories and files are stored in a file system.  Each
@@ -1097,11 +1097,11 @@ root     5211  0.0  0.2  3620  1724   2 
       directories.  One file system is designated the
       <firstterm>root file system</firstterm> or <literal>/</literal>.
       Every other file system is <firstterm>mounted</firstterm> under
-      the root file system.  No matter how many disks you have on your
+      the root file system.  No matter how many disks are on the
       &os; system, every directory appears to be part of the same
       disk.</para>
 
-    <para>Suppose you have three file systems, called
+    <para>Consider three file systems, called
       <literal>A</literal>, <literal>B</literal>, and
       <literal>C</literal>.  Each file system has one root directory,
       which contains two other directories, called
@@ -1109,9 +1109,9 @@ root     5211  0.0  0.2  3620  1724   2 
       <literal>B1</literal>, <literal>B2</literal> and
       <literal>C1</literal>, <literal>C2</literal>).</para>
 
-    <para>Call <literal>A</literal> the root file system.  If you used
-      <command>ls</command> to view the contents of this directory you
-      would see two subdirectories, <literal>A1</literal> and
+    <para>Call <literal>A</literal> the root file system.  If
+      &man.ls.1; is used to view the contents of this directory,
+      it will show two subdirectories, <literal>A1</literal> and
       <literal>A2</literal>.  The directory tree looks like
       this:</para>
 
@@ -1248,9 +1248,9 @@ root     5211  0.0  0.2  3620  1724   2 
     <para>This is similar, although not identical, to a &ms-dos;
       <command>join</command>.</para>
 
-    <para>Typically you create file systems when installing &os;
-      and decide where to mount them, and then never change them
-      unless you add a new disk.</para>
+    <para>Typically file systems are created when installing &os;
+      and never change
+      unless a new disk is added.</para>
 
     <para>It is entirely possible to have one large root file system,
       and not need to create any others.  There are some drawbacks to
@@ -1283,8 +1283,9 @@ root     5211  0.0  0.2  3620  1724   2 
       </listitem>
 
       <listitem>
-	<para>&os;'s file systems are very robust should you lose
-	  power.  However, a power loss at a critical point could
+	<para>&os;'s file systems are robust if
+	  power is lost.  However, a power loss at a critical point
+	  could
 	  still damage the structure of the file system.  By splitting
 	  data over multiple file systems it is more likely that the
 	  system will still come up, making it easier to restore from
@@ -1361,8 +1362,9 @@ root     5211  0.0  0.2  3620  1724   2 
 	    <entry>Normally the same size as the enclosing slice.
 	      This allows utilities that need to work on the entire
 	      slice, such as a bad block scanner, to work on the
-	      <literal>c</literal> partition.  You would not normally
-	      create a file system on this partition.</entry>
+	      <literal>c</literal> partition.  A file system would not
+	      normally be
+	      created on this partition.</entry>
 	  </row>
 
 	  <row>
@@ -1390,7 +1392,7 @@ root     5211  0.0  0.2  3620  1724   2 
       <literal>s</literal>, starting at 1.  So
       <quote>da0<emphasis>s1</emphasis></quote> is the first slice on
       the first SCSI drive.  There can only be four physical slices on
-      a disk, but you can have logical slices inside physical slices
+      a disk, but there can be logical slices inside physical slices
       of the appropriate type.  These extended slices are numbered
       starting at 5, so <quote>ad0<emphasis>s5</emphasis></quote> is
       the first extended slice on the first IDE disk.  These devices
@@ -1410,7 +1412,7 @@ root     5211  0.0  0.2  3620  1724   2 
     <para>Finally, each disk on the system is identified.  A disk name
       starts with a code that indicates the type of disk, and then a
       number, indicating which disk it is.  Unlike slices, disk
-      numbering starts at 0.  Common codes that you will see are
+      numbering starts at 0.  Common codes are
       listed in <xref linkend="basics-dev-codes"/>.</para>
 
     <para>When referring to a partition, include the disk name,
@@ -1586,8 +1588,9 @@ root     5211  0.0  0.2  3620  1724   2 
 
     <para>Another common reason to contain certain directory trees on
       other file systems is if they are to be housed on separate
-      physical disks, or are separate virtual disks, such as
-      <link linkend="network-nfs">Network File System</link> mounts,
+      physical disks, or are separate virtual disks, such as Network
+      File System  mounts, described in
+      <xref linkend="network-nfs"/>,
       or CDROM drives.</para>
 
     <sect2 id="disks-fstab">
@@ -1598,7 +1601,7 @@ root     5211  0.0  0.2  3620  1724   2 
 	<secondary>mounted with fstab</secondary>
       </indexterm>
 
-      <para>During the <link linkend="boot">boot process</link>,
+      <para>During the boot process (<xref linkend="boot"/>),
 	file systems listed in <filename>/etc/fstab</filename> are
 	automatically mounted except for the entries containing
 	<option>noauto</option>.  This file contains entries in the
@@ -1681,7 +1684,7 @@ root     5211  0.0  0.2  3620  1724   2 
     </sect2>
 
     <sect2 id="disks-mount">
-      <title>The <command>mount</command> Command</title>
+      <title>Using &man.mount.8;</title>
 
       <indexterm>
 	<primary>file systems</primary>
@@ -1808,14 +1811,14 @@ root     5211  0.0  0.2  3620  1724   2 
     </sect2>
 
     <sect2 id="disks-umount">
-      <title>The <command>umount</command> Command</title>
+      <title>Using &man.umount.8;</title>
 
       <indexterm>
 	<primary>file systems</primary>
 	<secondary>unmounting</secondary>
       </indexterm>
 
-      <para>To unmount a filesystem use &man.umount.8;.  This command
+      <para>To unmount a file system use &man.umount.8;.  This command
 	takes one parameter which can be a mountpoint, device name,
 	<option>-a</option> or <option>-A</option>.</para>
 
@@ -1843,7 +1846,7 @@ root     5211  0.0  0.2  3620  1724   2 
 
     <para>Each process is uniquely identified by a number called a
       <firstterm>process ID</firstterm>
-      (<firstterm>PID</firstterm>).  Similar to files, each process
+      (<acronym>PID</acronym>).  Similar to files, each process
       has one owner and group, and the owner and group permissions are
       used to determine which files and devices the process can open.
       Most processes also have a parent process that started them.
@@ -1851,17 +1854,18 @@ root     5211  0.0  0.2  3620  1724   2 
       the shell is a process which has the shell as its parent
       process.  The exception is a special process called
       &man.init.8; which is always the first process to start at boot
-      time and which always has a PID of 1.</para>
+      time and which always has a <acronym>PID</acronym> of 1.</para>
 
     <para>To see the processes on the system, use &man.ps.1; and
       &man.top.1;.   To display a static list of the currently running
-      processes, their PIDs, how much memory they are using, and the
-      command they were started with, use <command>ps</command>.  To
+      processes, their <acronym>PID</acronym>s, how much memory they
+      are using, and the
+      command they were started with, use &man.ps.1;.  To
       display all the running processes and update the display every
-      few seconds so that you can interactively see what the computer
-      is doing, use <command>top</command>.</para>
+      few seconds in order to interactively see what the computer
+      is doing, use &man.top.1;.</para>
 
-    <para>By default, <command>ps</command> only shows the commands
+    <para>By default, &man.ps.1; only shows the commands
       that are running and owned by the user.  For example:</para>
 
     <screen>&prompt.user; <userinput>ps</userinput>
@@ -1883,8 +1887,10 @@ root     5211  0.0  0.2  3620  1724   2 
 
     <para>The output from &man.ps.1; is organized into a number of
       columns.  The <literal>PID</literal> column displays the process
-      ID.  PIDs are assigned starting at 1, go up to 99999, then wrap
-      around back to the beginning.  However, a PID is not reassigned
+      ID.  <acronym>PID</acronym>s are assigned starting at 1, go up
+      to 99999, then wrap
+      around back to the beginning.  However, a <acronym>PID</acronym>
+      is not reassigned
       if it is already in use.  The <literal>TT</literal> column shows
       the tty the program is running on and <literal>STAT</literal>
       shows the program's state.  <literal>TIME</literal> is the
@@ -1926,7 +1932,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 ...</screen>
 
     <para>The output is split into two sections.  The header (the
-      first five lines) shows the PID of the last process to run, the
+      first five lines) shows the <acronym>PID</acronym> of the last
+      process to run, the
       system load averages (which are a measure of how busy the system
       is), the system uptime (time since the last reboot) and the
       current time.  The other figures in the header relate to how
@@ -1935,7 +1942,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       spending in different CPU states.</para>
 
     <para>Below the header is a series of columns containing similar
-      information to the output from &man.ps.1;, such as the PID,
+      information to the output from &man.ps.1;, such as the
+      <acronym>PID</acronym>,
       username, amount of CPU time, and the command that started the
       process.  By default, &man.top.1; also displays the amount of
       memory space taken by the process.  This is split into two
@@ -1973,13 +1981,13 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       daemons with a trailing <quote>d</quote>.
       <application>BIND</application> is the Berkeley Internet Name
       Domain, but the actual program that executes is
-      <command>named</command>.  The <application>Apache</application>
+      &man.named.8;.  The <application>Apache</application>
       web server program is <command>httpd</command> and the
-      line printer spooling daemon is <command>lpd</command>.  This is
+      line printer spooling daemon is &man.lpd.8;.  This is
       only a naming convention.  For example, the main mail daemon for
       the <application>Sendmail</application> application is
-      <command>sendmail</command>, and not
-      <command>maild</command>.</para>
+      &man.sendmail.8;, and not
+      <literal>maild</literal>.</para>
 
     <para>One way to communicate with a daemon, or any running
       process, is to send a <firstterm>signal</firstterm> using
@@ -2041,14 +2049,16 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <title>Sending a Signal to a Process</title>
 
       <para>This example shows how to send a signal to &man.inetd.8;.
-	The <command>inetd</command> configuration file is
+	The &man.inetd.8; configuration file is
 	<filename>/etc/inetd.conf</filename>, and
-	<command>inetd</command> will re-read this configuration file
+	&man.inetd.8; will re-read this configuration file
 	when it is sent a <literal>SIGHUP</literal>.</para>
 
       <step>
-	<para>Find the PID of the process you want to send the signal
-	  to using &man.pgrep.1;.  In this example, the PID for
+	<para>Find the <acronym>PID</acronym> of the process to send
+	  the signal
+	  to using &man.pgrep.1;.  In this example, the
+	  <acronym>PID</acronym> for
 	  &man.inetd.8; is 198:</para>
 
 	<screen>&prompt.user; <userinput>pgrep -l inetd</userinput>
@@ -2066,12 +2076,14 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 &prompt.root; <userinput>/bin/kill -s HUP 198</userinput></screen>
 
 	<para>Like most &unix; commands, &man.kill.1; will not print
-	  any output if it is successful.  If you send a signal to a
-	  process that you do not own, you will instead see
+	  any output if it is successful.  If a signal is sent to a
+	  process not owned by that user, the message
 	  <errorname>kill: <replaceable>PID</replaceable>: Operation
-	    not permitted</errorname>.  Mistyping the PID will either
+	    not permitted</errorname> will be displayed.  Mistyping
+	  the <acronym>PID</acronym> will either
 	  send the signal to the wrong process, which could have
-	  negative results, or will send the signal to a PID that is
+	  negative results, or will send the signal to a
+	  <acronym>PID</acronym> that is
 	  not currently in use, resulting in the error
 	  <errorname>kill: <replaceable>PID</replaceable>: No such
 	    process</errorname>.</para>
@@ -2098,7 +2110,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 
     <important>
       <para>Killing a random process on the system can be a bad idea.
-	In particular, &man.init.8;, PID 1, is special.  Running
+	In particular, &man.init.8;, <acronym>PID</acronym> 1, is
+	special.  Running
 	<command>/bin/kill -s KILL 1</command> is a quick, and
 	unrecommended, way to shutdown the system.
 	<emphasis>Always</emphasis> double check the arguments to
@@ -2118,14 +2131,15 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       them.  Many shells provide built in functions to help with
       everyday tasks such as file management, file globbing, command
       line editing, command macros, and environment variables.  &os;
-      comes with several shells, including <command>sh</command>, the
-      Bourne Shell, and <command>tcsh</command>, the improved C-shell.
+      comes with several shells, including the
+      Bourne shell (&man.sh.1;) and the extended C shell
+      (&man.tcsh.1;).
       Other shells are available from the &os; Ports Collection, such
       as <command>zsh</command> and <command>bash</command>.</para>
 
     <para>The shell that is used is really a matter of taste.  A C
       programmer might feel more comfortable with a C-like shell such
-      as <command>tcsh</command>.  A Linux user might prefer
+      as &man.tcsh.1;.  A &linux; user might prefer
       <command>bash</command>.  Each shell has unique properties that
       may or may not work with a user's preferred working environment,
       which is why there is a choice of which shell to use.</para>
@@ -2182,7 +2196,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 
 	  <row>
 	    <entry><envar>DISPLAY</envar></entry>
-	    <entry>Network name of the <application>Xorg</application>
+	    <entry>Network name of the
+	      <application>&xorg;</application>
 	      display to connect to, if available.</entry>
 	  </row>
 
@@ -2237,13 +2252,13 @@ Swap: 256M Total, 38M Used, 217M Free, 1
     <indexterm><primary>Bourne shells</primary></indexterm>
 
     <para>How to set an environment variable differs between shells.
-      In <command>tcsh</command> and <command>csh</command>, use
+      In &man.tcsh.1; and &man.csh.1;, use
       <command>setenv</command> to set environment variables.  In
-      <command>sh</command> and <command>bash</command>, use
+      &man.sh.1; and <command>bash</command>, use
       <command>export</command> to set the current environment
       variables.  This example sets the default <envar>EDITOR</envar>
       to <filename>/usr/local/bin/emacs</filename> for the
-      <command>tcsh</command> shell:</para>
+      &man.tcsh.1; shell:</para>
 
     <screen>&prompt.user; <userinput>setenv EDITOR /usr/local/bin/emacs</userinput></screen>
 
@@ -2264,8 +2279,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       represents any number of characters in a filename.
       Meta-characters can be used to perform filename globbing.  For
       example, <command>echo *</command> is equivalent to
-      <command>ls</command> because the shell takes all the files that
-      match <literal>*</literal> and <command>echo</command> lists
+      &man.ls.1; because the shell takes all the files that
+      match <literal>*</literal> and &man.echo.1; lists
       them on the command line.</para>
 
     <para>To prevent the shell from interpreting a special character,
@@ -2282,7 +2297,7 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 	to use <command>chsh</command>.  Running this command will
 	open the editor that is configured in the
 	<envar>EDITOR</envar> environment variable, which by default
-	is set to <command>vi</command>.  Change
+	is set to &man.vi.1;.  Change
 	the <quote>Shell:</quote> line to the full path of the
 	new shell.</para>
 
@@ -2295,15 +2310,16 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <note>
 	<para>The new shell <emphasis>must</emphasis> be present in
 	  <filename>/etc/shells</filename>.  If the shell was
-	  installed from the &os; <link linkend="ports">Ports
-	    Collection</link>, it should be automatically added to
+	  installed from the &os; Ports
+	  Collection as described in <xref linkend="ports"/>, it
+	  should be automatically added to
 	  this file.  If it is missing, add it using this
 	  command, replacing the path with the path of the
 	  shell:</para>
 
 	<screen>&prompt.root; <userinput>echo <replaceable>/usr/local/bin/bash</replaceable> >> /etc/shells</userinput></screen>
 
-	<para>Then rerun <command>chsh</command>.</para>
+	<para>Then rerun &man.chsh.1;.</para>
       </note>
     </sect2>
   </sect1>
@@ -2324,10 +2340,10 @@ Swap: 256M Total, 38M Used, 217M Free, 1
     </indexterm>
     <indexterm>
       <primary>editors</primary>
-      <secondary><command>ee</command></secondary>
+      <secondary>&man.ee.1;</secondary>
     </indexterm>
 
-    <para>A simple editor to learn is <application>ee</application>,
+    <para>A simple editor to learn is &man.ee.1;,
       which stands for easy editor.  To start this editor, type
       <command>ee <replaceable>filename</replaceable></command> where
       <replaceable>filename</replaceable> is the name of the file to
@@ -2337,18 +2353,18 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <keycap>Ctrl</keycap>, so <literal>^e</literal> expands to
       <keycombo
 	action="simul"><keycap>Ctrl</keycap><keycap>e</keycap></keycombo>.
-      To leave <application>ee</application>, press
+      To leave &man.ee.1;, press
       <keycap>Esc</keycap>, then choose the <quote>leave
 	editor</quote> option from the main menu.  The editor will
-      prompt you to save any changes if the file has been
+      prompt to save any changes if the file has been
       modified.</para>
 
     <indexterm>
-      <primary><command>vi</command></primary>
+      <primary>&man.vi.1;</primary>
     </indexterm>
     <indexterm>
       <primary>editors</primary>
-      <secondary><command>vi</command></secondary>
+      <secondary>&man.vi.1;</secondary>
     </indexterm>
     <indexterm>
       <primary><command>emacs</command></primary>
@@ -2358,8 +2374,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <secondary><command>emacs</command></secondary>
     </indexterm>
 
-    <para>&os; also comes with more powerful text editors such as
-      <application>vi</application> as part of the base system.
+    <para>&os; also comes with more powerful text editors, such as
+      &man.vi.1;, as part of the base system.
       Other editors, like <filename
 	role="package">editors/emacs</filename> and
       <filename role="package">editors/vim</filename>, are part of the
@@ -2372,8 +2388,7 @@ Swap: 256M Total, 38M Used, 217M Free, 1
     <para>Many applications which modify files or require typed input
       will automatically open a text editor.  To alter the default
       editor used, set the <envar>EDITOR</envar> environment
-      variable as described in the <link
-	linkend="shells">shells</link> section.</para>
+      variable as described in <xref linkend="shells"/>.</para>
   </sect1>
 
   <sect1 id="basics-devices">
@@ -2529,7 +2544,7 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       cross compilers and plugging in different formats.  Those who
       wanted to build cross compilers targeting &os; were out of luck
       since the older sources that &os; had for
-      <application>as</application> and <application>ld</application>
+      &man.as.1; and &man.ld.1;
       were not up to the task.  The new GNU tools chain
       (<application>binutils</application>) supports cross
       compiling, <acronym>ELF</acronym>, shared libraries, and C++
@@ -2568,8 +2583,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <screen>&prompt.user; <userinput>man <replaceable>command</replaceable></userinput></screen>
 
       <para>where <replaceable>command</replaceable> is the name of
-	the command you wish to learn about.  For example, to learn
-	more about <command>ls</command>, type:</para>
+	the command to learn about.  For example, to learn
+	more about &man.ls.1;, type:</para>
 
       <screen>&prompt.user; <userinput>man ls</userinput></screen>
 
@@ -2616,21 +2631,21 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 
       <para>In some cases, the same topic may appear in more than one
 	section of the online manual.  For example, there is a
-	<command>chmod</command> user command and a
+	&man.chmod.1; user command and a
 	<function>chmod()</function> system call.  To tell
-	<command>man</command> which section to display, specify the
+	&man.man.1; which section to display, specify the
 	section number:</para>
 
       <screen>&prompt.user; <userinput>man 1 chmod</userinput></screen>
 
       <para>This will display the manual page for the user command
-	<command>chmod</command>.  References to a particular section
+	&man.chmod.1;.  References to a particular section
 	of the online manual are traditionally placed in parenthesis
 	in written documentation, so &man.chmod.1; refers to the
-	<command>chmod</command> user command and &man.chmod.2; refers
+	user command and &man.chmod.2; refers
 	to the system call.</para>
 
-      <para>If you do not know the command name, use <command>man
+      <para>If the command name is unknown, use <command>man
 	  -k</command> to search for keywords in the command
 	descriptions:</para>
 
@@ -2665,7 +2680,7 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 	by the Free Software Foundation (FSF).  In addition to manual
 	pages, these programs may include hypertext documents called
 	<literal>info</literal> files.  These can be viewed using
-	<command>info</command> or, if <filename
+	&man.info.1; or, if <filename
 	  role="package">editors/emacs</filename> is installed, the
 	info mode of <application>emacs</application>.</para>
 


More information about the svn-doc-projects mailing list