- Finish properly sentences with fullstops.

- Change FreeBSD Power Pak to PowerPak (as FreeBSD Mall lists it).
- Change packages -> applications.  Packages do not have compile time
  options.
- Add tags <username>, <option>, <keycap>, <replaceable>, <filename>
  and <makevar> at a few places.
- Add index entry for pkg_version.

PR:		docs/36624
Submitted by:	Martin Heinen <martin@sumuk.de>

en_US.ISO8859-1/books/handbook/ports/chapter.sgml

@@ -158,7 +158,7 @@
       </listitem>
 
       <listitem>
-	<para>Some packages have compile time options relating to what they
+	<para>Some applications have compile time options relating to what they
 	  can and cannot do.  For example, <application>Apache</application>
 	  can be configured with a wide variety of different built-in options.
 	  By building from the port you do not have to accept the default
@@ -306,7 +306,7 @@ local: lsof-4.56.4.tgz remote: lsof-4.56.4.tgz
 
       <para>If you do not have a source of local packages (such as a
         FreeBSD CDROM set) then it will probably be easier to use the
-        -r option to &man.pkg.add.1;.  This will cause the utility to
+        <option>-r</option> option to &man.pkg.add.1;.  This will cause the utility to
         automatically determine the correct object format and release
         and then to fetch and install the package from an FTP site.
       </para>
@@ -376,6 +376,9 @@ docbook-1.2         Meta-port for the different versions of the DocBook DTD
         versions of all installed packages.  It compares the package 
         version to the current version found in the ports tree.
       </para> 
+      <indexterm>
+        <primary><command>pkg_version</command></primary>
+      </indexterm>
         <screen>&prompt.root; <userinput>pkg_version</userinput>
 cvsup                       =
 docbook                     =
@@ -460,7 +463,7 @@ docbook                     =
 	  install the ports collection.</para>
 
 	<step>
-	  <para>As root, run <command>/stand/sysinstall</command> as
+	  <para>As <username>root</username>, run <command>/stand/sysinstall</command> as
 	    shown below:</para>
 
 	  <screen>&prompt.root; /stand/sysinstall</screen>
@@ -468,22 +471,22 @@ docbook                     =
 
 	<step>
 	  <para>Scroll down and select <literal>Configure</literal>,
-	    Press Enter</para>
+	    press <keycap>Enter</keycap>.</para>
 	</step>
 
 	<step>
 	  <para>Scroll down and select
-	    <literal>Distributions</literal>, Press Enter</para>
+	    <literal>Distributions</literal>, press <keycap>Enter</keycap>.</para>
 	</step>
 
 	<step>
-	  <para>Scroll down to <literal>ports</literal>, Press the
+	  <para>Scroll down to <literal>ports</literal>, press
-	    Space key</para>
+	    <keycap>Space</keycap>.</para>
 	</step>
 
 	<step>
-	  <para>Scroll up to <literal>Exit</literal>, Press
+	  <para>Scroll up to <literal>Exit</literal>, press
-	    Enter</para>
+	    <keycap>Enter</keycap>.</para>
 	</step>
 
 	<step>
@@ -492,7 +495,7 @@ docbook                     =
 	</step>
 
 	<step>
-	  <para>Follow the menus to Exit <application>sysinstall</application></para>
+	  <para>Follow the menus to exit <application>sysinstall</application>.</para>
 	</step>
       </procedure>
 
@@ -521,18 +524,18 @@ docbook                     =
 	</step>
 
 	<step>
-	  <para>As root, copy
+	  <para>As <username>root</username>, copy
 	    <filename>/usr/share/examples/cvsup/ports-supfile</filename>
 	    to a new location, such as <filename>/root</filename> or your
-	      home directory</para>
+	      home directory.</para>
 	</step>
 
 	<step>
-	  <para>Edit <filename>ports-supfile</filename></para>
+	  <para>Edit <filename>ports-supfile</filename>.</para>
 	</step>
 
 	<step>
-	  <para>Change <literal>CHANGE_THIS.FreeBSD.org</literal> to a
+	  <para>Change <replaceable>CHANGE_THIS.FreeBSD.org</replaceable> to a
 	    <application>CVSup</application> near you.  See <link
 	      linkend="cvsup-mirrors">CVSup Mirrors</link> (<xref
 	      linkend="cvsup-mirrors">) for a complete listing of mirror
@@ -540,9 +543,9 @@ docbook                     =
 	</step>
 
 	<step>
-	  <para>Run <command>cvsup -g -L 2 &lt;path_to_supfile&gt;</command></para>
+	  <para>Run <command>cvsup</command>:</para>
 
-	  <screen>&prompt.root; cvsup -g -L 2 /root/ports-supfile</screen>
+	  <screen>&prompt.root; cvsup -g -L 2 <replaceable>/root/ports-supfile</replaceable></screen>
 	</step>
 
 	<step>
@@ -634,9 +637,9 @@ docbook                     =
 	deciding to install it.</para>
 
       <para>Another method is to use the <command>whereis</command>
-        command.  To use <command>whereis</command>, simply type
+        command.  Simply type <command>whereis <replaceable>file</replaceable></command>,
-	<quote><command>whereis &lt;program you want to
+	where <replaceable>file</replaceable> ist the program you want to
-	install&gt;</command></quote> at the prompt, and if it is found on
+	install.  If it is found on
         your system, you will be told where it is, like so:</para>
 
       <screen>&prompt.root; <userinput>whereis lsof</userinput>
