Various fixes for typos and grammar by Leonard Schmidt.

16 files changed, 130 insertions, 136 deletions

diff --git a/doc/guide/files/binary.xml b/doc/guide/files/binary.xml
index 2d8a47a699f..afe1daa3789 100644
--- a/doc/guide/files/binary.xml
+++ b/doc/guide/files/binary.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: binary.xml,v 1.14 2005/07/27 21:29:50 rpaulo Exp $ -->
+<!-- $NetBSD: binary.xml,v 1.15 2005/09/02 19:12:37 rillig Exp $ -->
 
 <chapter id="binary">
   <title>Creating binary packages</title>
@@ -9,7 +9,7 @@
     <para>
       Once you have built and installed a package, you can create a
       <emphasis>binary package</emphasis> which can be installed on
-      another system with &man.pkg.add.1; This saves having to build
+      another system with &man.pkg.add.1;. This saves having to build
       the same package on a group of hosts and wasting CPU time. It
       also provides a simple means for others to install your package,
       should you distribute it.
@@ -99,7 +99,7 @@ _ACCEPTABLE=    yes</programlisting>
 	<title><filename>pre-build.local</filename></title>
 
 	<para>It is possible to configure the bulk build to perform
-	  certain site specific tasks at the end of the pre-build
+	  certain site-specific tasks at the end of the pre-build
 	  stage.  If the file 
 	  <filename>pre-build.local</filename> exists in
 	  <filename>/usr/pkgsrc/mk/bulk</filename>, it will be executed
@@ -269,7 +269,7 @@ fi</programlisting>
     </sect2>
 
     <sect2 id="setting-up-a-sandbox">
-      <title>Setting up a sandbox for chroot'ed builds</title>
+      <title>Setting up a sandbox for chrooted builds</title>
 
       <para>
         If you don't want all the packages nuked from a machine
@@ -393,7 +393,7 @@ fi</programlisting>
 	</step>
       </procedure>
 
-      <para>When the chroot sandbox is setup, you can start
+      <para>When the chroot sandbox is set up, you can start
 	the build with the following steps:</para>
 
       <screen>&rprompt; <userinput>cd /usr/sandbox/usr/pkgsrc</userinput>
@@ -413,7 +413,7 @@ fi</programlisting>
       <para> In addition to building a complete set of all packages in
         pkgsrc, the <filename>pkgsrc/mk/bulk/build</filename> script
         may be used to build a subset of the packages contained in
-        pkgsrc.  By setting defining <varname>SPECIFIC_PKGS</varname>
+        pkgsrc.  By setting <varname>SPECIFIC_PKGS</varname>
         in <filename>/etc/mk.conf</filename>, the variables</para>
 
       <itemizedlist>
@@ -468,7 +468,7 @@ fi</programlisting>
       <screen>RSYNC_DST=$CVS_USER@ftp.NetBSD.org:/pub/NetBSD/packages/pkgsrc-200xQy/NetBSD-a.b.c/arch/upload </screen>
 
       <para>
-        Please use appropviate values for "pkgsrc-200xQy",
+        Please use appropriate values for "pkgsrc-200xQy",
         "NetBSD-a.b.c" and "arch" here. If your login on
         ftp.NetBSD.org is different from <varname>CVS_USER</varname>,
         write your login directly into the variable, e.g. my local
@@ -494,7 +494,7 @@ fi</programlisting>
 
       <para>
         Before uploading the binary pkgs, ssh authentication needs to
-        be set up. This example shows how to setup temporary keys
+        be set up. This example shows how to set up temporary keys
         for the root account <emphasis>inside the sandbox</emphasis>
         (assuming that no keys should be present there usually):
       </para>
@@ -569,7 +569,7 @@ nbftp% <userinput>chmod 755 .</userinput> </screen>
       <filename role="pkg">pkgtools/cdpack</filename> package provides 
       a simple tool for creating the ISO 9660 images. 
       <command>cdpack</command> arranges the packages on the CD-ROMs in a 
-      way that keeps all the dependencies for given package on the same 
+      way that keeps all the dependencies for a given package on the same 
       CD as that package.
     </para>
 
@@ -578,7 +578,7 @@ nbftp% <userinput>chmod 755 .</userinput> </screen>
 
       <para>
         Complete documentation for cdpack is found in the cdpack(1)
-        manpage. The following short example assumes that the binary
+        man page. The following short example assumes that the binary
         packages are left in
         <filename>/usr/pkgsrc/packages/All</filename> and that
         sufficient disk space exists in <filename>/u2</filename> to
diff --git a/doc/guide/files/build.xml b/doc/guide/files/build.xml
index 635b5e5494a..334dca88795 100644
--- a/doc/guide/files/build.xml
+++ b/doc/guide/files/build.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: build.xml,v 1.9 2005/07/27 21:29:50 rpaulo Exp $ -->
+<!-- $NetBSD: build.xml,v 1.10 2005/09/02 19:12:37 rillig Exp $ -->
 
 <chapter id="build">
   <title>The build process</title>
@@ -55,8 +55,8 @@
       </listitem>
 
       <listitem>
-	<para>X11 based are special in that they may be installed in either
-	  <varname>X11BASE</varname> or <varname>LOCALBASE</varname>.</para>
+	<para>X11-based packages are special in that they may be installed in
+	  either <varname>X11BASE</varname> or <varname>LOCALBASE</varname>.</para>
 
 	<para>Usually, X11 packages should be installed under
 	  <varname>LOCALBASE</varname> whenever possible.  Note that you will
@@ -202,8 +202,8 @@ CONFIGURE_ARGS+=        --with-guile-prefix=${LOCALBASE}        \
 	    <filename>.shar.Z</filename>, <filename>.shar</filename>,
 	    <filename>.Z</filename>, <filename>.bz2</filename> and
 	    <filename>.gz</filename>; see the definition of the
-	    various <varname>DECOMPRESS_CMD</varname> variables
-	    <filename>bsd.pkg.mk</filename> for a complete
+	    various <varname>DECOMPRESS_CMD</varname> variables in
+	    <filename>bsd.pkg.extract.mk</filename> for a complete
 	    list). Here's an example on how to use the other variables
 	    for a program that comes with a compressed shell archive
 	    whose name ends in <filename>.msg.gz</filename>:</para>