@@ -650,8 +653,8 @@ lsof: /usr/ports/sysutils/lsof</screen>
         ports collection's built-in search mechanism.  To use the search
         feature, you will need to be in the
 	<filename>/usr/ports</filename> directory.  Once in that
-	directory, run <command>make search name=program-name</command>
+	directory, run <command>make search name=<replaceable>program-name</replaceable></command>
-	where <quote>program-name</quote> is the name of the program you
+	where <replaceable>program-name</replaceable> is the name of the program you
 	want to find.  For example, if you were looking for 
 	<command>lsof</command>:</para>
 
@@ -672,8 +675,8 @@ R-deps: </screen>
 	here.</para>
 
       <para>For more in-depth searching you can also use
-       <command>make search key=string</command> where 
+       <command>make search key=<replaceable>string</replaceable></command> where 
-       <quote>string</quote> is some text to search for.  This searches 
+       <replaceable>string</replaceable> is some text to search for.  This searches 
        port names, comments, descriptions and dependencies and can be used 
        to find ports which relate to a particular subject if you don't 
        know the name of the program you are looking for.</para>
@@ -709,7 +712,7 @@ R-deps: </screen>
         <para>The FreeBSD Project's official CDROM images no longer
 	  include distfiles.  They take up a lot of room that is
 	  better used by precompiled packages.  CDROM products such as
-	  the FreeBSD Power Pak do include distfiles, and you can
+	  the FreeBSD PowerPak do include distfiles, and you can
 	  order these sets from a vendor such as the <ulink
 	  url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>.
 	  This section assumes you have such a FreeBSD CDROM
@@ -919,11 +922,11 @@ Receiving lsof_4.57D.freebsd.tar.gz (439860 bytes): 100%
 	<para>If you are not sure which version of the application was just
 	  installed, a command like this</para>
 
-	<screen>&prompt.root; <userinput>pkg_info | grep foopackage</userinput></screen>
+	<screen>&prompt.root; <userinput>pkg_info | grep <replaceable>foopackage</replaceable></userinput></screen>
 
 	<para>will find all the installed packages that have
-	  <literal>foopackage</literal> in the package name.  Replace
+	  <replaceable>foopackage</replaceable> in the package name.  Replace
-	  <literal>foopackage</literal> in your commandline as
+	  <replaceable>foopackage</replaceable> in your commandline as
 	  necessary.</para>
       </listitem>
 
@@ -940,7 +943,7 @@ Receiving lsof_4.57D.freebsd.tar.gz (439860 bytes): 100%
 	  you are not sure of the web site address it may be listed in the
 	  output from</para>
 
-	<screen>&prompt.root; <userinput>pkg_info foopackage-1.0.0</userinput></screen>
+	<screen>&prompt.root; <userinput>pkg_info <replaceable>foopackage-1.0.0</replaceable></userinput></screen>
 	
 	<para>will often include a <literal>WWW:</literal> line with the URL
 	  of the application's web site.</para>
@@ -1062,8 +1065,8 @@ Receiving lsof_4.57D.freebsd.tar.gz (439860 bytes): 100%
 
 	  <para>The reason why you got all those error messages was
 	    because you were not connected to the Internet at the time.
-	    Once you have downloaded it from any of the MASTER_SITES
+	    Once you have downloaded it from any of the <makevar>MASTER_SITES</makevar>
-	    (listed in the Makefile), you can restart the install
+	    (listed in the <filename>Makefile</filename>), you can restart the install
 	    process.</para>
 	  </answer>
 	</qandaentry>
@@ -1170,7 +1173,7 @@ Receiving lsof_4.57D.freebsd.tar.gz (439860 bytes): 100%
 	  <para>I know it is probably faster to fetch the tarballs from
 	    one of the FreeBSD mirror sites close by.  Is there any way
 	    to tell the port to fetch them from servers other than the
-	    ones listed in the MASTER_SITES?</para>
+	    ones listed in the <makevar>MASTER_SITES</makevar>?</para>
 	  </question>
 
 	  <answer>
@@ -1201,8 +1204,12 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
 	  <question>
 	  <para>Is there any way to stop the port from compiling?  I
 	    want to do some hacking on the source before I install it,
-	    but it is a bit tiresome to watch it and hit control-C every
+	    but it is a bit tiresome to watch it and hit
-	    time.</para>
+	    <keycombo action="simul">
+	      <keycap>Ctrl</keycap>
+	      <keycap>C</keycap>
+	    </keycombo>
+	    every time.</para>
 	  </question>
 
 	  <answer>
@@ -1361,8 +1368,8 @@ arcade game.</screen>
 	    port.</para>
 
 	  <tip><para>It is possible to achieve the same effect without
-		recursively calling each makefile.  For example, you
+		recursively calling each <filename>Makefile</filename>.  For example, you
-		can delete all of the work subdirectories directly
+		can delete all of the <filename>work/</filename> subdirectories directly
 		with the following command:
 	    <screen>&prompt.root; <userinput>find /usr/ports -depth -name work -exec rm -rf {} \;</userinput></screen></para>
 	    </tip>