@@ -409,7 +409,7 @@ make build</programlisting>
 	    updating in case a previous <command>make update</command> was interrupted
 	    for some reason.  However, in this case, make sure you don't call
 	    <command>make clean</command> or otherwise remove the list of dependent
-	    packages in <varname>WRKDIR</varname>.  Otherwise you lose the
+	    packages in <varname>WRKDIR</varname>.  Otherwise, you lose the
 	    ability to automatically update the current package along with the
 	    dependent packages you have installed.</para>
 
@@ -489,10 +489,10 @@ make build</programlisting>
 	    <command>make update</command> and only if you have a dirty package tree
 	    (e.g., if you used <varname>NOCLEAN</varname>).</para>
 
-	  <para>If you unsure about whether your tree is clean you can either perform
-	    a <command>make clean</command> at the top of the tree, or use the
-	    following sequence of commands from the directory of the package you
-	    want to update (<emphasis>before</emphasis> running
+	  <para>If you are unsure about whether your tree is clean, you can either
+	    perform a <command>make clean</command> at the top of the tree, or use
+	    the following sequence of commands from the directory of the package
+	    you want to update (<emphasis>before</emphasis> running
 	    <command>make update</command> for the first time, otherwise you lose
 	    all the packages you wanted to update!):</para>
 
@@ -669,10 +669,10 @@ make build</programlisting>
 	<listitem>
 	  <para>Used to do bulk builds. If an appropriate binary package already exists,
 	    no action is taken. If not, this target will compile, install and
-	    package it (and it's depends, if <varname>PKG_DEPENDS</varname> is
-	    set properly. See <xref linkend="binary.configuration"/>.
+	    package it (and its depends, if <varname>PKG_DEPENDS</varname> is
+	    set properly. See <xref linkend="binary.configuration"/>).
 	    After creating the binary
-	    package, the sources, the just-installed package and it's required
+	    package, the sources, the just-installed package and its required
 	    packages are removed, preserving free disk space.</para>
 
 	  <para><emphasis>Beware that this target may deinstall all
@@ -685,11 +685,11 @@ make build</programlisting>
 
 	<listitem>
 	  <para>Used during bulk-installs to install required packages. If an
-	    upto-date binary package is available, it will be installed via
+	    up-to-date binary package is available, it will be installed via
 	    &man.pkg.add.1;. If not, <command>make bulk-package</command> will be executed,
-	    but the installed binary not be removed. </para>
+	    but the installed binary won't be removed. </para>
 
-	  <para> A binary package is considered <quote>upto-date</quote> to be
+	  <para> A binary package is considered <quote>up-to-date</quote> to be
 	    installed via &man.pkg.add.1; if:</para>
 
 	  <itemizedlist>
diff --git a/doc/guide/files/buildlink.xml b/doc/guide/files/buildlink.xml
index 740d34913b3..1aa3d93705b 100644
--- a/doc/guide/files/buildlink.xml
+++ b/doc/guide/files/buildlink.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: buildlink.xml,v 1.6 2005/07/27 21:29:50 rpaulo Exp $ -->
+<!-- $NetBSD: buildlink.xml,v 1.7 2005/09/02 19:12:37 rillig Exp $ -->
 
 <chapter id="buildlink">
   <title>Buildlink methodology</title>
@@ -88,7 +88,7 @@
       </listitem>
 
       <listitem>
-	<para><filename>curses.buildlink3.mk</filename> If the system
+	<para><filename>curses.buildlink3.mk</filename>: If the system
           comes with neither Curses nor NCurses, this will take care
 	  to install the <filename 
 	    role="pkg">devel/ncurses</filename> package.</para>  
@@ -106,13 +106,13 @@
 	  for a system-provided
 	  Motif installation or adds a dependency on <filename 
 	    role="pkg">x11/lesstif</filename> or
-	  <filename role="pkg">x11/openmotif</filename>;</para>
+	  <filename role="pkg">x11/openmotif</filename>.</para>
       </listitem>
 
       <listitem>
 	<para><filename>ossaudio.buildlink3.mk</filename> defines several
 	  variables that may be used by packages that use the
-	  Open Sound System (OSS) API;</para>
+	  Open Sound System (OSS) API.</para>
       </listitem>
 
       <listitem>
@@ -125,7 +125,7 @@
 	<para><filename>pthread.buildlink3.mk</filename> uses the value of
 	  <varname>PTHREAD_OPTS</varname> and checks for native pthreads or adds
 	  a dependency on <filename 
-	    role="pkg">devel/pth</filename> as needed;</para>
+	    role="pkg">devel/pth</filename> as needed.</para>
       </listitem>
 
       <listitem>
@@ -234,7 +234,7 @@ BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH:S/+$//} </programlisting>
         <listitem>
 	  <para> <varname>BUILDLINK_PKGSRCDIR.<replaceable>pkg</replaceable></varname>
 	    is the location of the <replaceable>pkg</replaceable>
-	    pkgsrc directory;</para> 
+	    pkgsrc directory.</para> 
 	</listitem>
 	
         <listitem>
@@ -359,7 +359,7 @@ BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH:S/+$//} </programlisting>
       <orderedlist>
         <listitem>
 	  <para> if the sonames (major number of the library version)
-	    of any installed shared libraries change; </para>
+	    of any installed shared libraries change. </para>
         </listitem>
 
         <listitem>
diff --git a/doc/guide/files/components.xml b/doc/guide/files/components.xml
index e12b833067b..829bdc45fa0 100644
--- a/doc/guide/files/components.xml
+++ b/doc/guide/files/components.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: components.xml,v 1.12 2005/08/04 17:38:06 gdt Exp $ -->
+<!-- $NetBSD: components.xml,v 1.13 2005/09/02 19:12:37 rillig Exp $ -->
 
 <chapter id="components"> <?dbhtml filename="components.html"?>
   <title>Package components - files, directories and contents</title>
@@ -100,9 +100,9 @@ converters    games         mbone         print         x11</programlisting>
 	  <para>If the package has multiple
 	    <varname>DISTFILES</varname> or multiple
 	    <varname>PATCHFILES</varname> from different
-	    sites, set <varname>SITES_foo</varname> to a list of URI's
+	    sites, set <varname>SITES_foo</varname> to a list of URIs
 	    where file <quote>foo</quote> may be
-	    found. <quote>foo</quote> includes the suffix, e.g.</para>
+	    found. <quote>foo</quote> includes the suffix, e.g.:</para>
 	  <programlisting>DISTFILES=      ${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=     foo-file.tar.gz
 SITES_foo-file.tar.gz=http://www.somewhere.com/somehow/ \
@@ -131,7 +131,7 @@ SITES_foo-file.tar.gz=http://www.somewhere.com/somehow/ \
     <para>The second section contains information about separately
       downloaded patches, if any.
       <itemizedlist>
-	<listitem><para><varname>PATCHFILES</varname>
+	<listitem><para><varname>PATCHFILES:</varname>
 	  Name(s) of additional files that contain distribution patches.
 	  There is no default. pkgsrc will look for them at
 	  <varname>PATCH_SITES</varname>.
@@ -187,7 +187,7 @@ SITES_foo-file.tar.gz=http://www.somewhere.com/somehow/ \
 
     <itemizedlist>
       <listitem>
-        <para>Add <varname>MANCOMPRESSED</varname> if manpages are installed in
+        <para>Add <varname>MANCOMPRESSED</varname> if man pages are installed in
           compressed form by the package; see comment in
           <filename>bsd.pkg.mk</filename>.</para>
       </listitem>
@@ -258,7 +258,7 @@ SITES_foo-file.tar.gz=http://www.somewhere.com/somehow/ \
       problems. (To force patches to apply
       with fuzz you can set <varname>PATCH_FUZZ_FACTOR=-F2</varname>).
       Furthermore, do not put changes for more than one file into a single
-      patch-file, as this will make future modifications more difficult.</para>
+      patch file, as this will make future modifications more difficult.</para>
 
     <para>Similar, a file should be patched at most once, not several times by
       several different patches. If a file needs several patches, they should
@@ -300,7 +300,7 @@ SITES_foo-file.tar.gz=http://www.somewhere.com/somehow/ \
       <quote>category/package</quote> structure as pkgsrc, and patches are
       expected to be stored inside these dirs (also known as
       <filename>$LOCALPATCHES/$PKGPATH</filename>). For
-      example if you want to keep a private patch for
+      example, if you want to keep a private patch for
       <filename>pkgsrc/graphics/png</filename>, keep
       it in <filename>$LOCALPATCHES/graphics/png/mypatch</filename>. All
       files in the named directory are expected to be patch files, and
@@ -392,7 +392,7 @@ SITES_foo-file.tar.gz=http://www.somewhere.com/somehow/ \
   <sect1 id="work-dir">
     <title><filename>work*</filename></title>
 
-    <para>When you type <command>make</command> the distribution files are
+    <para>When you type <command>make</command>, the distribution files are
       unpacked into the directory denoted by
       <varname>WRKDIR</varname>. It can be removed by running
       <command>make clean</command>. Besides the sources, this
diff --git a/doc/guide/files/configuring.xml b/doc/guide/files/configuring.xml
index 0db70dfc73e..482bc309025 100644
--- a/doc/guide/files/configuring.xml
+++ b/doc/guide/files/configuring.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: configuring.xml,v 1.5 2005/08/03 16:34:19 wiz Exp $ -->
+<!-- $NetBSD: configuring.xml,v 1.6 2005/09/02 19:12:37 rillig Exp $ -->
 
 <chapter id="configuring">
   <title>Configuring pkgsrc</title>
@@ -6,9 +6,9 @@
   <sect1 id="general-configuration">
     <title>General configuration</title>
 
-    <para>In this section you can find some variables that apply all
-      pkgsrc packages.  The preferred method of setting them is by
-      setting them in <filename>/etc/mk.conf</filename>.
+    <para>In this section, you can find some variables that apply to all
+      pkgsrc packages.  The preferred method of setting these variables
+      is by setting them in <filename>/etc/mk.conf</filename>.
       <itemizedlist>
 	<listitem><para><varname>LOCALBASE</varname>: Where
 	    packages will be installed. The default is
diff --git a/doc/guide/files/editing.xml b/doc/guide/files/editing.xml
index ddf471077d4..28214296797 100644
--- a/doc/guide/files/editing.xml
+++ b/doc/guide/files/editing.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: editing.xml,v 1.7 2005/05/24 12:14:42 wiz Exp $ -->
+<!-- $NetBSD: editing.xml,v 1.8 2005/09/02 19:12:37 rillig Exp $ -->
 
 <appendix id="editing">
   <title>Editing guidelines for the pkgsrc guide</title>
@@ -69,8 +69,8 @@
           Make sure you have the packages needed to re-generate the
           pkgsrc guide (and other XML-based NetBSD documentation)
           installed. These are <quote>netbsd-doc</quote> for creating the
-          ASCII- and HTML-version, and
-          <quote>netbsd-doc-print</quote>for the PostScript- and PDF
+          ASCII and HTML version, and
+          <quote>netbsd-doc-print</quote> for the PostScript and PDF
           version. You will need both packages installed, to make sure
           documentation is consistent across all formats. The packages
           can be found in
diff --git a/doc/guide/files/examples.xml b/doc/guide/files/examples.xml
index cbcdc216897..24a07747252 100644
--- a/doc/guide/files/examples.xml
+++ b/doc/guide/files/examples.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: examples.xml,v 1.6 2005/07/27 21:29:50 rpaulo Exp $ -->
+<!-- $NetBSD: examples.xml,v 1.7 2005/09/02 19:12:37 rillig Exp $ -->
 
 <appendix id="examples">
   <title>A simple example package: bison</title>
@@ -63,7 +63,7 @@ share/bison.hairy</programlisting>
       <screen>&uprompt; <userinput>pkglint</userinput>
 looks fine.</screen>
 
-      <para>Depending on the supplied command line arguments (see pkglint(1))
+      <para>Depending on the supplied command line arguments (see pkglint(1)),
 	more verbose checks will be performed. Use e.g.
 	<command>pkglint -v</command> for a very verbose check.</para>
     </sect2>
diff --git a/doc/guide/files/faq.xml b/doc/guide/files/faq.xml
index f83ece27410..81bb741dd2d 100644
--- a/doc/guide/files/faq.xml
+++ b/doc/guide/files/faq.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: faq.xml,v 1.14 2005/07/27 21:29:50 rpaulo Exp $ -->
+<!-- $NetBSD: faq.xml,v 1.15 2005/09/02 19:12:37 rillig Exp $ -->
 
 <chapter id="faq"> <?dbhtml filename="faq.html"?>
 <title>Frequently Asked Questions</title>
@@ -206,17 +206,12 @@ etc:</para>
 
 </itemizedlist>
 
-<para>Utilities for people maintaining pkgsrc (or more obscure pkg
+<para>Utilities for people maintaining pkgsrc (or: more obscure pkg
 utilities)</para>
 
 <itemizedlist>
 
   <listitem>
-    <para><filename role="pkg">pkgtools/pkgconflict</filename>: Find 
-      packages that conflict but aren't marked as such.</para>
-  </listitem>
-
-  <listitem>
     <para><filename role="pkg">pkgtools/pkg_comp</filename>: Build 
       packages in a chrooted area.</para>
   </listitem>
@@ -262,7 +257,7 @@ that allow finer tuning of the tree layout.</para>
 <sect1 id="resume-transfers">
 <title>How to resume transfers when fetching distfiles?</title>
 
-<para>By default resuming transfers in pkgsrc is disabled, but you can
+<para>By default, resuming transfers in pkgsrc is disabled, but you can
 enable this feature by adding the option
 <varname>PKG_RESUME_TRANSFERS=YES</varname> into
 <filename>/etc/mk.conf</filename>.  If, during a fetch step, an incomplete
@@ -318,7 +313,7 @@ you will have to add the following line into
 <para>If you are sitting behind a firewall which does not allow direct
 connections to Internet hosts (i.e. non-NAT), you may specify the
 relevant proxy hosts.  This is done using an environment variable in the
-form of a URL e.g. in Amdahl, the machine
+form of a URL, e.g. in Amdahl, the machine
 <quote>orpheus.amdahl.com</quote> is one of the firewalls, and it uses
 port 80 as the proxy port number.  So the proxy environment variables
 are:</para>
@@ -371,7 +366,7 @@ url="ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/">ftp.NetBSD.org</ulink>
 but downloading the entire directory may not be appropriate.</para>
 
 <para>The answer here is to do a <command>make fetch-list</command> in
-<filename>/usr/pkgsrc</filename> or one of it's subdirectories, carry the
+<filename>/usr/pkgsrc</filename> or one of its subdirectories, carry the
 resulting list to your machine at work/school and use it there.  If you
 don't have a NetBSD-compatible &man.ftp.1; (like lukemftp) at work, don't
 forget to set <varname>FETCH_CMD</varname> to something that fetches a
@@ -417,7 +412,7 @@ package, you get the error from make that it doesn't know how to make
 <filename>/usr/share/tmac/tmac.andoc</filename>? This indicates that
 you don't have installed the <quote>text</quote> set (nroff, ...) from
 the NetBSD base distribution on your machine.  It is recommended to do
-that to format manpages.</para>
+that to format man pages.</para>
 
 <para>In the case of the <filename 
   role="pkg">pkgtools/pkg_install</filename> package, you
@@ -432,7 +427,7 @@ environment or in <filename>/etc/mk.conf</filename>.</para>
 <title>What does <quote>Could not find bsd.own.mk</quote> mean?</title>
 
 <para> You didn't install the compiler set, <filename>comp.tgz</filename>,
-when you installed your NetBSD machine.  Please get it and install it, by
+when you installed your NetBSD machine.  Please get and install it, by
 extracting it in <filename>/</filename>:</para>
 
 <screen><prompt>#</prompt> <userinput>cd /</userinput>
@@ -487,7 +482,7 @@ setting the <varname>PKG_SYSCONFDIR.${PKG_SYSCONFVAR}</varname> variable.
 package you would like to modify, that is, the contents of
 <varname>PKGBASE</varname>.</para>
 
-<para>Note that, after changing these settings, you must rebuild and
+<para>Note that after changing these settings, you must rebuild and
 reinstall any affected packages.</para>
 
 </sect1>
diff --git a/doc/guide/files/fixes.xml b/doc/guide/files/fixes.xml
index 11bb80acb7f..c23ca6868f7 100644
--- a/doc/guide/files/fixes.xml
+++ b/doc/guide/files/fixes.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.28 2005/07/28 11:05:36 wiz Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.29 2005/09/02 19:12:37 rillig Exp $ -->
 
 <chapter id="fixes"> <?dbhtml filename="fixes.html"?>
   <title>Notes on fixes for packages</title>
@@ -12,14 +12,14 @@
       <para>The problem with package-defined variables that can be
         overridden via <varname>MAKECONF</varname> or
         <filename>/etc/mk.conf</filename> is that &man.make.1; expands a
-        variable as it is used, but evaluates preprocessor like
+        variable as it is used, but evaluates preprocessor-like
         statements (.if, .ifdef and .ifndef) as they are read.  So, to
         use any variable (which may be set in
         <filename>/etc/mk.conf</filename>) in one of the .if*
         statements, the file <filename>/etc/mk.conf</filename> must be
         included before that .if* statement.</para>
     
-      <para>Rather than have a number of ad-hoc ways of including
+      <para>Rather than having a number of ad-hoc ways of including
         <filename>/etc/mk.conf</filename>, should it exist, or
         <varname>MAKECONF</varname>, should it exist, include the
         <filename>pkgsrc/mk/bsd.prefs.mk</filename> file in the package
@@ -33,7 +33,7 @@
     .endif</programlisting>
     
       <para>If you wish to set the <varname>CFLAGS</varname> variable
-        in <filename>/etc/mk.conf</filename> please make sure to use: 
+        in <filename>/etc/mk.conf</filename>, please make sure to use: 
     
         <programlisting>CFLAGS+=  -your -flags</programlisting>
     
@@ -299,12 +299,12 @@
         pkgsrc tree.</para>
     
       <para>In this case you can set <varname>CONFLICTS</varname> to a
-        space separated list of packages (including version string) your
+        space-separated list of packages (including version string) your
         package conflicts with.</para>
     
-      <para>For example <filename role="pkg">x11/Xaw3d</filename> 
+      <para>For example, <filename role="pkg">x11/Xaw3d</filename> 
         and <filename role="pkg">x11/Xaw-Xpm</filename>
-        install provide the same shared library, thus you set in
+        install the same shared library, thus you set in
         <filename>pkgsrc/x11/Xaw3d/Makefile</filename>:</para>
     
       <programlisting>CONFLICTS=      Xaw-Xpm-[0-9]*</programlisting>
@@ -391,7 +391,7 @@
         are gcc internal errors  or never finishing compiling a file.
 </para> 
     
-      <para>Typically a workaround involves testing the
+      <para>Typically, a workaround involves testing the
         <varname>MACHINE_ARCH</varname>  and compiler version, disabling
         optimisation for that
         file/<varname>MACHINE_ARCH</varname>/compiler  combination, and
@@ -418,7 +418,7 @@
         <quote>foo-17.42nb9</quote>.</para>
     
       <para>When a new release of the package is released, the
-        <varname>PKGREVISION</varname> should be removed. e.g. on a new
+        <varname>PKGREVISION</varname> should be removed, e.g. on a new
         minor release of the above package, things should be like:
 </para>
     
@@ -528,7 +528,7 @@ ${INSTALL_DATA_DIR} ${PREFIX}/dir2</programlisting>
 	<filename role="pkg">devel/libtool</filename> pkg
         can help here, as it just <quote>knows</quote> how to build
         both static and dynamic libraries from a set of source files,
-        thus being platform independent.</para>
+        thus being platform-independent.</para>
 
       <para>Here's how to use libtool in a pkg in seven simple
         steps:</para> 
@@ -677,7 +677,7 @@ dynamic linker chooses the library with the greater REVISION number. </programli
         libraries built and installed, then use
         <varname>SHLIBTOOL_OVERRIDE</varname> instead.</para>
 
-      <para>If your package makes use of the platform independent library
+      <para>If your package makes use of the platform-independent library
         for loading dynamic shared objects, that comes with libtool
         (libltdl), you should include devel/libltdl/buildlink3.mk.</para>
 
@@ -788,7 +788,7 @@ pre-configure:
 
       <para>Please use the <quote>__NetBSD__</quote> definition sparingly - it
         should only apply to features of &os; that are not present in other
-        4.4-lite derived BSDs.</para>
+        4.4-lite-derived BSDs.</para>
     </sect2>
   </sect1>
   
@@ -822,7 +822,7 @@ pre-configure:
 
       <para>The <varname>INTERACTIVE_STAGE</varname> definition is provided to notify
         the pkgsrc mechanism of an interactive stage which will be needed, and
-        this should be set in the package's <filename>Makefile</filename>. e.g.</para>
+        this should be set in the package's <filename>Makefile</filename>, e.g.:</para>
 
       <programlisting>INTERACTIVE_STAGE= build</programlisting>
 
@@ -1051,7 +1051,7 @@ pre-configure:
         <filename>INSTALL</filename> script, and it must use the
         appropriate <command>makeinfo</command> command.</para>
     
-      <para>To achieve this goal the pkgsrc infrastructure creates
+      <para>To achieve this goal, the pkgsrc infrastructure creates
         overriding scripts for the <command>install-info</command> and
         <command>makeinfo</command> commands in a directory listed early
         in <varname>PATH</varname>.</para>
@@ -1178,7 +1178,7 @@ pre-configure:
     <sect2 id="gtk2-modules">
       <title>Packages installing GTK2 modules</title>
     
-      <para>If a package installs gtk2 immodules or loaders, you need to
+      <para>If a package installs GTK2 immodules or loaders, you need to
         take some extra steps to get them registered in the GTK2 database
         properly:</para>
     
@@ -1201,7 +1201,7 @@ pre-configure:
       </listitem>
       
       <listitem> <para>
-        Patch the package to not touch any of the gtk2 databases directly.
+        Patch the package to not touch any of the GTK2 databases directly.
         These are:
     
         <itemizedlist>
@@ -1295,7 +1295,7 @@ pre-configure:
             <emphasis>except</emphasis> for files saved under 
             <filename>share/mime/packages</filename>.  The former are
             handled automatically by 
-            the update-mime-database program, but the later are
+            the update-mime-database program, but the latter are
             package-dependent and must be removed by the package that
             installed them in the first place.</para>
         </listitem>
diff --git a/doc/guide/files/introduction.xml b/doc/guide/files/introduction.xml
index cfc25e1cc14..bd41cbc8744 100644
--- a/doc/guide/files/introduction.xml
+++ b/doc/guide/files/introduction.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: introduction.xml,v 1.6 2005/07/27 21:29:50 rpaulo Exp $ -->
+<!-- $NetBSD: introduction.xml,v 1.7 2005/09/02 19:12:37 rillig Exp $ -->
 
 <chapter id="introduction">
   <title>Introduction</title>
@@ -6,7 +6,7 @@
   <sect1 id="introduction-section">
     <title>Introduction</title>
 
-    <para> There is a lot of software freely available for Unix based
+    <para> There is a lot of software freely available for Unix-based
       systems, which usually runs on NetBSD and other Unix-flavoured
       systems, too, sometimes with some modifications.  The NetBSD
       Packages Collection (pkgsrc) incorporates any such changes
@@ -221,7 +221,7 @@
 
 	<listitem>
 	  <para>The piece of software to be installed which will be constructed from
-	    all the files in the Distfile by the actions defined in the
+	    all the files in the distfile by the actions defined in the
 	    corresponding package.</para>
 	</listitem>
       </varlistentry>
diff --git a/doc/guide/files/makefile.xml b/doc/guide/files/makefile.xml
index d0922385090..00183417808 100644
--- a/doc/guide/files/makefile.xml
+++ b/doc/guide/files/makefile.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: makefile.xml,v 1.17 2005/07/27 21:29:50 rpaulo Exp $ -->
+<!-- $NetBSD: makefile.xml,v 1.18 2005/09/02 19:12:37 rillig Exp $ -->
 
 <!-- based on:
 pkgsrc/bootstrap/bmake/for.c 1.1.1.1
@@ -42,7 +42,7 @@ pkgsrc/bootstrap/bmake/var.c 1.2
     backslash, the backslash, the newline, and any whitespace
     immediately behind the newline are replaced with a single space. A
     backspace character and an immediately following hash character are
-    replaced with a single hash character. Otherwise the backslash is
+    replaced with a single hash character. Otherwise, the backslash is
     passed as is. In a variable assignment, any hash character that is
     not preceded by a backslash starts a comment that continues upto the
     end of the logical line.</para>
@@ -56,14 +56,14 @@ pkgsrc/bootstrap/bmake/var.c 1.2
     variables is evaluating them. A variable is evaluated when it is
     part of the right side of the ``:='' or the ``!='' operator, or
     directly before executing a shell command which the variable is part
-    of. In all other cases &man.make.1; performs lazy evaluation, that
+    of. In all other cases, &man.make.1; performs lazy evaluation, that
     is, variables are not evaluated until there's no other way. The
     ``modifiers'' mentioned in the man page also evaluate the
     variable.</para>
 
     <para>Some of the modifiers split the string into words and then
     operate on the words, others operate on the string as a whole. When
-    a string is splitted into words, it is splitted as you would expect
+    a string is split into words, it is split as you would expect
     it from &man.sh.1;.</para>
 
     <para>No rule without exception&mdash;the <command>.for</command>
@@ -76,14 +76,14 @@ pkgsrc/bootstrap/bmake/var.c 1.2
     <itemizedlist>
 
       <listitem><para><emphasis>Strings</emphasis> can contain arbitrary
-      characters. Nevertheless you should restrict yourself to only
+      characters. Nevertheless, you should restrict yourself to only
       using printable characters. Examples are
       <varname>PREFIX</varname> and
       <varname>COMMENT</varname>.</para></listitem>
 
       <listitem><para><emphasis>Internal lists</emphasis> are lists that
       are never exported to any shell command. Their elements are
-      separated by whitespace. Therefore the elements themselves cannot
+      separated by whitespace. Therefore, the elements themselves cannot
       have embedded whitespace. Any other characters are allowed.
       Internal lists can be used in <command>.for</command> loops.
       Examples are <varname>DEPENDS</varname> and
@@ -201,14 +201,14 @@ all:
       <para>Example 4 handles correctly every string that does not start
       with a dash. In that case, the result depends on the
       implementation of the &man.echo.1; command. As long as you can
-      guarantee that your input does not start with a dash this form is
+      guarantee that your input does not start with a dash, this form is
       appropriate.</para>
 
       <para>Example 5 handles even the case of a leading dash
       correctly.</para>
 
       <para>The <varname>EXT_LIST</varname> does not need to be quoted
-      because the quoting has already be done when adding elements to
+      because the quoting has already been done when adding elements to
       the list.</para>
 
       <para>As internal lists shall not be passed to the shell, there is
@@ -226,7 +226,7 @@ all:
 
 	<listitem><para>Whenever you use the value of a list, think
 	about what happens to leading or trailing whitespace. If the
-	list is a well-formed shell expression you can apply the
+	list is a well-formed shell expression, you can apply the
 	<varname>:M*</varname> modifier to strip leading and trailing
 	whitespace from each word. The <varname>:M</varname> operator
 	first splits its argument according to the rules of the shell,
@@ -235,7 +235,7 @@ all:
 	One class of situations where this is needed is when adding a
 	variable like <varname>CPPFLAGS</varname> to
 	<varname>CONFIGURE_ARGS</varname>. If the configure script
-	invokes other configure scripts it strips the leading and
+	invokes other configure scripts, it strips the leading and
 	trailing whitespace from the variable and then passes it to the
 	other configure scripts. But these configure scripts expect the
 	(child) <varname>CPPFLAGS</varname> variable to be the same as
@@ -267,7 +267,7 @@ all:
 	operator for it, as this operator only works for the
 	shell.</para></listitem>
 
-	<listitem><para>Whenever a variable can be empty the
+	<listitem><para>Whenever a variable can be empty, the
 	<varname>:Q</varname> operator can have surprising results. Here
 	are two completely different cases which can be solved with the
 	same trick.</para>
diff --git a/doc/guide/files/options.xml b/doc/guide/files/options.xml
index 508c9eac3bc..1aee15c8d0f 100644
--- a/doc/guide/files/options.xml
+++ b/doc/guide/files/options.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: options.xml,v 1.11 2005/08/29 22:43:11 cube Exp $ -->
+<!-- $NetBSD: options.xml,v 1.12 2005/09/02 19:12:37 rillig Exp $ -->
 
 <!-- based on: pkgsrc/mk/bsd.options.mk 1.42 -->
 
@@ -161,7 +161,7 @@ including <filename>bsd.options.mk</filename>.  If none of
 <varname>PKG_SUPPORTED_OPTIONS</varname>,
 <varname>PKG_OPTIONS_OPTIONAL_GROUPS</varname>, and
 <varname>PKG_OPTIONS_REQUIRED_GROUPS</varname> are defined (as can
-happen with platform specific options if none of them is supported on
+happen with platform-specific options if none of them is supported on
 the current platform), <varname>PKG_OPTIONS</varname> is set to the
 empty list and the package is otherwise treated as not using the
 options framework.</para>
diff --git a/doc/guide/files/pkginstall.xml b/doc/guide/files/pkginstall.xml
index 23942fcde41..266af15584c 100644
--- a/doc/guide/files/pkginstall.xml
+++ b/doc/guide/files/pkginstall.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: pkginstall.xml,v 1.5 2005/08/10 05:27:56 reed Exp $ -->
+<!-- $NetBSD: pkginstall.xml,v 1.6 2005/09/02 19:12:37 rillig Exp $ -->
 
 <chapter id="pkginstall"> <?dbhtml filename="pkginstall.html"?>
 <title>The pkginstall framework</title>
@@ -33,7 +33,7 @@
 </itemizedlist>
 
 <para>The following sections inspect each of the above points in detail.
-Note that, in order to use any of the described functionalities, you must
+Note that in order to use any of the described functionalities, you must
 add the following to your package's <filename>Makefile</filename>:</para>
 
 <programlisting>USE_PKGINSTALL=YES</programlisting>
@@ -64,11 +64,11 @@ to install files outside this location; e.g., under
 <para>The only way to achieve this is to create such files during
 installation time by using the installation scripts.  These scripts can run
 arbitrary commands, so they have the potential to create and manage files
-anywhere in the filesystem.  Here is where pkginstall comes into play: it
+anywhere in the file system.  Here is where pkginstall comes into play: it
 provides generic scripts to abstract the manipulation of such files and
 directories based on variables set in the package's
-<filename>Makefile</filename>.  The rest of this section describes which
-these variables are.</para>
+<filename>Makefile</filename>.  The rest of this section describes these
+variables.</para>
 
 <!-- ================================================================== -->
 
@@ -76,7 +76,7 @@ these variables are.</para>
 <title>Directory manipulation</title>
 
 <para>The following variables can be set to request the creation of
-directories anywhere in the filesystem:</para>
+directories anywhere in the file system:</para>
 
 <itemizedlist>
 
@@ -196,8 +196,7 @@ set based upon the following variables:</para>
     <varname>PKG_SYSCONFBASE</varname> under which the configuration files
     for the package being built shall be installed.  The definition of this
     variable only makes sense in the package's
-    <filename>Makefile</filename> (i.e., it is not user
-    customizable).</para>
+    <filename>Makefile</filename> (i.e., it is not user-customizable).</para>
 
     <para>As an example, consider the Apache package,
     <filename role="pkg">www/apache2</filename>, which places its 
@@ -265,7 +264,7 @@ linkend="dirs-outside-prefix" /> what this means.</para>
 known place, you need to teach each package where it shall install its
 files.  In some cases you will have to patch the package Makefiles to
 achieve it.  If you are lucky, though, it may be as easy as passing an
-extra flag to the configuration script; this is the case of GNU Autoconf
+extra flag to the configuration script; this is the case of GNU Autoconf-
 generated files:</para>
 
 <programlisting>CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}</programlisting>
diff --git a/doc/guide/files/platforms.xml b/doc/guide/files/platforms.xml
index e58d041211c..7e9ce93c47c 100644
--- a/doc/guide/files/platforms.xml
+++ b/doc/guide/files/platforms.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: platforms.xml,v 1.12 2005/07/27 21:29:50 rpaulo Exp $ -->
+<!-- $NetBSD: platforms.xml,v 1.13 2005/09/02 19:12:37 rillig Exp $ -->
 
 <chapter id="platforms">
   <title>Using pkgsrc on systems other than &os;</title>
@@ -75,7 +75,7 @@
   </sect1>
 
   <sect1 id="platform-specific-notes">
-    <title>Platform specific notes</title>
+    <title>Platform-specific notes</title>
 
     <para>Here are some platform-specific notes you should be aware of.</para>
 
@@ -102,7 +102,7 @@
 
       <note>
 	<para>You cannot use a HFS+ file system for pkgsrc, because pkgsrc currently
-	  requires the filesystem to be case-sensitive, and HFS+ is not.</para>
+	  requires the file system to be case-sensitive, and HFS+ is not.</para>
       </note>
 
       <sect3 id="platform.osx-image">
@@ -200,7 +200,7 @@
     <sect2 id="interix">
       <title>Interix</title>
 
-      <para>Interix is a POSIX compatible subsystem for the Windows NT kernel,
+      <para>Interix is a POSIX-compatible subsystem for the Windows NT kernel,
 	providing a Unix-like environment with a tighter kernel integration than
 	available with Cygwin.  It is part of the Windows Services for Unix
 	package, available for free for any licensed copy of Windows 2000, XP
@@ -254,7 +254,7 @@
 	      Add or Remove, then uncheck Utilities-&gt;UNIX Perl.</para>
 	  </listitem>
 	  <listitem>
-	    <para>To enable case-sensitivity for the filesystem, run REGEDIT.EXE, and
+	    <para>To enable case-sensitivity for the file system, run REGEDIT.EXE, and
 	      change the following registry key:</para>
 	    <para>HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\kernel</para>
 	    <para>Set the DWORD value "obcaseinsensitive" to 0; then reboot.</para>
@@ -322,7 +322,7 @@
       <para>If you have the actual pkgsrc tree mounted via NFS from a different host,
 	please make sure to set <varname>WRKOBJDIR</varname> to a local directory,
 	as it appears that IRIX linker occasionally runs into issues when trying to
-	link over a network mounted filesystem.</para>
+	link over a network-mounted file system.</para>
 
       <para>The bootstrapping process should set all the right options for programs such
 	as imake(1), but you may want to set some options depending on your local
@@ -429,7 +429,7 @@
 	    <filename>/etc/mk.conf.example</filename> file
 	    when you use the bootstrap script. OpenBSD's make program uses
 	    <filename>/etc/mk.conf</filename>
-	    as well. You can work around this by enclosing all the pkgsrc specific parts 
+	    as well. You can work around this by enclosing all the pkgsrc-specific parts 
 	    of the file with:</para>
 
           <programlisting>.ifdef BSD_PKG_MK
@@ -516,20 +516,20 @@
 
 	<para>You should set <varname>CC</varname>, <varname>CXX</varname> and
 	  optionally, <varname>CPP</varname> in <filename>/etc/mk.conf</filename>,
-	  eg.</para>
+	  e.g.:</para>
 
         <programlisting>CC=     cc
 CXX=    CC
 CPP=    /usr/ccs/lib/cpp</programlisting>
 
-	<para>You may also want to build 64-bit binaries, eg.</para>
+	<para>You may also want to build 64-bit binaries, e.g.:</para>
 
         <programlisting>CFLAGS= -xtarget=ultra -xarch=v9</programlisting>
 
 	<para>Whichever compiler you use, please ensure the compiler tools and
 	  your $prefix are in your <varname>PATH</varname>. This includes
 	  <filename>/usr/ccs/{bin,lib}</filename>
-	  and eg. <filename>/usr/pkg/{bin,sbin}</filename>.</para>
+	  and e.g. <filename>/usr/pkg/{bin,sbin}</filename>.</para>
       </sect3>
     </sect2>
   </sect1>
diff --git a/doc/guide/files/plist.xml b/doc/guide/files/plist.xml
index 86ae145db12..f8aec02bfc6 100644
--- a/doc/guide/files/plist.xml
+++ b/doc/guide/files/plist.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: plist.xml,v 1.7 2005/07/27 21:29:51 rpaulo Exp $ -->
+<!-- $NetBSD: plist.xml,v 1.8 2005/09/02 19:12:37 rillig Exp $ -->
 
 <chapter id="plist">
   <title>PLIST issues</title>
@@ -7,7 +7,7 @@
     <quote>packing list</quote>, i.e. a list of files that belong to
     the package (relative to the <filename>${PREFIX}</filename>
     directory it's been installed in) plus some additional statements
-    - see the &man.pkg.create.1; manpage for a full list.
+    - see the &man.pkg.create.1; man page for a full list.
     This chapter addresses some issues that need attention when
     dealing with the <filename>PLIST</filename> file (or files, see
     below!).</para>
@@ -84,7 +84,7 @@
         <listitem>
           <para>Some packages like emacs and perl embed information
             about which architecture they were built on into the
-            pathnames where they install their file. To handle this
+            pathnames where they install their files. To handle this
             case, PLIST will be preprocessed before actually used, and
             the symbol
             <quote><varname>${MACHINE_ARCH}</varname></quote> will be
@@ -92,7 +92,7 @@
             same is done if the string
             <varname>${MACHINE_GNU_ARCH}</varname> is embedded in
             PLIST somewhere - use this on packages that have GNU
-            autoconf created configure scripts.</para>
+            autoconf-created configure scripts.</para>
 
           <note>
             <title>Legacy note</title>
@@ -163,13 +163,13 @@
   </sect1>
 
   <sect1 id="manpage-compression">
-    <title>Manpage-compression</title>
+    <title>Man page-compression</title>
     
-    <para>Manpages should be installed in compressed form if
+    <para>Man pages should be installed in compressed form if
       <varname>MANZ</varname> is set (in <filename>bsd.own.mk</filename>),
       and uncompressed otherwise. To handle this in the
       <filename>PLIST</filename> file, the suffix <quote>.gz</quote> is
-      appended/removed automatically for manpages according to
+      appended/removed automatically for man pages according to
       <varname>MANZ</varname> and <varname>MANCOMPRESSED</varname> being set
       or not, see above for details. This modification of the
       <filename>PLIST</filename> file is done on a copy of it, not
@@ -189,7 +189,7 @@
 
 
   <sect1 id="platform-specific-plist">
-    <title>Platform specific and differing PLISTs</title>
+    <title>Platform-specific and differing PLISTs</title>
     
     <para>Some packages decide to install a different set of files based on
       the operating system being used. These differences can be
@@ -286,7 +286,7 @@
       print-PLIST</command>, you should get the right (commented out)
       lines. </para> 
       
-    <para> Note that, even if your package is using
+    <para> Note that even if your package is using
       <filename>$X11BASE</filename>, it must not depend on the
       *-x11-dirs packages.  Just specify the name without that part and
       pkgsrc (in particular, <filename>mk/dirs.mk</filename>) will take
diff --git a/doc/guide/files/using.xml b/doc/guide/files/using.xml
index 4a0885a4636..3fd0195cf82 100644
--- a/doc/guide/files/using.xml
+++ b/doc/guide/files/using.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: using.xml,v 1.11 2005/07/27 21:29:51 rpaulo Exp $ -->
+<!-- $NetBSD: using.xml,v 1.12 2005/09/02 19:12:37 rillig Exp $ -->
 
 <chapter id="using"> <?dbhtml filename="using.html"?>
   <title>Using pkgsrc</title>
@@ -27,17 +27,17 @@
         layout as in
         <filename>/usr/pkgsrc/packages</filename>). </para>
 
-      <para> This same directory layout applies for CDROM
+      <para> This same directory layout applies for CD-ROM
         distributions, only that the directory may be rooted somewhere
         else, probably somewhere below
-        <filename>/cdrom</filename>. Please consult your CDROMs
+        <filename>/cdrom</filename>. Please consult your CD-ROMs
         documentation for the exact location. </para>  
     </sect2>
 
     <sect2 id="how-to-use-binary-packages">
       <title>How to use binary packages</title>
       
-      <para> If you have the files on a CDROM or downloaded them to
+      <para> If you have the files on a CD-ROM or downloaded them to
         your hard disk, you can install them with the following command
         (be sure to <command>su</command> to root first):</para>
 
@@ -55,9 +55,9 @@
         present where you install from. </para>
 
       <para>To save some typing, you can set the
-        <varname>PKG_PATH</varname> environment variable to a semicolon
-        separated list of paths (including remote URLs); trailing
-        slashes are not allowed. </para>
+        <varname>PKG_PATH</varname> environment variable to a semicolon-separated
+	list of paths (including remote URLs); trailing slashes are not allowed.
+	</para>
 
       <para>Additionally to the <filename>All</filename> directory
         there exists a <filename>vulnerable</filename> directory to
@@ -66,7 +66,7 @@
         use these packages, add the <filename>vulnerable</filename>
         directory to your <varname>PKG_PATH</varname>. However, you should run
         <filename role="pkg">security/audit-packages</filename> regularly, 
-	and especially after installing new packages, and verify that the 
+	especially after installing new packages, and verify that the 
 	vulnerabilities are acceptable for your configuration. An example
         <varname>PKG_PATH</varname> would be:
       <filename>ftp://ftp.NetBSD.org/pub/NetBSD/packages/&lt;OSVERSION&gt;/&lt;ARCH&gt;/All;ftp://ftp.NetBSD.org/pub/NetBSD/packages/&lt;OSVERSION&gt;/&lt;ARCH&gt;/vulnerable</filename>
@@ -103,7 +103,7 @@
 
       <para> To build packages from source on a NetBSD system the
         <quote>comp</quote> and the <quote>text</quote> distribution
-        sets must be installed. If you want to build X11 related
+        sets must be installed. If you want to build X11-related
         packages the <quote>xbase</quote> and <quote>xcomp</quote>
         distribution sets are required, too.</para>
       <!-- FIXME: what about installing x11/XFree86-*? -->
@@ -140,7 +140,7 @@
       <title>How to build and install</title>
 
       <para>Assuming that the distfile has been fetched (see previous section), become
-        root and change into the relevant directory and running
+        root and change into the relevant directory and run
         <command>make</command>. For example, type </para>
 
       <screen>&cprompt; <userinput>cd misc/figlet</userinput>
@@ -167,7 +167,7 @@
         your packages tree. So, to use <filename>/usr/local</filename>, set
         <varname>LOCALBASE=/usr/local</varname> in your environment.  Please note
         that you should use a directory which is
-        dedicated to packages and not shared with other programs (ie, do not try
+        dedicated to packages and not shared with other programs (i.e., do not try
         and use <varname>LOCALBASE=/usr</varname>).  Also, you should not try to
         add any of your own files or directories (such as <filename>src/</filename>,
         <filename>obj/</filename>, or <filename>pkgsrc/</filename>) below the
@@ -225,7 +225,7 @@
         into <varname>BIN_INSTALL_FLAGS</varname>.
         See <filename>pkgsrc/mk/defaults/mk.conf</filename> for more details.</para>
 
-      <para>A final word of warning: If you setup a system that has a non-standard
+      <para>A final word of warning: If you set up a system that has a non-standard
         setting for <varname>LOCALBASE</varname>, be sure to set that
         before any packages are installed, as you can not use several directories
         for the same purpose. Doing so will result in pkgsrc not being able to