diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index c8db5e250e..bccdd2edd7 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -184,7 +184,7 @@
             <tbody>
               <row>
                 <entry><option>-P</option></entry>
-                <entry>Don't create empty directories</entry>
+                <entry>Do not create empty directories</entry>
               </row>
 
               <row>
@@ -328,7 +328,7 @@
 
               <row>
                 <entry>Needs Patch</entry>
-                <entry>File is unmodified, but there's a newer revision in
+                <entry>File is unmodified, but there is a newer revision in
                   the repository.</entry>
               </row>
 
@@ -339,20 +339,20 @@
 
               <row>
                 <entry>Needs Merge</entry>
-                <entry>File is modified, and there's a newer revision in the
+                <entry>File is modified, and there is a newer revision in the
                   repository.</entry>
               </row>
 
               <row>
                 <entry>File had conflicts on merge</entry>
                 <entry>There were conflicts the last time this file was
-                  updated, and they haven't been resolved yet.</entry>
+                  updated, and they have not been resolved yet.</entry>
               </row>
             </tbody>
           </tgroup>
         </informaltable>
 
-        <para>You'll also see the local revision and date,
+        <para>You will also see the local revision and date,
           the revision number of the newest applicable version
           (<quote>newest applicable</quote> because if you have a
           sticky date, tag or branch, it may not be the actual newest
@@ -360,7 +360,7 @@
       </listitem>
 
       <listitem>
-        <para>Once you've checked something out, update it with the
+        <para>Once you have checked something out, update it with the
           <command>update</command> command.</para>
 
         <screen>&prompt.user; <userinput>cvs update shazam</userinput></screen>
@@ -406,14 +406,14 @@
 
         <para>Theoretically, specifying <literal>HEAD</literal> as
           argument to <option>-r</option> will give you the same result
-          as <option>-A</option>, but that's just theory.</para>
+          as <option>-A</option>, but that is just theory.</para>
 
         <para>The <option>-d</option> option is useful if:</para>
 
         <itemizedlist>
           <listitem>
             <para>somebody has added subdirectories to the module
-              you've checked out after you checked it out.</para>
+              you have checked out after you checked it out.</para>
           </listitem>
 
           <listitem>
@@ -442,7 +442,7 @@
 
               <row>
                 <entry><literal>P</literal></entry>
-                <entry>The file was updated with no trouble (you'll only see
+                <entry>The file was updated with no trouble (you will only see
                   this when working against a remote repo).</entry>
               </row>
 
@@ -464,27 +464,27 @@
         <para>Merging is what happens if you check out a copy of
           some source code, modify it, then someone else commits a
           change, and you run <command>cvs update</command>. CVS notices
-          that you've made local changes, and tries to merge your
+          that you have made local changes, and tries to merge your
           changes with the changes between the version you originally
           checked out and the one you updated to. If the changes are to
-          separate portions of the file, it'll almost always work fine
+          separate portions of the file, it will almost always work fine
           (though the result might not be syntactically or semantically
           correct).</para>
 
         <para>CVS will print an <literal>M</literal> in front of every locally modified
           file even if there is no newer version in the repository, so
           <command>cvs update</command> is handy for getting a summary
-          of what you've changed locally.</para>
+          of what you have changed locally.</para>
 
         <para>If you get a <literal>C</literal>, then your changes
           conflicted with the changes in the repository (the changes
           were to the same lines, or neighboring lines, or you changed
-          the local file so much that <command>cvs</command> can't
-          figure out how to apply the repository's changes). You'll have
+          the local file so much that <command>cvs</command> can not
+          figure out how to apply the repository's changes). You will have
           to go through the file manually and resolve the conflicts;
-          they'll be marked with rows of <literal>&lt;</literal>,
+          they will be marked with rows of <literal>&lt;</literal>,
           <literal>=</literal> and <literal>&gt;</literal> signs. For
-          every conflict, there'll be a marker line with seven
+          every conflict, there will be a marker line with seven
           <literal>&lt;</literal> signs and the name of the file,
           followed by a chunk of what your local file contained,
           followed by a separator line with seven <literal>=</literal>
@@ -496,7 +496,7 @@
         <para>The <option>-j</option> option is slightly voodoo. It
           updates the local file to the specified revision as if you
           used <option>-r</option>, but it does not change the recorded
-          revision number or branch of the local file. It's not really
+          revision number or branch of the local file. It is not really
           useful except when used twice, in which case it will merge the
           changes between the two specified versions into the working
           copy.</para>
@@ -521,12 +521,12 @@
           </listitem>
         </itemizedlist>
 
-        <para>You'll almost certainly get a conflict because
-          of the <literal>$Id: article.sgml,v 1.84 2001-10-15 13:26:02 keramida Exp $</literal> (or in FreeBSD's case,
-          <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
+        <para>You will almost certainly get a conflict because
+          of the <literal>$Id: article.sgml,v 1.85 2001-10-16 11:52:49 keramida Exp $</literal> (or in FreeBSD's case,
+          <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you will have to edit
           the file to resolve the conflict (remove the marker lines and
-          the second <literal>$Id: article.sgml,v 1.84 2001-10-15 13:26:02 keramida Exp $</literal> line, leaving the original
-          <literal>$Id: article.sgml,v 1.84 2001-10-15 13:26:02 keramida Exp $</literal> line intact).</para>
+          the second <literal>$Id: article.sgml,v 1.85 2001-10-16 11:52:49 keramida Exp $</literal> line, leaving the original
+          <literal>$Id: article.sgml,v 1.85 2001-10-16 11:52:49 keramida Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -536,7 +536,7 @@
 
         <screen>&prompt.user; <userinput>cvs diff shazam</userinput></screen>
 
-        <para>shows you every modification you've made to the
+        <para>shows you every modification you have made to the
           <filename>shazam</filename> file or module.</para>
 
         <table frame="none">
@@ -560,7 +560,7 @@
         <para>You always want to use <option>-u</option>, since
           unified diffs are much easier to read than almost any other
           diff format (in some circumstances, context diffs may be
-          better, but they're much bulkier). A unified diff consists of
+          better, but they are much bulkier). A unified diff consists of
           a series of hunks. Each hunk begins with a line that starts
           with two <literal>@</literal> signs and specifies where in the
           file the differences are and how many lines they span. This
@@ -603,7 +603,7 @@
           manner.</para>
 
         <para>Use the <command>log</command> command to view the history of
-          one or more files, as it's stored in the CVS repository.  You can
+          one or more files, as it is stored in the CVS repository.  You can
           even use it to view the log message of a specific revision, if you
           add the <option>-r<replaceable>rev</replaceable></option> to the
           <command>log</command> command:</para>
@@ -634,7 +634,7 @@
 
         <para>Similarly, you can add new directories by creating them
           and then <command>cvs add</command>ing them. Note that you
-          don't need to commit directories.</para>
+          do not need to commit directories.</para>
       </listitem>
 
       <listitem>
@@ -674,11 +674,11 @@
           why you did the changes you did, not just right here and now,
           but months or years from now when someone wonders why some
           seemingly illogical or inefficient piece of code snuck into
-          your source file. It's also an invaluable aid to deciding
+          your source file. It is also an invaluable aid to deciding
           which changes to MFC and which not to MFC.</para>
 
-        <para>Don't waste space in the commit messages explaining
-          <emphasis>what</emphasis> you did.  That's what
+        <para>Do not waste space in the commit messages explaining
+          <emphasis>what</emphasis> you did.  That is what
           <command>cvs diff</command> is for. Instead, tell us
           <emphasis>why</emphasis> you did it.</para>
 
@@ -699,7 +699,7 @@
 
         <itemizedlist>
           <listitem>
-            <para>verify which branch you're committing to, using
+            <para>verify which branch you are committing to, using
               <command>cvs status</command>.</para>
           </listitem>
 
@@ -710,7 +710,7 @@
         </itemizedlist>
 
         <para>Also, ALWAYS specify which files to commit explicitly on
-          the command line, so you don't accidentally commit other files
+          the command line, so you do not accidentally commit other files
           than the ones you intended - <command>cvs commit</command>
           with no arguments will commit every modification in your
           current working directory and every subdirectory.</para>
@@ -760,7 +760,7 @@ checkout -P</programlisting>
 
       <listitem>
         <para>Use Eivind Eklund's <command>cdiff</command> script to
-          view unidiffs.  It's a wrapper for &man.less.1; that adds ANSI
+          view unidiffs.  It is a wrapper for &man.less.1; that adds ANSI
           color codes to make hunk headers, outtakes and additions stand
           out; context and garbage are unmodified.  It also expands tabs
           properly (tabs often look wrong in diffs because of the extra
@@ -786,15 +786,15 @@ checkout -P</programlisting>
       <listitem>
         <para>CVS is old, arcane, crufty and buggy, and sometimes
           exhibits non-deterministic behavior which some claim as proof
-          that it's actually merely the Newtonian manifestation of a
-          sentient transdimensional entity.  It's not humanly possible
-          to know its every quirk inside out, so don't be afraid to ask
+          that it is actually merely the Newtonian manifestation of a
+          sentient transdimensional entity.  It is not humanly possible
+          to know its every quirk inside out, so do not be afraid to ask
           the resident AI (<email>cvs@FreeBSD.org</email>) for help when
           you screw up.</para>
       </listitem>
 
       <listitem>
-        <para>Don't leave the <command>cvs commit</command> command in commit
+        <para>Do not leave the <command>cvs commit</command> command in commit
           message editing mode for too long (more than 2-3 minutes).  It
           locks the directory you are working with and will prevent other
           developers from committing into the same directory.  If you have
@@ -1093,7 +1093,7 @@ docs:Documentation Bug:nik:</programlisting>
 	    As well as writing documentation he put together the
 	    infrastructure under <filename>doc/share/mk</filename> and the
 	    stylesheets and related code under
-	    <filename>doc/share/sgml</filename>.  If you've got questions
+	    <filename>doc/share/sgml</filename>.  If you have got questions
 	    about these you are encouraged to send them via the
 	    <email>doc@FreeBSD.org</email> mailing list.  Committers
 	    interested in contributing to the documentation should familiarise
@@ -1183,7 +1183,7 @@ docs:Documentation Bug:nik:</programlisting>
 	<listitem>
 	  <para>David is the unofficial <filename>src/contrib</filename>-Meister.
 	    If you have something
-	    significant you'd like to do there, you should probably
+	    significant you would like to do there, you should probably
 	    coordinate it with David first.  Please consult him before
 	    importing into <filename>src/contrib</filename> if you have
 	    never done this before in the FreeBSD CVS repository.  Also
@@ -1210,7 +1210,7 @@ docs:Documentation Bug:nik:</programlisting>
 	
 	<listitem>
 	  <para>If you need advice on obscure network internals or
-	    aren't sure of some potential change to the networking
+	    are not sure of some potential change to the networking
 	    subsystem you have in mind, Garrett is someone to talk
 	    to.  Garrett is also very knowledgeable on the various
 	    standards applicable to FreeBSD.</para>
@@ -1350,7 +1350,7 @@ docs:Documentation Bug:nik:</programlisting>
       <listitem>
 	<para>Changes go to &os.current; before
 	  &os.stable; unless specifically permitted by
-	  the release engineer or unless they're not applicable to
+	  the release engineer or unless they are not applicable to
 	  &os.current;.  Any non-trivial or non-urgent
 	  change which is applicable should also be allowed to sit in
 	  &os.current; for at least 3 days before
@@ -1361,7 +1361,7 @@ docs:Documentation Bug:nik:</programlisting>
       </listitem>
 
       <listitem>
-	<para>Don't fight in public with other committers; it looks
+	<para>Do not fight in public with other committers; it looks
 	  bad.  If you must <quote>strongly disagree</quote> about
 	  something, do so only in private.</para>
       </listitem>
@@ -1381,7 +1381,7 @@ docs:Documentation Bug:nik:</programlisting>
       </listitem>
 
       <listitem>
-	<para>Don't commit to anything under the
+	<para>Do not commit to anything under the
 	  <filename>src/contrib</filename>,
 	  <filename>src/crypto</filename>, and
 	  <filename>src/sys/contrib</filename> trees without
@@ -1406,7 +1406,7 @@ docs:Documentation Bug:nik:</programlisting>
       committers.  This rule does not exist to set core up as a bunch
       of cruel dictators who can dispose of committers as casually as
       empty soda cans, but to give the project a kind of safety fuse.
-      If someone is seriously out of control, it's important to be
+      If someone is seriously out of control, it is important to be
       able to deal with this immediately rather than be paralyzed by
       debate.  In all cases, a committer whose privileges are
       suspended or revoked is entitled to a <quote>hearing</quote>,
@@ -1423,7 +1423,7 @@ docs:Documentation Bug:nik:</programlisting>
     
     <para>In all other aspects of project operation, core is a subset
       of committers and is bound by the <emphasis>same
-      rules</emphasis>.  Just because someone is in core doesn't mean
+      rules</emphasis>.  Just because someone is in core does not mean
       that they have special dispensation to step outside of any of
       the lines painted here; core's <quote>special powers</quote>
       only kick in when it acts as a group, not on an individual
@@ -1439,7 +1439,7 @@ docs:Documentation Bug:nik:</programlisting>
 
 	  <para>This means that you need to treat other committers as
 	    the peer-group developers that they are.  Despite our
-	    occasional attempts to prove the contrary, one doesn't get
+	    occasional attempts to prove the contrary, one does not get
 	    into committers by being stupid and nothing rankles more
 	    than being treated that way by one of your peers.  Whether
 	    we always feel respect for one another or not (and
@@ -1455,19 +1455,19 @@ docs:Documentation Bug:nik:</programlisting>
 	    harmoniously together is just not worth the trade-off by
 	    any conceivable stretch of the imagination.</para>
 	  
-	  <para>To comply with this rule, don't send email when you're
+	  <para>To comply with this rule, do not send email when you are
 	    angry or otherwise behave in a manner which is likely to
 	    strike others as needlessly confrontational.  First calm
 	    down, then think about how to communicate in the most
 	    effective fashion for convincing the other person(s) that
-	    your side of the argument is correct, don't just blow off
+	    your side of the argument is correct, do not just blow off
 	    some steam so you can feel better in the short term at the
 	    cost of a long-term flame war.  Not only is this very bad
 	    <quote>energy economics</quote>, but repeated displays of
 	    public aggression which impair our ability to work well
 	    together will be dealt with severely by the project
 	    leadership and may result in suspension or termination of
-	    your commit privileges.  That's never an option which the
+	    your commit privileges.  That is never an option which the
 	    project's leadership enjoys in the slightest, but unity
 	    comes first.  No amount of code or good advice is worth
 	    trading that away.</para>
@@ -1476,11 +1476,11 @@ docs:Documentation Bug:nik:</programlisting>
 	<listitem>
 	  <para>Respect other contributors.</para>
 
-	  <para>You weren't always a committer. At one time you were 
+	  <para>You were not always a committer. At one time you were 
 	    a contributor. Remember that at all times. Remember what 
-	    it was like trying to get help and attention.  Don't forget
+	    it was like trying to get help and attention.  Do not forget
 	    that your work as a contributor time was very important to 
-	    you.  Remember what it was like. Don't discourage, belittle, 
+	    you.  Remember what it was like. Do not discourage, belittle, 
 	    or demean contributors.  Treat them with respect.  They are 
 	    our committers in waiting.  They are every bit as important 
 	    to the project as committers. Their contributions are as 
@@ -1500,16 +1500,16 @@ docs:Documentation Bug:nik:</programlisting>
 	    initially submitted for correctness or argued over, that
 	    should happen first in the mailing lists and then
 	    committed only once something resembling consensus has
-	    been reached.  This doesn't mean that you have to ask
+	    been reached.  This does not mean that you have to ask
 	    permission before correcting every obvious syntax error or
 	    man page misspelling, simply that you should try to
-	    develop a feel for when a proposed change isn't quite such
+	    develop a feel for when a proposed change is not quite such
 	    a no-brainer and requires some feedback first.  People
-	    really don't mind sweeping changes if the result is
+	    really do not mind sweeping changes if the result is
 	    something clearly better than what they had before, they
-	    just don't like being <emphasis>surprised</emphasis> by
+	    just do not like being <emphasis>surprised</emphasis> by
 	    those changes.  The very best way of making sure that
-	    you're on the right track is to have your code reviewed by
+	    you are on the right track is to have your code reviewed by
 	    one or more other committers.</para>
 
 	  <para>When in doubt, ask for review!</para>
@@ -1518,7 +1518,7 @@ docs:Documentation Bug:nik:</programlisting>
 	<listitem>
 	  <para>Respect existing maintainers if listed.</para>
 
-	  <para>Many parts of FreeBSD aren't <quote>owned</quote> in
+	  <para>Many parts of FreeBSD are not <quote>owned</quote> in
 	    the sense that any specific individual will jump up and
 	    yell if you commit a change to <quote>their</quote> area,
 	    but it still pays to check first.  One convention we use
@@ -1531,7 +1531,7 @@ docs:Documentation Bug:nik:</programlisting>
 	    several maintainers, commits to affected areas by one
 	    maintainer need to be reviewed by at least one other
 	    maintainer.  In cases where the
-	    <quote>maintainer-ship</quote> of something isn't clear,
+	    <quote>maintainer-ship</quote> of something is not clear,
 	    you can also look at the CVS logs for the file(s) in
 	    question and see if someone has been working recently or
 	    predominantly in that area.</para>
@@ -1547,14 +1547,14 @@ docs:Documentation Bug:nik:</programlisting>
 	  <para>Never touch the repository directly.  Ask a
 	    Repomeister.</para>
 
-	  <para>This is pretty clear - you're not allowed to make
+	  <para>This is pretty clear - you are not allowed to make
 	    direct modifications to the CVS repository, period.  In
 	    case of difficulty, ask one of the repository meisters by
 	    sending mail to <email>cvs@FreeBSD.org</email> and simply
 	    wait for them to fix the problem and get back to you. Do
 	    not attempt to fix the problem yourself!</para>
 	  
-	  <para>If you're thinking about putting down a tag or doing a
+	  <para>If you are thinking about putting down a tag or doing a
 	    new import of code on a vendor branch, you might also find
 	    it useful to ask for advice first.  A lot of people get
 	    this wrong the first few times and the consequences are
@@ -1571,14 +1571,14 @@ docs:Documentation Bug:nik:</programlisting>
 	    discretion.</para>
 	  
 	  <para>This may be hard to swallow in times of conflict (when
-	    each side is convinced that they're in the right, of
+	    each side is convinced that they are in the right, of
 	    course) but CVS makes it unnecessary to have an ongoing
-	    dispute raging when it's far easier to simply reverse the
+	    dispute raging when it is far easier to simply reverse the
 	    disputed change, get everyone calmed down again and then
 	    try and figure out how best to proceed.  If the change
 	    turns out to be the best thing after all, it can be easily
 	    brought back. If it turns out not to be, then the users
-	    didn't have to live with the bogus change in the tree
+	    did not have to live with the bogus change in the tree
 	    while everyone was busily debating its merits.  People
 	    very very rarely call for back-outs in the repository
 	    since discussion generally exposes bad or controversial
@@ -1591,7 +1591,7 @@ docs:Documentation Bug:nik:</programlisting>
 	<listitem>
 	  <para>Changes go to &os.current; before
 	    &os.stable; unless specifically permitted
-	    by the release engineer or unless they're not applicable
+	    by the release engineer or unless they are not applicable
 	    to &os.current;.  Any non-trivial or
 	    non-urgent change which is applicable should also be
 	    allowed to sit in &os.current; for at least
@@ -1600,8 +1600,8 @@ docs:Documentation Bug:nik:</programlisting>
 	    the &os.stable; branch as outlined in rule
 	    #6.</para>
 	
-	  <para>This is another <quote>don't argue about it</quote>
-	    issue since it's the release engineer who is ultimately
+	  <para>This is another <quote>do not argue about it</quote>
+	    issue since it is the release engineer who is ultimately
 	    responsible (and gets beaten up) if a change turns out to
 	    be bad.  Please respect this and give the release engineer
 	    your full cooperation when it comes to the
@@ -1610,7 +1610,7 @@ docs:Documentation Bug:nik:</programlisting>
 	    overly conservative to the casual observer, but also bear
 	    in mind the fact that conservatism is supposed to be the
 	    hallmark of &os.stable; and different rules
-	    apply there than in &os.current;.  There's
+	    apply there than in &os.current;.  There is
 	    also really no point in having &os.current;
 	    be a testing ground if changes are merged over to
 	    &os.stable; immediately.  Changes need a
@@ -1623,7 +1623,7 @@ docs:Documentation Bug:nik:</programlisting>
 	</listitem>
 
 	<listitem>
-	  <para>Don't fight in public with other committers; it looks
+	  <para>Do not fight in public with other committers; it looks
 	    bad.  If you must <quote>strongly disagree</quote> about
 	    something, do so only in private.</para>
 	  
@@ -1662,7 +1662,7 @@ docs:Documentation Bug:nik:</programlisting>
 	  
 	  <para>Committing changes during a code freeze is a really
 	    big mistake and committers are expected to keep up-to-date
-	    on what's going on before jumping in after a long absence
+	    on what is going on before jumping in after a long absence
 	    and committing 10 megabytes worth of accumulated stuff.
 	    People who abuse this on a regular basis will have their
 	    commit privileges suspended until they get back from the
@@ -1677,7 +1677,7 @@ docs:Documentation Bug:nik:</programlisting>
 	    something.  If you have not done it before, chances are
 	    good that you do not actually know the way we do things
 	    and really need to ask first or you are going to
-	    completely embarrass yourself in public.  There's no shame
+	    completely embarrass yourself in public.  There is no shame
 	    in asking <quote>how in the heck do I do this?</quote> We
 	    already know you are an intelligent person; otherwise, you
 	    would not be a committer.</para>
@@ -1687,7 +1687,7 @@ docs:Documentation Bug:nik:</programlisting>
 	  <para>Test your changes before committing them.</para>
 	  
 	  <para>This may sound obvious, but if it really were so
-	    obvious then we probably wouldn't see so many cases of
+	    obvious then we probably would not see so many cases of
 	    people clearly not doing this.  If your changes are to the
 	    kernel, make sure you can still compile both GENERIC and
 	    LINT.  If your changes are anywhere else, make sure you
@@ -1696,7 +1696,7 @@ docs:Documentation Bug:nik:</programlisting>
 	    running that code.  If you have a change which also may
 	    break another architecture, be sure and test on all
 	    supported architectures.  Currently, this is only the x86
-	    and the Alpha so it's pretty easy to do.  If you need to
+	    and the Alpha so it is pretty easy to do.  If you need to
 	    test on the AXP, your account on <hostid
 	    role="fqdn">beast.FreeBSD.org</hostid> will let you
 	    compile and test Alpha binaries/kernels/etc.  As other
@@ -1706,7 +1706,7 @@ docs:Documentation Bug:nik:</programlisting>
 	</listitem>
 
 	<listitem>
-	  <para>Don't commit to anything under the
+	  <para>Do not commit to anything under the
 	    <filename>src/contrib</filename>,
 	    <filename>src/crypto</filename>, and
 	    <filename>src/sys/contrib</filename> trees without
@@ -1715,14 +1715,14 @@ docs:Documentation Bug:nik:</programlisting>
 
 	  <para>The trees mentioned above are for contributed software
 	    usually imported onto a vendor branch.  Committing something
-	    there, even if it doesn't take the file off the vendor branch,
+	    there, even if it does not take the file off the vendor branch,
 	    may cause unnecessary headaches for those responsible for
 	    maintaining that particular piece of software.  Thus, unless
 	    you have <emphasis>explicit</emphasis> approval from the
 	    maintainer (or you are the maintainer), do
 	    <emphasis>not</emphasis> commit there!</para>
 
-	  <para>Please note that this doesn't mean you shouldn't try to
+	  <para>Please note that this does not mean you should not try to
 	    improve the software in question; you are still more than
 	    welcome to do so.  Ideally, you should submit your patches to
 	    the vendor.  If your changes are FreeBSD-specific, talk to the
@@ -1819,7 +1819,7 @@ docs:Documentation Bug:nik:</programlisting>
 	      instructions.</para>
 
 	    <para>Use &man.portlint.1; to check the syntax of the port.
-	      You don't necessarily have to eliminate all warnings but
+	      You do not necessarily have to eliminate all warnings but
 	      make sure you have fixed the simple ones.</para>
 
 	    <para>If the port came from a submitter who has not
@@ -2043,8 +2043,8 @@ docs:Documentation Bug:nik:</programlisting>
 	      There you will find error logs from the latest package
 	      building runs on 3-stable, 4-stable and 5-current.</para>
 
-	    <para>However, just because the port doesn't show up there
-	      doesn't mean it's building correctly.  (One of the
+	    <para>However, just because the port does not show up there
+	      does not mean it is building correctly.  (One of the
 	      dependencies may have failed, for instance.)  Here are
 	      the relevant directories on bento, so feel free to dig
 	      around.</para>
@@ -2093,7 +2093,7 @@ docs:Documentation Bug:nik:</programlisting>
 
 	<qandaentry>
 	  <question>
-	    <para>Are there any other files I'm not allowed to
+	    <para>Are there any other files I am not allowed to
 	      touch?</para>
 	  </question>
 
@@ -2103,7 +2103,7 @@ docs:Documentation Bug:nik:</programlisting>
 	      uppercase letter (<filename>Mk/</filename>,
 	      <filename>Tools/</filename>, etc.).  In particular, the
 	      ports manager is very protective of
-	      <filename>ports/Mk/bsd.port*.mk</filename> so don't
+	      <filename>ports/Mk/bsd.port*.mk</filename> so do not
 	      commit changes to those files unless you want to face his
 	      wra(i)th.</para>
 	  </answer>
@@ -2135,7 +2135,7 @@ docs:Documentation Bug:nik:</programlisting>
 	    </listitem>
 
 	    <listitem>
-	      <para>The <option>-j</option> option doesn't work very well.
+	      <para>The <option>-j</option> option does not work very well.
 		Ask &a.obrien; for horror stories.</para>
 	    </listitem>
 	  </itemizedlist>
@@ -2329,8 +2329,8 @@ MFC after:      <replaceable>2 weeks</replaceable></programlisting>
 
 	  <para>Consider the situation where a user has submitted a PR
 	    containing code from the NetBSD project.  You are looking at the
-	    PR, but it's not an area of the tree you normally work in, so
-	    you've decided to get the change reviewed by the
+	    PR, but it is not an area of the tree you normally work in, so
+	    you have decided to get the change reviewed by the
 	    <literal>arch</literal> mailing list.  Since the change is
 	    complex, you opt to <acronym>MFC</acronym> after one month to
 	    allow adequate testing.</para>
diff --git a/en_US.ISO8859-1/articles/dialup-firewall/article.sgml b/en_US.ISO8859-1/articles/dialup-firewall/article.sgml
index d4370e1593..d096255aa7 100644
--- a/en_US.ISO8859-1/articles/dialup-firewall/article.sgml
+++ b/en_US.ISO8859-1/articles/dialup-firewall/article.sgml
@@ -22,7 +22,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml,v 1.16 2001/09/24 11:28:11 murray Exp $</pubdate>
+    <pubdate>$FreeBSD$</pubdate>
 
     <abstract>
       <para>This article documents how to setup a firewall using a PPP
@@ -47,7 +47,7 @@
   <sect1 id="kernel">
     <title>Kernel Options</title>
     
-    <para>The first thing you'll need to do is recompile your kernel
+    <para>The first thing you will need to do is recompile your kernel
       If you need more information on how to recompile the kernel,
       then the best place to start is the <ulink
 	URL="http://www.freebsd.org/handbook/kernelconfig.html">kernel
@@ -113,7 +113,7 @@
       </varlistentry>
      </variablelist>
 
-    <para>Don't reboot once you have recompiled the kernel. Hopefully, 
+    <para>Do not reboot once you have recompiled the kernel. Hopefully, 
       we will only need to reboot once to complete the installation of the
       firewall.</para>
   </sect1>
@@ -161,11 +161,11 @@ ppp_profile="<replaceable>profile</replaceable>"</programlisting>
   <sect1 id="rules">
     <title>The ruleset for the firewall</title>
     
-    <para>We're nearly done now.  All that remains now is to define
+    <para>We are nearly done now.  All that remains now is to define
       the firewall rules and then we can reboot and the firewall
       should be up and running.  I realize that everyone will want
       something slightly different when it comes to their rulebase.
-      What I've tried to do is write a rulebase that suits most dialup
+      What I have tried to do is write a rulebase that suits most dialup
       users.  You can obviously modify it to your needs by using the
       following rules as the foundation for your own rulebase.  First,
       let's start with the basics of closed firewalling.  What you
@@ -254,10 +254,10 @@ $fwcmd add 65435 deny log ip from any to any</programlisting>
 	</question>
 	
 	<answer>
-	  <para>I'll have to be honest and say there's no definitive
+	  <para>I will have to be honest and say there is no definitive
 	    reason why I use <command>ipfw</command> and
 	    <command>natd</command> instead of the built in
-	    <command>ppp</command> filters.  From the discussions I've
+	    <command>ppp</command> filters.  From the discussions I have
 	    had with people the consensus seems to be that while
 	    <command>ipfw</command> is certainly more powerful and
 	    more configurable than the <command>ppp</command> filters,
@@ -290,7 +290,7 @@ $fwcmd add 65435 deny log ip from any to any</programlisting>
 
       <qandaentry>
 	<question>
-	  <para>If I'm using private addresses internally, such as in the
+	  <para>If I am using private addresses internally, such as in the
 	    192.168.0.0 range, could I add a command like <literal>$fwcmd add
 	      deny all from any to 192.168.0.0:255.255.0.0 via tun0</literal>
 	    to the firewall rules to prevent outside attempts to connect to
@@ -301,7 +301,7 @@ $fwcmd add 65435 deny log ip from any to any</programlisting>
 	  <para>The simple answer is no. The reason for this is that
 	    <command>natd</command> is doing address translation for
 	    <emphasis>anything</emphasis> being diverted through the
-	    <devicename>tun0</devicename> device. As far as it's
+	    <devicename>tun0</devicename> device. As far as it is
 	    concerned incoming packets will speak only to the
 	    dynamically assigned IP address and <emphasis>not</emphasis> to the internal
 	    network. Note though that you can add a rule like
diff --git a/en_US.ISO8859-1/articles/diskless-x/article.sgml b/en_US.ISO8859-1/articles/diskless-x/article.sgml
index d6a6fd1fde..22c29f5283 100644
--- a/en_US.ISO8859-1/articles/diskless-x/article.sgml
+++ b/en_US.ISO8859-1/articles/diskless-x/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/articles/diskless-x/article.sgml,v 1.4 2001/04/17 15:53:37 nik Exp $
+     $FreeBSD$
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -228,7 +228,7 @@ bootps  dgram  udp  wait  root  /usr/libexec/bootpd bootpd /etc/bootptab</progra
 
 	  <row>
 	    <entry><literal>ip=199.246.76.2</literal></entry>
-	    <entry>tells the client what it's IP address is.</entry>
+	    <entry>tells the client what its IP address is.</entry>
 	  </row>
 
 	  <row>
@@ -304,7 +304,7 @@ hostname altair.kcis.com</programlisting>
 -r-xr-xr-x  1 root  wheel    1992 Jun 10  1995 ./dev/MAKEDEV.local
 -r-xr-xr-x  1 root  wheel   24419 Jun 10  1995 ./dev/MAKEDEV</screen>
     
-    <para>Don't forget to run <command>MAKEDEV all</command> in the
+    <para>Do not forget to run <command>MAKEDEV all</command> in the
       <filename>dev</filename> directory.</para>
 
     <para>My <filename>/etc/rc</filename> for <hostid>altair</hostid>
diff --git a/en_US.ISO8859-1/articles/explaining-bsd/article.sgml b/en_US.ISO8859-1/articles/explaining-bsd/article.sgml
index 6bbf269ebd..f4f94f6538 100644
--- a/en_US.ISO8859-1/articles/explaining-bsd/article.sgml
+++ b/en_US.ISO8859-1/articles/explaining-bsd/article.sgml
@@ -21,7 +21,7 @@
 
     <abstract>
       <para>In the open source world, the word <quote>Linux</quote> is almost
-	synonymous with <quote>Operating System</quote>, but it's not the only
+	synonymous with <quote>Operating System</quote>, but it is not the only
 	open source <trademark>UNIX</trademark> operating system.  According
 	to the <ulink
          url="http://www.leb.net/hzo/ioscount/data/r.9904.txt">Internet
@@ -34,7 +34,7 @@
 	transfer 1.4 TB of data a day.    Clearly this is not a niche
 	market: BSD is a well-kept secret.</para>
 
-      <para>So what's the secret?  Why isn't BSD better known?  This white
+      <para>So what is the secret?  Why is BSD not better known?  This white
 	paper addresses these and other questions.</para>
 
       <para>Throughout this paper, differences between BSD and Linux will be
@@ -105,7 +105,7 @@
       could that happen when AT&amp;T has never released its code as open
       source?</para>
 
-    <para>It's true that AT&amp;T UNIX is not open source, and in a copyright
+    <para>It is true that AT&amp;T UNIX is not open source, and in a copyright
       sense BSD is very definitely <emphasis>not</emphasis> UNIX, but on the
       other hand, AT&amp;T has imported sources from other projects,
       noticeably the Computer Sciences Research Group of the University of
@@ -157,16 +157,16 @@
       <ulink url="http://www.FreeBSD.org">FreeBSD</ulink>.  The two projects
       originally diverged due to differences in patience waiting for
       improvements to 386BSD: the NetBSD people started early in the year,
-      and the first version of FreeBSD wasn't ready until the end of the
+      and the first version of FreeBSD was not ready until the end of the
       year.  In the meantime, the code base had diverged sufficiently to
       make it difficult to merge.  In addition, the projects had different
-      aims, as we'll see below.  In 1996, a further project,
+      aims, as we will see below.  In 1996, a further project,
       <ulink url="http://www.OpenBSD.org">OpenBSD</ulink>, split off from
       NetBSD.</para>
   </sect1>
   
   <sect1>
-    <title>Why isn't BSD better known?</title>
+    <title>Why is BSD not better known?</title>
     
     <para>For a number of reasons, BSD is relatively unknown:</para>
     
@@ -221,11 +221,11 @@
   <sect1>
     <title>Comparing BSD and Linux</title>
 
-    <para>So what's really the difference between, say, Debian Linux and
+    <para>So what is really the difference between, say, Debian Linux and
       FreeBSD?  For the average user, the difference is surprisingly small:
       Both are UNIX-like operating systems.  Both are developed by
-      non-commercial projects (this doesn't apply to many other Linux
-      distributions, of course).  In the following section, we'll look at BSD
+      non-commercial projects (this does not apply to many other Linux
+      distributions, of course).  In the following section, we will look at BSD
       and compare it to Linux.  The description applies most closely to
       FreeBSD, which accounts for an estimated 80% of the BSD installations,
       but the differences from NetBSD and OpenBSD are small.</para>
@@ -394,7 +394,7 @@
 	fewer divergences between the userland code of the projects than there
 	is in Linux.</para>
 
-      <para>It's difficult to categorize the goals of each project: the
+      <para>It is difficult to categorize the goals of each project: the
 	differences are very subjective.  Basically,</para>
 
       <itemizedlist>
@@ -492,12 +492,12 @@
 	<listitem>
 	  <para><quote>If it ain't broke, don't fix it</quote>: If you already
 	    use an open source operating system, and you are happy with it,
-	    there's probably no good reason to change.</para>
+	    there is probably no good reason to change.</para>
 	</listitem>
 	
 	<listitem>
 	  <para>BSD systems, in particular FreeBSD, can have notably higher
-	    performance than Linux.  But this isn't across the board.  In many
+	    performance than Linux.  But this is not across the board.  In many
 	    cases, there is little or no difference in performance.  In some
 	    cases, Linux may perform better than FreeBSD.</para>
 	</listitem>
@@ -513,7 +513,7 @@
 	</listitem>
 
 	<listitem>
-	  <para>BSD can execute Linux code, while Linux can't execute BSD
+	  <para>BSD can execute Linux code, while Linux can not execute BSD
 	    code.  As a result, more software is available for BSD than for
 	    Linux.</para>
 	</listitem>
diff --git a/en_US.ISO8859-1/articles/filtering-bridges/article.sgml b/en_US.ISO8859-1/articles/filtering-bridges/article.sgml
index ae360c94fb..eaaa3158f6 100644
--- a/en_US.ISO8859-1/articles/filtering-bridges/article.sgml
+++ b/en_US.ISO8859-1/articles/filtering-bridges/article.sgml
@@ -18,10 +18,10 @@
       </author>
     </authorgroup>
     
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml,v 1.1 2001/06/25 15:04:01 nik Exp $</pubdate>
+    <pubdate>$FreeBSD$</pubdate>
 
     <abstract>
-      <para>For those of you who don't know, DSL differs from more traditional
+      <para>For those of you who do not know, DSL differs from more traditional
         connectivity methods in that the "connectivity spigot" that comes
         out of the wall has no possibility for packet filtering.  If you get
         a T1 line or some such it will come with a router that can generally
@@ -69,7 +69,7 @@
     </important>
 
     <para>Adding bridging to a FreeBSD machine is not hard to do.  It means
-      having 2 (or more, but we'll just use 2 here) Ethernet cards and adding
+      having 2 (or more, but we will just use 2 here) Ethernet cards and adding
       a couple of lines to the kernel configuration.  Since May of 2000,
       RELENG_4 and -current have had bridging support for all Ethernet
       interfaces.  This does not mean that any Ethernet interface will work.
@@ -83,13 +83,13 @@
     <para>So you will want to add the following to your kernel configuration
       file:</para>
     
-    <programlisting>device fxp (or whatever is appropriate for the cards you're using)
+    <programlisting>device fxp (or whatever is appropriate for the cards you are using)
 options BRIDGE
 options IPFIREWALL
 options IPFIREWALL_VERBOSE</programlisting>
 
     <para>Note that recent versions of FreeBSD support dynamically loading the
-      IP Firewall code into the kernel.  You can't do this, however, with
+      IP Firewall code into the kernel.  You can not do this, however, with
       bridging, as the bridge code itself needs to interact with IPFIREWALL
       in a special way.</para>
 
@@ -227,7 +227,7 @@ firewall_type="open"</programlisting>
     <para>Let's look at an example setup.  Note first that at the top of
       <filename>/etc/rc.firewall</filename> we should already have taken care
       of the loopback interface and the special hack for ARP should still be
-      in place.  So we won't worry about them any further.</para>
+      in place.  So we will not worry about them any further.</para>
 
 <programlisting>us_ip=192.168.1.1
 oif=fxp0
@@ -283,15 +283,15 @@ ${ipfw} add deny log ip from any to any</programlisting>
 
     <para>That is, drop packets claiming to be from our network that are
       coming in from the outside.  This is something that you would commonly
-      do to make sure that someone doesn't try and evade the packet filter by
+      do to make sure that someone does not try and evade the packet filter by
       generating nefarious packets that look like they are from the inside.
       The problem with that is that there is at least one host on the outside
       interface that you do not want to ignore -- your router.  In my
       particular case, I have some machines on the outside and some on the
-      inside, but I don't necessarily want the outside machines to have
-      routine access to the inside.  At the same time, I don't want to throw
+      inside, but I do not necessarily want the outside machines to have
+      routine access to the inside.  At the same time, I do not want to throw
       their traffic away.  In my own case, my ISP anti-spoofs at their router,
-      so I don't need to bother.  And in general, the fewer rules the better,
+      so I do not need to bother.  And in general, the fewer rules the better,
       since it will take time and CPU to process each one.</para>
 
     <para>Note also that the last rule is almost an exact duplicate of the
@@ -316,20 +316,20 @@ ${ipfw} add deny log ip from any to any</programlisting>
       that you enable the correct interface.</para>
 
     <para>Another item to note is that the DNS rules are set up only to
-      allow DNS servers to work.  This means that if don't set up a
-      DNS server, you don't need them.</para>
+      allow DNS servers to work.  This means that if do not set up a
+      DNS server, you do not need them.</para>
 
     <para>Folks used to setting up IP firewalls also probably are used to
       either having a 'reset' or a 'forward' rule for ident packets
       (TCP port 113).  Unfortunately, this is not an option with the
       bridging code, so the path of least resistance is to simply pass
       them to their destination.  As long as that destination machine
-      isn't running an ident daemon, this is relatively harmless.
+      is not running an ident daemon, this is relatively harmless.
       The alternative is dropping port 113 connections, which makes
       firing up things like IRC take forever (the ident probe must
       timeout).</para>
 
-    <para>The only other thing that's a little weird that you may have noticed
+    <para>The only other thing that is a little weird that you may have noticed
       is that there is a rule to let ${us_ip} speak and a separate rule to
       allow the inside network to speak.  Remember that this is because the
       two sets of traffic will be taking different paths through the kernel
@@ -338,7 +338,7 @@ ${ipfw} add deny log ip from any to any</programlisting>
       stack to speak.  Thus the two rules to handle the different cases.  The
       in via ${oif} rules work for both paths.  In general if you use in via
       rules throughout the filter, you will need to make an exception for
-      locally generated packets, because they didn't "come in" via
+      locally generated packets, because they did not "come in" via
       anything.</para>
   </sect1>
 
diff --git a/en_US.ISO8859-1/articles/fonts/article.sgml b/en_US.ISO8859-1/articles/fonts/article.sgml
index 09425ef64d..a5644aeca2 100644
--- a/en_US.ISO8859-1/articles/fonts/article.sgml
+++ b/en_US.ISO8859-1/articles/fonts/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/fonts/article.sgml,v 1.16 2001/07/06 13:02:48 dd Exp $ -->
+<!-- $FreeBSD$ -->
 <!-- The FreeBSD Documentation Project -->
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
@@ -691,8 +691,8 @@ EOF</userinput>
 	    upper case, so any renaming must be consistent with this.
 	    (Actually, <filename>GS_TTF.PS</filename> and
 	    <filename>PFS2AFM.PS</filename> are supposedly part of the
-	    ghostscript distribution, but it's just as easy to use
-	    these as an isolated utility.  FreeBSD doesn't seem to
+	    ghostscript distribution, but it is just as easy to use
+	    these as an isolated utility.  FreeBSD does not seem to
 	    include the latter.) You also may want to have these
 	    installed to
 	    <filename>/usr/local/share/groff_font/devps</filename>(?).</para>
@@ -709,13 +709,13 @@ EOF</userinput>
 	    requires some work to get going.</para>
 
 	  <note>
-	    <para> If you're paranoid about working in the
+	    <para> If you are paranoid about working in the
 	      <filename>/usr/src</filename> tree, simply copy the
 	      contents of the above directory to a work
 	      location.</para>
 	  </note>
 
-	  <para>In the work area, you'll need to make the utility.
+	  <para>In the work area, you will need to make the utility.
 	    Just type:</para>
 
 	  <screen><prompt>#</prompt> <userinput>make -f Makefile.sub afmtodit</userinput>
@@ -725,12 +725,12 @@ EOF</userinput>
 	    <filename>/usr/contrib/groff/devps/generate/textmap</filename>
 	    to
 	    <filename>/usr/share/groff_font/devps/generate</filename>
-	    if it doesn't already exist.</para>
+	    if it does not already exist.</para>
 	</listitem>
       </varlistentry>
     </variablelist>
 
-    <para>Once all these utilities are in place, you're ready to
+    <para>Once all these utilities are in place, you are ready to
       commence:</para>
 
     <orderedlist>
@@ -753,7 +753,7 @@ EOF</userinput>
 	<para>This also produces a <filename>.pfa</filename> file, the
 	  ascii postscript font metrics file
 	  (<filename>.pfb</filename> is for the binary form).  This
-	  won't be needed, but could (I think) be useful for a
+	  will not be needed, but could (I think) be useful for a
 	  fontserver.</para>
 
 	<para>For example, to convert the 30f9 Barcode font using the
@@ -783,8 +783,8 @@ Converting 3of9.ttf to A.pfa and B.afm.
 
 	<para>Change directories to
 	  <filename>/usr/share/groff_font/devps</filename> so as to
-	  make the following command easier to execute.  You'll
-	  probably need root privileges for this.  (Or, if you're
+	  make the following command easier to execute.  You will
+	  probably need root privileges for this.  (Or, if you are
 	  paranoid about working there, make sure you reference the
 	  files <filename>DESC</filename>,
 	  <filename>text.enc</filename> and
diff --git a/en_US.ISO8859-1/articles/formatting-media/article.sgml b/en_US.ISO8859-1/articles/formatting-media/article.sgml
index 6714d32718..a89cacf1ce 100644
--- a/en_US.ISO8859-1/articles/formatting-media/article.sgml
+++ b/en_US.ISO8859-1/articles/formatting-media/article.sgml
@@ -2,7 +2,7 @@
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 ]>
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/formatting-media/article.sgml,v 1.20 2001/08/21 20:16:45 logo Exp $ -->
+<!-- $FreeBSD$ -->
 <article>
   <articleinfo>
     <title>Formatting Media For Use With FreeBSD</title>
@@ -274,14 +274,14 @@ drive(s)?</screen>
 	  <para>Label as desired.  For a single partition, enter
 	    <command>C</command> to Create a partition, accept the
 	    default size, partition type Filesystem, and a mountpoint
-	    (which isn't used).</para>
+	    (which is not used).</para>
 	</step> 
 
 	<step>
 	  <para>Enter <command>W</command> when done and confirm to
 	    continue.  The filesystem will be newfs'd for you, unless
-	    you select otherwise (for new partitions you'll want to
-	    do this!).  You'll get the error: 
+	    you select otherwise (for new partitions you will want to
+	    do this!).  You will get the error: 
 
 	    <informalexample>
 	      <screen>Error mounting /mnt/dev/ad2s1e on /mnt/blah : No such file or directory</screen>
@@ -399,7 +399,7 @@ drive(s)?</screen>
 	</step>
 
 	<step>
-	  <para>You'll be asked about the boot manager, select
+	  <para>You will be asked about the boot manager, select
 	    <command>None</command> again. </para>
 	</step> 
 
@@ -411,13 +411,13 @@ drive(s)?</screen>
 	<step>
 	  <para>Label as desired.  For a single partition, accept the
 	    default size, type filesystem, and a mountpoint (which
-	    isn't used).</para>
+	    is not used).</para>
 	</step> 
 
 	<step>
 	  <para>The filesystem will be newfs'd for you, unless you
-	    select otherwise (for new partitions you'll want to do
-	    this!).  You'll get the error:
+	    select otherwise (for new partitions you will want to do
+	    this!).  You will get the error:
 
 	    <informalexample>
 	      <screen>Error mounting /mnt/dev/ad2s1e on /mnt/blah : No such file or directory</screen> 
@@ -442,7 +442,7 @@ drive(s)?</screen>
     <sect2>
       <title>Adding Swap Space</title>
 
-      <para>As a system grows, it's need for swap space can also grow.
+      <para>As a system grows, its need for swap space can also grow.
 	Although adding swap space to existing disks is very
 	difficult, a new disk can be partitioned with additional swap
 	space.</para>
@@ -537,7 +537,7 @@ swapon:  added /dev/da0b as swap space</screen>
   c: 60074784        0    unused        0     0     0   # (Cyl.    0 - 59597)</screen>
       </informalexample>
 
-      <para>You shouldn't use partition <emphasis>c</emphasis> for the CCD,
+      <para>You should not use partition <emphasis>c</emphasis> for the CCD,
       since it is of type <emphasis>unused</emphasis>.  Instead, create a new
       partition of exactly the same size, but with type
       <emphasis>4.2BSD</emphasis>:</para>
diff --git a/en_US.ISO8859-1/articles/freebsd-questions/article.sgml b/en_US.ISO8859-1/articles/freebsd-questions/article.sgml
index 2e3394c91b..a6eb23c0c0 100644
--- a/en_US.ISO8859-1/articles/freebsd-questions/article.sgml
+++ b/en_US.ISO8859-1/articles/freebsd-questions/article.sgml
@@ -17,7 +17,7 @@
       </affiliation>
     </author>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml,v 1.5 2001/07/17 20:51:47 chern Exp $</pubdate>
+    <pubdate>$FreeBSD$</pubdate>
 
     <abstract>
       <para>This document provides useful information for people looking to
@@ -42,7 +42,7 @@
     <note>
       <para>The term <quote>hacker</quote> has nothing to do with breaking
 	into other people's computers.  The correct term for the latter
-	activity is <quote>cracker</quote>, but the popular press hasn't found
+	activity is <quote>cracker</quote>, but the popular press has not found
 	out yet.  The FreeBSD hackers disapprove strongly of cracking
 	security, and have nothing to do with it.  For a longer description of
 	hackers, see Eric Raymond's <ulink
@@ -58,14 +58,14 @@
       viewpoints of the two groups.  The newcomers accuse the hackers of being
       arrogant, stuck-up, and unhelpful, while the hackers accuse the
       newcomers of being stupid, unable to read plain English, and expecting
-      everything to be handed to them on a silver platter.  Of course, there's
+      everything to be handed to them on a silver platter.  Of course, there is
       an element of truth in both these claims, but for the most part these
       viewpoints come from a sense of frustration.</para>
 
-    <para>In this document, I'd like to do something to relieve this
+    <para>In this document, I would like to do something to relieve this
       frustration and help everybody get better results from
       FreeBSD-questions.  In the following section, I recommend how to submit
-      a question; after that, we'll look at how to answer one.</para>
+      a question; after that, we will look at how to answer one.</para>
   </sect1>
   
   <sect1>
@@ -78,13 +78,13 @@
     <literallayout class="monospaced">subscribe FreeBSD-questions</literallayout>
     
     <para><application>majordomo</application> is an automatic program which
-      maintains the mailing list, so you don't need a subject line.  If your
+      maintains the mailing list, so you do not need a subject line.  If your
       mailer complains, however, you can put anything you like in the subject
       line.</para>
     
     <para>When you get the reply from <application>majordomo</application>
       telling you the details of the list, <emphasis>please save
-      it</emphasis>. If you ever should want to leave the list, you'll need
+      it</emphasis>. If you ever should want to leave the list, you will need
       the information there.  See the next section for more details.</para>
   </sect1>
   
@@ -93,7 +93,7 @@
 
     <para>When you subscribed to FreeBSD-questions, you got a welcome message
       from <email>Majordomo@FreeBSD.ORG</email>.  In this message, amongst
-      other things, it told you how to unsubscribe.  Here's a typical
+      other things, it told you how to unsubscribe.  Here is a typical
       message:</para>
 
     <literallayout class="monospaced">Welcome to the freebsd-questions mailing list!
@@ -113,15 +113,15 @@ You should not send "how to" questions to the technical lists unless
 you consider the question to be pretty technical.</literallayout>
 
     <para>Normally, unsubscribing is even simpler than the message suggests:
-      you don't need to specify your mail ID unless it is different from the
+      you do not need to specify your mail ID unless it is different from the
       one which you specified when you subscribed.</para>
 
-    <para>If Majordomo replies and tells you (incorrectly) that you're not on
+    <para>If Majordomo replies and tells you (incorrectly) that you are not on
       the list, this may mean one of two things:</para>
 
     <orderedlist>
       <listitem>
-	<para>You have changed your mail ID since you subscribed.  That's
+	<para>You have changed your mail ID since you subscribed.  That is
 	  where keeping the original message from <literal>majordomo</literal>
 	  comes in handy. For example, the sample message above shows my mail
 	  ID as <literal>grog@lemis.de</literal>.  Since then, I have changed
@@ -131,19 +131,19 @@ you consider the question to be pretty technical.</literallayout>
       </listitem>
 
       <listitem>
-	<para>You're subscribed to a mailing list which is subscribed to
-	  <literal>FreeBSD-questions</literal>.  If that's the case, you'll
+	<para>You are subscribed to a mailing list which is subscribed to
+	  <literal>FreeBSD-questions</literal>.  If that is the case, you will
 	  have to figure out which one it is and get your name taken off that
-	  one.  If you're not sure which one it might be, check the headers of
-	  the messages you receive from freebsd-questions: maybe there's a
+	  one.  If you are not sure which one it might be, check the headers of
+	  the messages you receive from freebsd-questions: maybe there is a
 	  clue there.</para>
       </listitem>
     </orderedlist>
 
-    <para>If you've done all this, and you still can't figure out what's going
+    <para>If you have done all this, and you still can not figure out what is going
       on, send a message to <email>Postmaster@FreeBSD.org</email>, and he will
-      sort things out for you.  <emphasis>Don't</emphasis> send a message to
-      FreeBSD-questions: they can't help you.</para>
+      sort things out for you.  <emphasis>Do not</emphasis> send a message to
+      FreeBSD-questions: they can not help you.</para>
   </sect1>
 
   <sect1>
@@ -152,7 +152,7 @@ you consider the question to be pretty technical.</literallayout>
 
     <para>Two mailing lists handle general questions about FreeBSD,
       <literal>FreeBSD-questions</literal> and
-      <literal>FreeBSD-hackers</literal>.  In some cases, it's not really
+      <literal>FreeBSD-hackers</literal>.  In some cases, it is not really
       clear which group you should ask.  The following criteria should help
       for 99% of all questions, however:</para>
     
@@ -165,14 +165,14 @@ you consider the question to be pretty technical.</literallayout>
       </listitem>
       
       <listitem>
-	<para>If you think the question relates to a bug, but you're not sure,
-	  or you don't know how to look for it, send the message to
+	<para>If you think the question relates to a bug, but you are not sure,
+	  or you do not know how to look for it, send the message to
 	  <literal>FreeBSD-questions</literal>.</para>
       </listitem>
       
       <listitem>
-	<para>If the question relates to a bug, and you're
-	  <emphasis>sure</emphasis> that it's a bug (for example, you can
+	<para>If the question relates to a bug, and you are
+	  <emphasis>sure</emphasis> that it is a bug (for example, you can
 	  pinpoint the place in the code where it happens, and you maybe have
 	  a fix), then send the message to
 	  <literal>FreeBSD-hackers</literal>.</para>
@@ -188,9 +188,9 @@ you consider the question to be pretty technical.</literallayout>
     <para>There are also a number of other specialized mailing lists, for
       example <literal>FreeBSD-isp</literal>, which caters to the interests of
       ISPs (Internet Service Providers) who run FreeBSD.  If you happen to be
-      an ISP, this doesn't mean you should automatically send your questions
+      an ISP, this does not mean you should automatically send your questions
       to <literal>FreeBSD-isp</literal>.  The criteria above still apply, and
-      it's in your interest to stick to them, since you're more likely to get
+      it is in your interest to stick to them, since you are more likely to get
       good results that way.</para>
   </sect1>
 
@@ -207,33 +207,33 @@ you consider the question to be pretty technical.</literallayout>
 	  free will positively by submitting a well-formulated question
 	  supplying as much relevant information as possible.  You can
 	  influence this free will negatively by submitting an incomplete,
-	  illegible, or rude question. It's perfectly possible to send a
+	  illegible, or rude question. It is perfectly possible to send a
 	  message to FreeBSD-questions and not get an answer even if you
-	  follow these rules.  It's much more possible to not get an answer if
-	  you don't.  In the rest of this document, we'll look at how to get
+	  follow these rules.  It is much more possible to not get an answer if
+	  you do not.  In the rest of this document, we will look at how to get
 	  the most out of your question to FreeBSD-questions.</para>
       </listitem>
       
       <listitem>
 	<para>Not everybody who answers FreeBSD questions reads every message:
 	  they look at the subject line and decide whether it interests them.
-	  Clearly, it's in your interest to specify a subject. ``FreeBSD
-	  problem'' or ``Help'' aren't enough.  If you provide no subject at
-	  all, many people won't bother reading it.  If your subject isn't
+	  Clearly, it is in your interest to specify a subject. ``FreeBSD
+	  problem'' or ``Help'' are not enough.  If you provide no subject at
+	  all, many people will not bother reading it.  If your subject is not
 	  specific enough, the people who can answer it may not read
 	  it.</para>
       </listitem>
 
       <listitem>
 	<para>Format your message so that it is	legible, and
-	    PLEASE DON'T SHOUT!!!!!.  We appreciate that a lot of people don't
+	    PLEASE DO NOT SHOUT!!!!!.  We appreciate that a lot of people do not
 	    speak English as their first language, and we try to make
-	    allowances for that, but it's really painful to try to read a
+	    allowances for that, but it is really painful to try to read a
 	    message written full of typos or without any line breaks.</para>
 	
-	<para>Don't underestimate the effect that a poorly formatted mail
+	<para>Do not underestimate the effect that a poorly formatted mail
 	  message has, not just on the FreeBSD-questions mailing list.
-	  Your mail message is all people see of you, and if it's poorly
+	  Your mail message is all people see of you, and if it is poorly
 	  formatted, one line per paragraph, badly spelt, or full of
 	  errors, it will give people a poor impression of you.</para>
 
@@ -277,7 +277,7 @@ you consider the question to be pretty technical.</literallayout>
 	  offenders.  If at all possible, use a UNIX mailer. If you must use a
 	  mailer under Microsoft environments, make sure it is set up
 	  correctly. Try not to use <acronym>MIME</acronym>: a lot of people
-	  use mailers which don't get on very well with
+	  use mailers which do not get on very well with
 	  <acronym>MIME</acronym>.</para>
       </listitem>
       
@@ -286,13 +286,13 @@ you consider the question to be pretty technical.</literallayout>
 	  seem a little silly, since your message still gets there, but many
 	  of the people you are trying to reach get several hundred messages a
 	  day.  They frequently sort the incoming messages by subject and by
-	  date, and if your message doesn't come before the first answer, they
+	  date, and if your message does not come before the first answer, they
 	  may assume they missed it and not bother to look.</para>
       </listitem>
 
       <listitem>
-	<para>Don't include unrelated questions in the same message.  Firstly,
-	  a long message tends to scare people off, and secondly, it's more
+	<para>Do not include unrelated questions in the same message.  Firstly,
+	  a long message tends to scare people off, and secondly, it is more
 	  difficult to get all the people who can answer all the questions to
 	  read the message.</para>
       </listitem>
@@ -300,44 +300,44 @@ you consider the question to be pretty technical.</literallayout>
       <listitem>
 	<para>Specify as much information as possible. This is a difficult
 	  area, and we need to expand on what information you need to submit,
-	  but here's a start:</para>
+	  but here is a start:</para>
 
 	<itemizedlist>
 	  <listitem>
-	    <para>In nearly every case, it's important to know the version of
-	      FreeBSD you're running.  This is particularly the case for
+	    <para>In nearly every case, it is important to know the version of
+	      FreeBSD you are running.  This is particularly the case for
 	      FreeBSD-CURRENT, where you should also specify the date of the
-	      sources, though of course you shouldn't be sending questions
+	      sources, though of course you should not be sending questions
 	      about -CURRENT to FreeBSD-questions.</para>
 	  </listitem>
 	  
 	  <listitem><para>With any problem which <emphasis>could</emphasis> be
 	      hardware related, tell us about your hardware.  In case of
-	      doubt, assume it's possible that it's hardware.  What kind of
+	      doubt, assume it is possible that it is hardware.  What kind of
 	      CPU are you using?  How fast?  What motherboard?  How much
 	      memory?  What peripherals?</para>
 
-	    <para>There's a judgement call here, of course, but the output of
+	    <para>There is a judgement call here, of course, but the output of
 	      the &man.dmesg.8; command can frequently be very useful, since it
-	      tells not just what hardware you're running, but what version of
+	      tells not just what hardware you are running, but what version of
 	      FreeBSD as well.</para>
 	  </listitem>
 	  
 	  <listitem>
-	    <para>If you get error messages, don't say <quote>I get error
+	    <para>If you get error messages, do not say <quote>I get error
 		messages</quote>, say (for example) <quote>I get the error
 		message 'No route to host'</quote>.</para>
 	  </listitem>
 
 	  <listitem>
-	    <para>If your system panics, don't say <quote>My system
+	    <para>If your system panics, do not say <quote>My system
 		panicked</quote>, say (for example) <quote>my system panicked
 		with the message 'free vnode isn't'</quote>.</para>
 	  </listitem>
 
 	  <listitem>
 	    <para>If you have difficulty installing FreeBSD, please tell us
-	      what hardware you have.  In particular, it's important to know
+	      what hardware you have.  In particular, it is important to know
 	      the IRQs and I/O addresses of the boards installed in your
 	      machine.</para>
 	  </listitem>
@@ -355,8 +355,8 @@ you consider the question to be pretty technical.</literallayout>
       <listitem>
           <para>A lot of the information you need to supply is the output of
 	  programs, such as &man.dmesg.8;, or console messages, which usually
-	  appear in <filename>/var/log/messages</filename>.  Don't try to copy
-	  this information by typing it in again; it's a real pain, and you're
+	  appear in <filename>/var/log/messages</filename>.  Do not try to copy
+	  this information by typing it in again; it is a real pain, and you are
 	  bound to make a mistake. To send log file contents, either make a
 	  copy of the file and use an editor to trim the information to what
 	  is relevant, or cut and paste into your message.  For the output of
@@ -370,19 +370,19 @@ you consider the question to be pretty technical.</literallayout>
       </listitem>
       
       <listitem>
-	<para>If you do all this, and you still don't get an answer, there
+	<para>If you do all this, and you still do not get an answer, there
 	  could be other reasons.  For example, the problem is so complicated
 	  that nobody knows the answer, or the person who does know the answer
-	  was offline.  If you don't get an answer after, say, a week, it
-	  might help to re-send the message.  If you don't get an answer to
-	  your second message, though, you're probably not going to get one
+	  was offline.  If you do not get an answer after, say, a week, it
+	  might help to re-send the message.  If you do not get an answer to
+	  your second message, though, you are probably not going to get one
 	  from this forum.  Resending the same message again and again will
 	  only make you unpopular.</para>
       </listitem>
     </itemizedlist>
     
     <para>To summarize, let's assume you know the answer to the following
-      question (yes, it's the same one in each case).
+      question (yes, it is the same one in each case).
       You choose which of these two questions you would be more prepared to
       answer:</para>
 
@@ -420,13 +420,13 @@ fine, but when I try to reboot the system, I get the message
     <orderedlist>
       <listitem>
 	<para>You include the original message text, so people will know what
-	  you're talking about.  Don't forget to trim unnecessary text out,
+	  you are talking about.  Do not forget to trim unnecessary text out,
 	  though.</para>
       </listitem>
       
       <listitem>
 	<para>The text in the subject line stays the same (you did remember to
-	  put one in, didn't you?).  Many mailers will sort messages by
+	  put one in, did you not?).  Many mailers will sort messages by
 	  subject. This helps group messages together.</para>
       </listitem>
 
@@ -455,32 +455,32 @@ fine, but when I try to reboot the system, I get the message
       <listitem>
 	<para>Has somebody already answered the question?  The easiest way to
 	  check this is to sort your incoming mail by subject: then
-	  (hopefully) you'll see the question followed by any answers, all
+	  (hopefully) you will see the question followed by any answers, all
 	  together.</para>
 	
-	<para>If somebody has already answered it, it doesn't automatically
-	  mean that you shouldn't send another answer.  But it makes sense to
+	<para>If somebody has already answered it, it does not automatically
+	  mean that you should not send another answer.  But it makes sense to
 	  read all the other answers first.</para>
       </listitem>
 
       <listitem>
 	<para>Do you have something to contribute beyond what has already been
-	  said?  In general, <quote>Yeah, me too</quote> answers don't help
+	  said?  In general, <quote>Yeah, me too</quote> answers do not help
 	  much, although there are exceptions, like when somebody is
-	  describing a problem he's having, and he doesn't know whether it's
-	  his fault or whether there's something wrong with the hardware or
+	  describing a problem he is having, and he does not know whether it is
+	  his fault or whether there is something wrong with the hardware or
 	  software.  If you do send a <quote>me too</quote> answer, you should
 	  also include any further relevant information.</para>
       </listitem>
 
       <listitem>
 	<para>Are you sure you understand the question?  Very frequently, the
-	  person who asks the question is confused or doesn't express himself
-	  very well.  Even with the best understanding of the system, it's
-	  easy to send a reply which doesn't answer the question.  This
-	  doesn't help: you'll leave the person who submitted the question
+	  person who asks the question is confused or does not express himself
+	  very well.  Even with the best understanding of the system, it is
+	  easy to send a reply which does not answer the question.  This
+	  does not help: you will leave the person who submitted the question
 	  more frustrated or confused than ever.  If nobody else answers, and
-	  you're not too sure either, you can always ask for more
+	  you are not too sure either, you can always ask for more
 	  information.</para>
       </listitem>
 
@@ -488,17 +488,17 @@ fine, but when I try to reboot the system, I get the message
 	<para>Are you sure your answer is correct?
 	If not, wait a day or so. If nobody else comes up with a
 	better answer, you can still reply and say, for example, <quote>I
-	don't know if this is correct, but since nobody else has
+	do not know if this is correct, but since nobody else has
 	replied, why don't you try replacing your ATAPI CDROM with
 	a frog?</quote>.</para>
       </listitem>
 
       <listitem>
-	<para>Unless there's a good reason to do otherwise, reply to the
+	<para>Unless there is a good reason to do otherwise, reply to the
 	  sender and to FreeBSD-questions. Many people on the
 	  FreeBSD-questions are <quote>lurkers</quote>: they learn by reading
 	  messages sent and replied to by others. If you take a message which
-	  is of general interest off the list, you're depriving these people
+	  is of general interest off the list, you are depriving these people
 	  of their information. Be careful with group replies; lots of people
 	  send messages with hundreds of CCs. If this is the case, be sure to
 	  trim the Cc: lines appropriately.</para>
@@ -506,9 +506,9 @@ fine, but when I try to reboot the system, I get the message
       
       <listitem>
 	<para>Include relevant text from the original message. Trim it to the
-	  minimum, but don't overdo it.  It should still be possible for
-	  somebody who didn't read the original message to understand what
-	  you're talking about.</para>
+	  minimum, but do not overdo it.  It should still be possible for
+	  somebody who did not read the original message to understand what
+	  you are talking about.</para>
       </listitem>
       
       <listitem>
@@ -523,18 +523,18 @@ fine, but when I try to reboot the system, I get the message
 
       <listitem>
 	<para>Put your response in the correct place (after the text to which
-	  it replies).  It's very difficult to read a thread of responses
+	  it replies).  It is very difficult to read a thread of responses
 	  where each reply comes before the text to which it replies.</para>
       </listitem>
 
       <listitem>
 	<para>Most mailers change the subject line on a reply by prepending a
-	  text such as <quote>Re: </quote>.  If your mailer doesn't do it
+	  text such as <quote>Re: </quote>.  If your mailer does not do it
 	  automatically, you should do it manually.</para>
       </listitem>
       
       <listitem>
-	<para>If the submitter didn't abide by format conventions (lines too
+	<para>If the submitter did not abide by format conventions (lines too
 	  long, inappropriate subject line), <emphasis>please</emphasis> fix
 	  it. In the case of an incorrect subject line (such as
 	  <quote>HELP!!??</quote>), change the subject line to (say)
@@ -542,9 +542,9 @@ fine, but when I try to reboot the system, I get the message
 	  way other people trying to follow the thread will have less
 	  difficulty following it.</para>
 
-	<para>In such cases, it's appropriate to say what you did and why you
-	  did it, but try not to be rude.  If you find you can't answer
-	  without being rude, don't answer.</para>
+	<para>In such cases, it is appropriate to say what you did and why you
+	  did it, but try not to be rude.  If you find you can not answer
+	  without being rude, do not answer.</para>
 
 	<para>If you just want to reply to a message because of its bad
 	  format, just reply to the submitter, not to the list.  You can just
diff --git a/en_US.ISO8859-1/articles/ipsec-must/article.sgml b/en_US.ISO8859-1/articles/ipsec-must/article.sgml
index 886e73a50a..9c18e55841 100644
--- a/en_US.ISO8859-1/articles/ipsec-must/article.sgml
+++ b/en_US.ISO8859-1/articles/ipsec-must/article.sgml
@@ -1,7 +1,7 @@
 <!--
     The FreeBSD Documentation Project
 
-    $FreeBSD: doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml,v 1.7 2001/07/29 09:52:55 dd Exp $
+    $FreeBSD$
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -36,8 +36,8 @@
 
     <para>First, let's assume you have <link linkend="ipsec-install">
       installed <emphasis>IPsec</emphasis></link>.  How do you know
-      it's <link linkend="caveat">working</link>?  Sure, your
-      connection won't work if its misconfigured, and it will work
+      it is <link linkend="caveat">working</link>?  Sure, your
+      connection will not work if it is misconfigured, and it will work
       when you finally get it right.  &man.netstat.1; will list it.
       But can you independently confirm it?</para>
   </sect1>
@@ -101,7 +101,7 @@
   <sect1>
     <title>The Experiment</title>
 
-    <para>Here's the experiment.</para>
+    <para>Here is the experiment.</para>
 
     <procedure>
       <step>
@@ -176,7 +176,7 @@ Expected value for L=8 is 7.1836656
     <title>Installing IPsec</title>
 
     <para>Most of the modern versions of FreeBSD have IPsec support
-      in their base source.  So you'll probably will need to include
+      in their base source.  So you will probably will need to include
       <option>IPSEC</option> option in your kernel config and, after
       kernel rebuild and reinstall, configure IPsec connections using
       &man.setkey.8; command.</para>
diff --git a/en_US.ISO8859-1/articles/laptop/article.sgml b/en_US.ISO8859-1/articles/laptop/article.sgml
index b36463ee91..4303854af3 100644
--- a/en_US.ISO8859-1/articles/laptop/article.sgml
+++ b/en_US.ISO8859-1/articles/laptop/article.sgml
@@ -48,8 +48,8 @@
 
       <para>Check your laptop documentation for which card you have,
         and check in the XFree86 documentation (or setup program) 
-        to see whether it's specifically supported.  If it's not, use
-        a generic device (don't go for a name which just looks
+        to see whether it is specifically supported.  If it is not, use
+        a generic device (do not go for a name which just looks
         similar).  In XFree86 version 4, you can try your luck
         with the command <userinput>XFree86 -configure</userinput>
         which auto-detects a lot of configurations.</para>
@@ -59,9 +59,9 @@
         suitable modeline for an LCD display may be tricky.  You may
         be lucky and not need to specify a modeline, or just need to
         specify suitable HorizSync and VertRefresh ranges.  If that
-        doesn't work, the best option is to check web resources
+        does not work, the best option is to check web resources
         devoted to configuring X on laptops (these are often
-        linux-oriented sites but it doesn't matter because both systems
+        linux-oriented sites but it does not matter because both systems
         use XFree86) and copy a modeline posted by someone for similar 
         hardware.</para>
 
@@ -110,7 +110,7 @@ Option "Emulate3Buttons"
         the file <filename>/etc/defaults/pccard.conf</filename>.  Look
         through it, and preferably buy cards listed there.  Cards not
         listed may also work as "generic" devices: in particular most
-        modems (16-bit) should work fine, provided they're not
+        modems (16-bit) should work fine, provided they are not
         winmodems (these do exist even as PC-cards, so watch out).  If
         your card is recognised as a generic modem, note that the
         default pccard.conf file specifies a delay time of 10 seconds
@@ -127,7 +127,7 @@ Option "Emulate3Buttons"
         values (listed in the man page &man.pccardc.8;).
          </para>
 
-      <para>If it's not running already, start the pccardd daemon.
+      <para>If it is not running already, start the pccardd daemon.
         (To enable it at boot time, add
         <programlisting>pccardd_enable="YES"</programlisting> to
         <filename>/etc/rc.conf</filename>).  Now your cards should be
@@ -136,7 +136,7 @@ Option "Emulate3Buttons"
 
       <para>There have been major changes to the pccard code
         (including ISA routing of interrupts, for machines whose
-        PCIBIOS FreeBSD can't seem to use) before the FreeBSD 4.4
+        PCIBIOS FreeBSD can not seem to use) before the FreeBSD 4.4
         release.  If you have problems, try upgrading your system.
  
     </sect1> 
@@ -146,7 +146,7 @@ Option "Emulate3Buttons"
        <title>Power management</title>
 
        <para>Unfortunately, this is not very reliably supported under
-         FreeBSD.  If you're lucky, some functions may work reliably;
+         FreeBSD.  If you are lucky, some functions may work reliably;
          or they may not work at all.</para>
 
        <para>To enable this, you may need to compile a kernel with
@@ -162,7 +162,7 @@ Option "Emulate3Buttons"
          shutdown and power off the machine, use "shutdown -p".
          Again, some or all of these functions may not work very well
          or at all.  You may find that laptop suspension/standby works
-         in console mode but not under X (that is, the screen doesn't
+         in console mode but not under X (that is, the screen does not
          come on again; in that case, switch to a virtual console
          (using Ctrl-Alt-F1 or another function key) and then execute
          the apm command.
@@ -172,7 +172,7 @@ Option "Emulate3Buttons"
          management (look at the &man.xset.1; man page, and search for
          dpms there).  You may want to investigate this.  However, this, 
          too, works inconsistently on laptops: it
-         often turns off the display but doesn't turn off the
+         often turns off the display but does not turn off the
          backlight.</para>
 
      </sect1>
diff --git a/en_US.ISO8859-1/articles/mh/article.sgml b/en_US.ISO8859-1/articles/mh/article.sgml
index 91025e8ff1..3e75a4a36b 100644
--- a/en_US.ISO8859-1/articles/mh/article.sgml
+++ b/en_US.ISO8859-1/articles/mh/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/mh/article.sgml,v 1.12 2001/07/11 13:13:41 nik Exp $ -->
+<!-- $FreeBSD$ -->
 <!-- FreeBSD Documentation Project -->
 
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN">
@@ -32,7 +32,7 @@
     <title>Introduction</title>
 
     <para>MH started back in 1977 at the RAND Corporation, where the
-      initial philosophies behind MH were developed. MH isn't so much
+      initial philosophies behind MH were developed. MH is not so much
       a monolithic email program but a philosophy about how best to
       develop tools for reading email. The MH developers have done a
       great job adhering to the <acronym>KISS</acronym> principle: Keep It
@@ -90,7 +90,7 @@
       <command>msgchk</command>.  One of the best things about MH is the
       consistent interface between programs. A few things to keep in
       mind when using these commands is how to specify message lists.
-      In the case of <command>inc</command> this doesn't really make any
+      In the case of <command>inc</command> this does not really make any
       sense but with commands like <command>show</command> it is useful to
       know. </para>
 
@@ -226,7 +226,7 @@
 	<quote>removed</quote> messages.</para>
 
       <para>The <command>rmf</command> command is used to remove folders.
-	This doesn't just rename the files but actually removes the
+	This does not just rename the files but actually removes the
 	from the hard drive so you should be careful when you use this
 	command.</para>
     </sect2>
@@ -325,7 +325,7 @@ which I am probably the guilty party).</screen>
     <para>Anybody who gets lots of email definitely wants to be able
       to prioritize, stamp, brief, de-brief, and number their emails
       in a variety of different ways. MH can do this better than just
-      about anything. One thing that we haven't really talked about is
+      about anything. One thing that we have not really talked about is
       the concept of folders. You have undoubtedly come across the
       folders concept using other email programs. MH has folders too.
       MH can even do sub-folders of a folder. One thing you should
@@ -334,7 +334,7 @@ which I am probably the guilty party).</screen>
       <filename>Mail</filename> directory it began storing everything in that
       directory. If you look at that directory you will find a
       directory named <filename>inbox</filename>. The <filename>inbox</filename>
-      directory houses all of your incoming mail that hasn't been
+      directory houses all of your incoming mail that has not been
       thrown anywhere else.</para>
 
     <para>Whenever you create a new folder a new directory is going to
@@ -342,10 +342,10 @@ which I am probably the guilty party).</screen>
       messages in that folder are going to be stored in that
       directory.  When new email comes in that new email is thrown
       into your <filename>inbox</filename> directory with a file name that is
-      equivalent to the message number.  So even if you didn't have
+      equivalent to the message number.  So even if you did not have
       any of the MH tools to read your email you could still use
       standard Unix commands to munge around in those directories and
-      just more your files. It's this simplicity that really gives you
+      just more your files. It is this simplicity that really gives you
       a lot of power with what you can do with your email.</para>
 
     <para>Just as you can use message lists like <parameter>23 16
@@ -397,7 +397,7 @@ which I am probably the guilty party).</screen>
 &prompt.user; <userinput>show pick</userinput></screen>
       </informalexample>
 
-      <para>This will show you the same messages you just didn't have
+      <para>This will show you the same messages you just did not have
 	to work as hard to do it. The <option>-seq</option> option is
 	really an abbreviation of <option>-sequence</option> and
 	<command>pick</command> is just a sequence which contains the message
@@ -512,13 +512,13 @@ which I am probably the guilty party).</screen>
       <para>Basically this says <quote>pick (to freebsd-hackers and
 	  not cc'd on freebsd-questions) and the subject is
 	  pci</quote>.  It should look through your folder and find
-	all messages sent to the freebsd-hackers list that aren't cc'd
+	all messages sent to the freebsd-hackers list that are not cc'd
 	to the freebsd-questions list that contain something on pci in
 	the subject line. Ordinarily you might have to worry about
 	something called operator precedence. Remember in math how you
 	evaluate from left to right and you do multiplication and
 	division first and addition and subtraction second? MH has the
-	same type of rules for <command>pick</command>. It's fairly complex
+	same type of rules for <command>pick</command>. It is fairly complex
 	so you might want to study the man page. This document is just
 	to help you get acquainted with MH.</para>
     </sect2>
@@ -543,7 +543,7 @@ which I am probably the guilty party).</screen>
 	<command>scan</command> you might just see messages 34, 35, 36, 43,
 	55, 56, 57, 80. If you do a <command>folder -pack</command>
 	this will renumber all your messages so that there are no
-	holes. It doesn't actually delete any messages though. So you
+	holes. It does not actually delete any messages though. So you
 	may need to periodically go through and physically delete
 	<command>rmm</command>'d messages.</para>
 
@@ -617,7 +617,7 @@ which I am probably the guilty party).</screen>
 	options. The most important one to know right now is the
 	<option>-editor</option> option. When MH is installed the
 	default editor is usually a program called
-	<command>prompter</command> which comes with MH. It's not a very
+	<command>prompter</command> which comes with MH. It is not a very
 	exciting editor and basically just gets the job done. So when
 	you go to compose a message to someone you might want to use
 	<command>comp -editor /usr/bin/vi</command> or <command>comp -editor
@@ -639,7 +639,7 @@ Subject:
 	the body of your message after the dashed lines. It may seem a
 	bit simplistic since a lot of email programs have special
 	requesters that ask you for this information but there really
-	isn't any point to that. Plus this really gives you excellent
+	is no point to that. Plus this really gives you excellent
 	flexibility.</para>
 
       <informalexample>
@@ -655,7 +655,7 @@ Subject:<userinput>And on the 8th day God created the FreeBSD core team</userinp
 	<userinput>send</userinput> or <userinput>s</userinput> and hit
 	<keycap>return</keycap>. Then the FreeBSD core team will receive
 	their just rewards. As I mentioned earlier you can also use
-	other commands, for example <command>quit</command> if you don't want
+	other commands, for example <command>quit</command> if you do not want
 	to send the message.</para>
 
       <para>The <command>forw</command> command is stunningly similar. The
@@ -682,7 +682,7 @@ Subject:<userinput>And on the 8th day God created the FreeBSD core team</userinp
 	<parameter>me</parameter> after the <option>-cc</option> option to have
 	<command>repl</command> automatically add the various addresses to
 	the cc list in the message. You have probably noticed that the
-	original message isn't included. This is because most MH
+	original message is not included. This is because most MH
 	setups are configured to do this from the start.</para>
     </sect2>
 
@@ -733,7 +733,7 @@ X-Home-Page: http://www.FreeBSD.org/
 --------</screen>
       </informalexample>
 
-      <para>It's in the same basic format as the
+      <para>It is in the same basic format as the
 	<filename>components</filename> file but it contains quite a few extra
 	formatting codes. The <literal>%(lit)</literal> command makes room
 	for the address. The <literal>%(formataddr</literal> is a function
@@ -755,7 +755,7 @@ message</emphasis>, %&gt; <emphasis remap=bf>endif</emphasis>.</screen>
 	variables mean. All of the information on writing these format
 	strings is in the MH-Format man page. The really nice thing is
 	that once you have built your customized
-	<filename>replcomps</filename> file you won't need to touch it again.
+	<filename>replcomps</filename> file you will not need to touch it again.
 	No other email program really gives you the power and
 	flexibility that MH gives you.</para>
     </sect2>
diff --git a/en_US.ISO8859-1/articles/multi-os/article.sgml b/en_US.ISO8859-1/articles/multi-os/article.sgml
index c04c9ee501..675e24d372 100644
--- a/en_US.ISO8859-1/articles/multi-os/article.sgml
+++ b/en_US.ISO8859-1/articles/multi-os/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/multi-os/article.sgml,v 1.17 2001/07/11 13:24:45 nik Exp $ -->
+<!-- $FreeBSD$ -->
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN">
 <article>
   <articleinfo>
@@ -33,7 +33,7 @@
   <sect1>
     <title>Overview</title>
 
-    <para>Most people can't fit these operating systems together
+    <para>Most people can not fit these operating systems together
       comfortably without having a larger hard disk, so special
       information on large EIDE drives is included.  Because there are
       so many combinations of possible operating systems and hard disk
@@ -140,7 +140,7 @@
     <para>Let's say I have two large EIDE hard drives, and I want to
       install FreeBSD, Linux, and Windows 95 on them.</para>
 
-    <para>Here's how I might do it using these hard disks:</para>
+    <para>Here is how I might do it using these hard disks:</para>
 
     <itemizedlist>
       <listitem>
@@ -170,7 +170,7 @@
       </step>
 
       <step>
-	<para>The next thing I do is install Linux.  I'm not sure
+	<para>The next thing I do is install Linux.  I am not sure
 	  about all the distributions of Linux, but slackware includes
 	  LILO (see <xref linkend="ch2">).  When I am partitioning out
 	  my hard disk with Linux <command>fdisk</command>, I would
@@ -237,7 +237,7 @@ Press Esc to continue
       <step>
 	<para>Install FreeBSD.  I make sure to boot with my first hard
 	  disk set at <quote>NORMAL</quote> in the BIOS.  If it is not,
-	  I'll have the enter my true disk geometry at boot time (to
+	  I will have the enter my true disk geometry at boot time (to
 	  get this, boot Windows 95 and consult Microsoft Diagnostics
 	  (<filename>MSD.EXE</filename>), or check your BIOS) with the
 	  parameter <literal>hd0=1416,16,63</literal> where
@@ -249,7 +249,7 @@ Press Esc to continue
 
       <step>
 	<para>When partitioning out the hard disk, I make sure to
-	  install Boot Easy on the first disk.  I don't worry about
+	  install Boot Easy on the first disk.  I do not worry about
 	  the second disk, nothing is booting off of it.</para>
       </step>
 
@@ -289,10 +289,10 @@ Press Esc to continue
       Likewise, Windows 95 can only read and write to FAT and FAT32
       (see <xref linkend="ch2">) partitions.  FreeBSD can read most
       file systems, but currently cannot read HPFS partitions.  Linux
-      can read HPFS partitions, but can't write to them.  Recent
+      can read HPFS partitions, but can not write to them.  Recent
       versions of the Linux kernel (2.x) can read and write to Windows
       95 VFAT partitions (VFAT is what gives Windows 95 long file
-      names - it's pretty much the same as FAT).  Linux can read and
+      names - it is pretty much the same as FAT).  Linux can read and
       write to most file systems.  Got that?  I hope so.</para>
   </sect1>
 
@@ -313,13 +313,13 @@ Press Esc to continue
       for a setting in your BIOS called <quote>&gt; 1024 cylinder
 	support</quote> or <quote>NORMAL/LBA</quote> mode.  DOS may need LBA
       (Logical Block Addressing) in order to boot correctly.  If the
-      idea of switching BIOS settings every time you boot up doesn't
+      idea of switching BIOS settings every time you boot up does not
       appeal to you, you can boot FreeBSD through DOS via the
       <filename>FBSDBOOT.EXE</filename> utility on the CD (It should find your
       FreeBSD partition and boot it.)</para>
 
     <para>FreeBSD+OS/2+Win95:  Nothing new here.  OS/2's boot manger
-      can boot all of these operating systems, so that shouldn't be a
+      can boot all of these operating systems, so that should not be a
       problem.</para>
 
     <para>FreeBSD+Linux: You can also use Boot Easy to boot both
@@ -357,7 +357,7 @@ Press Esc to continue
       <ulink
 	URL="ftp://fission.dt.wdc.com/pub/otherdocs/pc_systems/how_it_works/allhiw.zip">ftp://fission.dt.wdc.com/pub/otherdocs/pc_systems/how_it_works/allhiw.zip</ulink>.</para>
 
-    <para>Finally, don't overlook FreeBSD's kernel documentation on
+    <para>Finally, do not overlook FreeBSD's kernel documentation on
       the booting procedure, available in the kernel source
       distribution (it unpacks to <ulink
 	URL="file:/usr/src/sys/i386/boot/biosboot/README.386BSD">file:/usr/src/sys/i386/boot/biosboot/README.386BSD</ulink>.</para>
@@ -381,7 +381,7 @@ Press Esc to continue
 
       <para>Three fundamental terms are used to describe the location
 	of data on your hard disk: Cylinders, Heads, and Sectors.
-	It's not particularly important to know what these terms
+	It is not particularly important to know what these terms
 	relate to except to know that, together, they identify where
 	data is physically on your disk.</para>
 
@@ -392,7 +392,7 @@ Press Esc to continue
 	disk.  There are typically 512 bytes per sector, and 63
 	sectors per track, with the number of cylinders and heads
 	varying widely from disk to disk.  Thus you can figure the
-	number of bytes of data that'll fit on your own disk by
+	number of bytes of data that will fit on your own disk by
 	calculating:</para>
 
 	<informalexample>
@@ -401,7 +401,7 @@ Press Esc to continue
 	</informalexample>
 
       <para>For example, on my 1.6 Gig Western Digital AC31600 EIDE hard
-	disk,that's:</para>
+	disk, that is:</para>
 
 	<informalexample>
 	  <para>(3148 cyl) &times; (16 heads) &times; (63
@@ -414,10 +414,10 @@ Press Esc to continue
 	cylinders, heads, and sectors/track counts) for your hard
 	disks using ATAID or other programs off the net.  Your hard
 	disk probably came with this information as well.  Be careful
-	though: if you're using BIOS LBA (see <xref
-	  linkend="limits">), you can't use just any program to get
+	though: if you are using BIOS LBA (see <xref
+	  linkend="limits">), you can not use just any program to get
 	the physical geometry.  This is because many programs (e.g.
-	<filename>MSD.EXE</filename> or FreeBSD fdisk) don't identify the
+	<filename>MSD.EXE</filename> or FreeBSD fdisk) do not identify the
 	physical disk geometry; they instead report the
 	<firstterm>translated geometry</firstterm> (virtual numbers from using
 	LBA).  Stay tuned for what that means.</para>
@@ -433,12 +433,12 @@ Press Esc to continue
 	information on disk geometry, boot sectors, BIOSes, etc. can
 	be found all over the net.  Query Lycos, Yahoo, etc. for
 	<literal>boot sector</literal> or <literal>master boot record</literal>.
-	Among the useful info you'll find are Hale Landis's
+	Among the useful info you will find are Hale Landis's
 	<citetitle>How It Works</citetitle> document pack.  See the <xref
 	  linkend="sources"> section for a few pointers to this
 	pack.</para>
 
-      <para>Ok, enough terminology.  We're talking about booting
+      <para>Ok, enough terminology.  We are talking about booting
 	here.</para>
     </sect2>
 
@@ -449,8 +449,8 @@ Press Esc to continue
 	lives the Master Boot Record (MBR).  It contains a map of your
 	disk.  It identifies up to 4 <firstterm>partitions</firstterm>, each of
 	which is a contiguous chunk of that disk.  FreeBSD calls
-	partitions <firstterm>slices</firstterm> to avoid confusion with it's
-	own partitions, but we won't do that here.  Each partition can
+	partitions <firstterm>slices</firstterm> to avoid confusion with its
+	own partitions, but we will not do that here.  Each partition can
 	contain its own operating system.</para>
 
       <para>Each partition entry in the MBR has a <firstterm>Partition
@@ -511,7 +511,7 @@ Press Esc to continue
       </table>
 
       <para>Note that not all partitions are bootable (e.g. Extended
-	DOS).  Some are&mdash;some aren't.  What makes a partition
+	DOS).  Some are&mdash;some are not.  What makes a partition
 	bootable is the configuration of the <firstterm>Partition Boot
 	  Sector</firstterm> that exists at the beginning of each
 	partition.</para>
@@ -529,16 +529,16 @@ Press Esc to continue
 	enough information to start loading the operating system on
 	that partition.</para>
 
-      <para>One thing we just brushed past that's important to know.
-	All of your hard disks have MBRs.  However, the one that's
-	important is the one on the disk that's first probed by the
+      <para>One thing we just brushed past that is important to know.
+	All of your hard disks have MBRs.  However, the one that is
+	important is the one on the disk that is first probed by the
 	BIOS.  If you have only IDE hard disks, its the first IDE disk
 	(e.g. primary disk on first controller).  Similarly for SCSI
 	only systems.  If you have both IDE and SCSI hard disks
 	though, the IDE disk is typically probed first by the BIOS, so
 	the first IDE disk is the first probed disk.  The boot manager
 	you will install will be hooked into the MBR on this first
-	probed hard disk that we've just described.</para>
+	probed hard disk that we have just described.</para>
     </sect2>
 
     <sect2 id="limits">
@@ -551,7 +551,7 @@ Press Esc to continue
 	<title>The dreaded 1024 cylinder limit and how BIOS LBA helps</title>
 
 	<para>The first part of the booting process is all done
-	  through the BIOS, (if that's a new term to you, the BIOS is
+	  through the BIOS, (if that is a new term to you, the BIOS is
 	  a software chip on your system motherboard which provides
 	  startup code for your computer).  As such, this first part
 	  of the process is subject to the limitations of the BIOS
@@ -576,14 +576,14 @@ Press Esc to continue
 
 	<listitem>
 	  <para>64 sectors/track, max (actually 63, <literal>0</literal>
-	    isn't available)</para>
+	    is not available)</para>
 	</listitem>
       </itemizedlist>
 
 	<para>Now big hard disks have lots of cylinders but not a lot
 	  of heads, so invariably with big hard disks the number of
 	  cylinders is greater than 1024.  Given this and the BIOS
-	  interface as is, you can't boot off just anywhere on your
+	  interface as is, you can not boot off just anywhere on your
 	  hard disk.  The boot code (the boot manager and the OS
 	  loader hooked into all bootable partitions' Boot Sectors)
 	  has to reside below cylinder 1024.  In fact, if your hard
@@ -615,7 +615,7 @@ Press Esc to continue
 	  limit.</para>
 
 	<para>To use my 1.6 Gig Western Digital as an example again,
-	  it's physical geometry is:</para>
+	  its physical geometry is:</para>
 
 	<informalexample>
 	  <para>(3148 cyl, 16 heads, 63 sectors/track, 512
@@ -640,7 +640,7 @@ Press Esc to continue
 	<title>Boot Managers and Disk Allocation</title>
 
 	<para>Another gotcha to watch out when installing boot
-	  managers is allocating space for your boot manager.  It's
+	  managers is allocating space for your boot manager.  It is
 	  best to be aware of this issue up front to save yourself
 	  from having to reinstall one or more of your OSs.</para>
 
@@ -653,18 +653,18 @@ Press Esc to continue
 	  Master Boot Sector (Cylinder 0, Head 0, Sector 0) along with
 	  the partition table.  Others need a bit more room and
 	  actually extend a few sectors past the Master Boot Sector in
-	  the Cylinder 0 Head 0 track, since that's typically
+	  the Cylinder 0 Head 0 track, since that is typically
 	  free&hellip;typically.</para>
 
-	<para>That's the catch.  Some operating systems (FreeBSD
+	<para>That is the catch.  Some operating systems (FreeBSD
 	  included) let you start their partitions right after the
 	  Master Boot Sector at Cylinder 0, Head 0, Sector 2 if you
 	  want.  In fact, if you give FreeBSD's sysinstall a disk with
-	  an empty chunk up front or the whole disk empty, that's
-	  where it'll start the FreeBSD partition by default (at least
+	  an empty chunk up front or the whole disk empty, that is
+	  where it will start the FreeBSD partition by default (at least
 	  it did when I fell into this trap).  Then when you go to
-	  install your boot manager, if it's one that occupies a few
-	  extra sectors after the MBR, it'll overwrite the front of
+	  install your boot manager, if it is one that occupies a few
+	  extra sectors after the MBR, it will overwrite the front of
 	  the first partition's data.  In the case of FreeBSD, this
 	  overwrites the disk label, and renders your FreeBSD
 	  partition unbootable.</para>
@@ -675,10 +675,10 @@ Press Esc to continue
 	  unallocated when you partition your disk.  That is, leave
 	  the space from Cylinder 0, Head 0, Sector 2 through Cylinder
 	  0, Head 0, Sector 63 unallocated, and start your first
-	  partition at Cylinder 0, Head 1, Sector 1.  For what it's
+	  partition at Cylinder 0, Head 1, Sector 1.  For what it is
 	  worth, when you create a DOS partition at the front of your
 	  disk, DOS leaves this space open by default (this is why
-	  some boot managers assume it's free).  So creating a DOS
+	  some boot managers assume it is free).  So creating a DOS
 	  partition up at the front of your disk avoids this problem
 	  altogether.  I like to do this myself, creating 1 Meg DOS
 	  partition up front, because it also avoids my primary DOS
@@ -716,10 +716,10 @@ Press Esc to continue
       </sect3>
 
       <sect3>
-	<title>What if your machine won't boot?</title>
+	<title>What if your machine will not boot?</title>
 
 	<para>At some point when installing boot managers, you might
-	  leave the MBR in a state such that your machine won't boot.
+	  leave the MBR in a state such that your machine will not boot.
 	  This is unlikely, but possible when re-FDISKing underneath
 	  an already-installed boot manager.</para>
 
diff --git a/en_US.ISO8859-1/articles/new-users/article.sgml b/en_US.ISO8859-1/articles/new-users/article.sgml
index bb85037af0..4bd8b5225c 100644
--- a/en_US.ISO8859-1/articles/new-users/article.sgml
+++ b/en_US.ISO8859-1/articles/new-users/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/new-users/article.sgml,v 1.26 2001/09/24 01:32:07 murray Exp $ -->
+<!-- $FreeBSD$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -27,10 +27,10 @@
     <abstract>
       <para>Congratulations on installing FreeBSD! This introduction
 	is for people new to both FreeBSD <emphasis>and</emphasis>
-	Un*x&mdash;so it starts with basics.  It assumes you're using
+	Un*x&mdash;so it starts with basics.  It assumes you are using
 	version 2.0.5 or later of FreeBSD as distributed by BSDi
 	or FreeBSD.org, your system (for now) has a single user
-	(you)&mdash;and you're probably pretty good with DOS/Windows
+	(you)&mdash;and you are probably pretty good with DOS/Windows
 	or OS/2.</para>
     </abstract>
   </articleinfo>
@@ -82,13 +82,13 @@
       Give it a little time to do its work.  This is equivalent to
       <command>/sbin/reboot</command> in recent releases of FreeBSD
       and is much, much better than hitting the reset button.  You
-      don't want to have to reinstall this thing, do you?</para>
+      do not want to have to reinstall this thing, do you?</para>
   </sect1>
 
   <sect1>
     <title>Adding A User with Root Privileges</title>
 
-    <para>If you didn't create any users when you installed the system
+    <para>If you did not create any users when you installed the system
       and are thus logged in as root, you should probably create a
       user now with</para>
 
@@ -115,21 +115,21 @@
 
     <para>This will make it possible to log in as
       <username>jack</username> and use the &man.su.1;
-      command to become root.  Then you won't get scolded any more for
+      command to become root.  Then you will not get scolded any more for
       logging in as root.</para>
 
     <para>You can quit <command>adduser</command> any time by typing
       <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo>,
-      and at the end you'll have a chance to approve your new user or
+      and at the end you will have a chance to approve your new user or
       simply type <keycap>n</keycap> for no.  You might want to create
       a second new user (jill?) so that when you edit jack's login
-      files, you'll have a hot spare in case something goes
+      files, you will have a hot spare in case something goes
       wrong.</para>
 
-    <para>Once you've done this, use <command>exit</command> to get
+    <para>Once you have done this, use <command>exit</command> to get
       back to a login prompt and log in as <username>jack</username>.
-      In general, it's a good idea to do as much work as possible as
-      an ordinary user who doesn't have the power&mdash;and
+      In general, it is a good idea to do as much work as possible as
+      an ordinary user who does not have the power&mdash;and
       risk&mdash;of root.</para>
 
     <para>If you already created a user and you want the user to be
@@ -204,7 +204,7 @@
 
 	<listitem>
 	  <para>Lists hidden <quote>dot</quote> files with the others.
-	    If you're root, the <quote>dot</quote> files show up
+	    If you are root, the <quote>dot</quote> files show up
 	    without the <option>-a</option> switch.</para>
 	</listitem>
       </varlistentry>
@@ -245,7 +245,7 @@
 
 	<listitem>
 	  <para>Displays <replaceable>filename</replaceable> on
-	    screen.  If it's too long and you can see only the end of
+	    screen.  If it is too long and you can see only the end of
 	    it, press <keycap>ScrollLock</keycap> and use the
 	    <keycap>up-arrow</keycap> to move backward; you can use
 	    <keycap>ScrollLock</keycap> with man pages too.  Press
@@ -259,8 +259,8 @@
       </varlistentry>
     </variablelist>
 
-    <para>You'll notice aliases in <filename>.cshrc</filename> for
-      some of the <command>ls</command> commands (they're very
+    <para>You will notice aliases in <filename>.cshrc</filename> for
+      some of the <command>ls</command> commands (they are very
       convenient).  You can create other aliases by editing
       <filename>.cshrc</filename>.  You can make these aliases
       available to all users on the system by putting them in the
@@ -366,7 +366,7 @@
 
     <para>Are some of these not working very well?  Both
       &man.locate.1; and &man.whatis.1; depend
-      on a database that's rebuilt weekly.  If your machine isn't
+      on a database that is rebuilt weekly.  If your machine is not
       going to be left on over the weekend (and running FreeBSD), you
       might want to run the commands for daily, weekly, and monthly
       maintenance now and then.  Run them as root and give each one
@@ -384,19 +384,19 @@
     <para>If you get tired of waiting, press
       <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo> to
       get another <firstterm>virtual console</firstterm>, and log in
-      again.  After all, it's a multi-user, multi-tasking system.
+      again.  After all, it is a multi-user, multi-tasking system.
       Nevertheless these commands will probably flash messages on your
-      screen while they're running; you can type
+      screen while they are running; you can type
       <command>clear</command> at the prompt to clear the screen.
-      Once they've run, you might want to look at
+      Once they have run, you might want to look at
       <filename>/var/mail/root</filename> and
       <filename>/var/log/messages</filename>.</para>
 
     <para>Running such commands is part of system
       administration&mdash;and as a single user of a Unix system,
-      you're your own system administrator.  Virtually everything you
+      you are your own system administrator.  Virtually everything you
       need to be root to do is system administration.  Such
-      responsibilities aren't covered very well even in those big fat
+      responsibilities are not covered very well even in those big fat
       books on Unix, which seem to devote a lot of space to pulling
       down menus in windows managers.  You might want to get one of
       the two leading books on systems administration, either Evi
@@ -413,10 +413,10 @@
 
     <para>To configure your system, you need to edit text files.  Most
       of them will be in the <filename>/etc</filename> directory; and
-      you'll need to <command>su</command> to root to be able to
+      you will need to <command>su</command> to root to be able to
       change them.  You can use the easy <command>ee</command>, but in
       the long run the text editor <command>vi</command> is worth
-      learning.  There's an excellent tutorial on vi in
+      learning.  There is an excellent tutorial on vi in
       <filename>/usr/src/contrib/nvi/docs/tutorial</filename> if you
       have that installed; otherwise you can get it by FTP to
       <hostid>ftp.cdrom.com</hostid> in the directory
@@ -445,7 +445,7 @@
     <para>because the <command>mv</command> command preserves the
       original date and owner of the file.  You can now edit
       <filename>rc.conf</filename>.  If you want the original back,
-      you'd then <userinput>mv rc.conf rc.conf.myedit</userinput>
+      you would then <userinput>mv rc.conf rc.conf.myedit</userinput>
       (assuming you want to preserve your edited version) and
       then</para>
 
@@ -582,13 +582,13 @@
       by creating a new file with <command>vi
       <replaceable>filename</replaceable></command> and adding and
       deleting text, saving the file, and calling it up again.
-      <command>vi</command> delivers some surprises because it's
-      really quite complex, and sometimes you'll inadvertently issue a
-      command that will do something you don't expect.  (Some people
-      actually like <command>vi</command>&mdash;it's more powerful
+      <command>vi</command> delivers some surprises because it is
+      really quite complex, and sometimes you will inadvertently issue a
+      command that will do something you do not expect.  (Some people
+      actually like <command>vi</command>&mdash;it is more powerful
       than DOS EDIT&mdash;find out about the <command>:r</command>
       command.) Use <keycap>Esc</keycap> one or more times to be sure
-      you're in command mode and proceed from there when it gives you
+      you are in command mode and proceed from there when it gives you
       trouble, save often with <command>:w</command>, and use
       <command>:q!</command> to get out and start over (from your last
       <command>:w</command>) when you need to.</para>
@@ -600,15 +600,15 @@
       user has root privileges.  Just add a comma and the user's login
       name to the end of the first line in the file, press
       <keycap>Esc</keycap>, and use <command>:wq</command> to write
-      the file to disk and quit.  Instantly effective.  (You didn't
+      the file to disk and quit.  Instantly effective.  (You did not
       put a space after the comma, did you?)</para>
   </sect1>
 
   <sect1>
     <title>Printing Files from DOS</title>
 
-    <para>At this point you probably don't have the printer working,
-      so here's a way to create a file from a man page, move it to a
+    <para>At this point you probably do not have the printer working,
+      so here is a way to create a file from a man page, move it to a
       floppy, and then print it from DOS.  Suppose you want to read
       carefully about changing permissions on files (pretty
       important).  You can use <command>man chmod</command> to read
@@ -652,11 +652,11 @@
     </informalexample>
 
     <para>and copying <filename>dmesg.txt</filename> to the floppy.
-      <command>/sbin/dmesg</command> is the boot log record, and it's
+      <command>/sbin/dmesg</command> is the boot log record, and it is
       useful to understand it because it shows what FreeBSD found when
       it booted up.  If you ask questions on
       <email>freebsd-questions@FreeBSD.org</email> or on a USENET
-      group&mdash;like <quote>FreeBSD isn't finding my tape drive,
+      group&mdash;like <quote>FreeBSD is not finding my tape drive,
       what do I do?</quote>&mdash;people will want to know what
       <command>dmesg</command> has to say.</para>
 
@@ -684,8 +684,8 @@
       <hardware>LPT1</hardware>), you may only need to go to
       <filename>/var/spool/output</filename> and (as root) create the
       directory <filename>lpd</filename> by typing: <command>mkdir
-      lpd</command>, if it doesn't already exist.  Then the printer
-      should respond if it's turned on when the system is booted, and
+      lpd</command>, if it does not already exist.  Then the printer
+      should respond if it is turned on when the system is booted, and
       <command>lp</command> or <command>lpr</command> should send a
       file to the printer.  Whether or not the file actually prints
       depends on configuring it, which is covered in the <ulink
@@ -780,7 +780,7 @@
     <para>An excellent book that explains Unix commands and utilities
       is Abrahams &amp; Larson, <citetitle>Unix for the
 	Impatient</citetitle> (2nd ed., Addison-Wesley, 1996).
-      There's also a lot of Unix information on the Internet.  Try the
+      There is also a lot of Unix information on the Internet.  Try the
       <ulink URL="http://www.geek-girl.com/unix.html">Unix Reference
 	Desk</ulink>.</para>
   </sect1>
@@ -809,7 +809,7 @@
 
     <para>If you find the handbook too sophisticated (what with
       <command>lndir</command> and all) on installing ports from the
-      CDROM, here's what usually works:</para>
+      CDROM, here is what usually works:</para>
 
     <para>Find the port you want, say <command>kermit</command>.
       There will be a directory for it on the CDROM.  Copy the
@@ -827,10 +827,10 @@
       CDROM has.</para>
 
     <para>Next, create the directory
-      <filename>/usr/ports/distfiles</filename> if it doesn't already
+      <filename>/usr/ports/distfiles</filename> if it does not already
       exist using <command>mkdir</command>.  Now check check
       <filename>/cdrom/ports/distfiles</filename> for a file with a
-      name that indicates it's the port you want.  Copy that file to
+      name that indicates it is the port you want.  Copy that file to
       <filename>/usr/ports/distfiles</filename>; in recent versions
       you can skip this step, as FreeBSD will do it for you.  In the
       case of <command>kermit</command>, there is no distfile.</para>
@@ -844,8 +844,8 @@
     </informalexample>
 
     <para>During this process the port will FTP to get any compressed
-      files it needs that it didn't find on the CDROM or in
-      <filename>/usr/ports/distfiles</filename>.  If you don't have
+      files it needs that it did not find on the CDROM or in
+      <filename>/usr/ports/distfiles</filename>.  If you do not have
       your network running yet and there was no file for the port in
       <filename>/cdrom/ports/distfiles</filename>, you will have to
       get the distfile using another machine and copy it to
@@ -855,7 +855,7 @@
       <command>view</command>) to find out where to go (the master
       distribution site) to get the file and what its name is.  Its
       name will be truncated when downloaded to DOS, and after you get
-      it into <filename>/usr/ports/distfiles</filename> you'll have to
+      it into <filename>/usr/ports/distfiles</filename> you will have to
       rename it (with the <command>mv</command> command) to its
       original name so it can be found.  (Use binary file transfers!)
       Then go back to <filename>/usr/local/kermit</filename>, find the
@@ -868,8 +868,8 @@
 	unzip</errorname> or whatever, you might need to install the
       package or port for unzip before you continue.</para>
 
-    <para>Once it's installed type <command>rehash</command> to make
-      FreeBSD reread the files in the path so it knows what's there.
+    <para>Once it is installed type <command>rehash</command> to make
+      FreeBSD reread the files in the path so it knows what is there.
       (If you get a lot of <errorname>path not found</errorname>
       messages when you use <command>whereis</command> or which, you
       might want to make additions to the list of directories in the
@@ -877,13 +877,13 @@
       directory.  The path statement in Unix does the same kind of
       work it does in DOS, except the current directory is not (by
       default) in the path for security reasons; if the command you
-      want is in the directory you're in, you need to type
+      want is in the directory you are in, you need to type
       <filename>./</filename> before the command to make it work; no
       space after the slash.)</para>
 
     <para>You might want to get the most recent version of Netscape
       from their <ulink URL="ftp://ftp.netscape.com">FTP site</ulink>.
-      (Netscape requires the X Window System.) There's now a FreeBSD
+      (Netscape requires the X Window System.) There is now a FreeBSD
       version, so look around carefully.  Just use <command>gunzip
       <replaceable>filename</replaceable></command> and <command>tar
       xvf <replaceable>filename</replaceable></command> on it, move
@@ -901,11 +901,11 @@ setenv XNLSPATH /usr/X11R6/lib/X11/nls</programlisting>
 
     <para>This assumes that the file <filename>XKeysymDB</filename>
       and the directory <filename>nls</filename> are in
-      <filename>/usr/X11R6/lib/X11</filename>; if they're not, find
+      <filename>/usr/X11R6/lib/X11</filename>; if they are not, find
       them and put them there.</para>
 
     <para>If you originally got Netscape as a port using the CDROM (or
-      FTP), don't replace <filename>/usr/local/bin/netscape</filename>
+      FTP), do not replace <filename>/usr/local/bin/netscape</filename>
       with the new netscape binary; this is just a shell script that
       sets up the environment variables for you.  Instead rename the
       new binary to <filename>netscape.bin</filename> and replace the
@@ -937,7 +937,7 @@ setenv XNLSPATH /usr/X11R6/lib/X11/nls</programlisting>
       keys and edit them.  It has tab-key completion of filenames
       (<command>csh</command> uses the <keycap>Esc</keycap> key), and
       it lets you switch to the directory you were last in with
-      <command>cd -</command>.  It's also much easier to alter your
+      <command>cd -</command>.  It is also much easier to alter your
       prompt with <command>tcsh</command>.  It makes life a lot
       easier.</para>
 
@@ -948,7 +948,7 @@ setenv XNLSPATH /usr/X11R6/lib/X11/nls</programlisting>
 	<para>Install the shell as a port or a package, just as you
 	  would any other port or package.  Use
 	  <command>rehash</command> and <command>which tcsh</command>
-	  (assuming you're installing <command>tcsh</command>) to make
+	  (assuming you are installing <command>tcsh</command>) to make
 	  sure it got installed.</para>
       </step>
 
@@ -990,13 +990,13 @@ setenv XNLSPATH /usr/X11R6/lib/X11/nls</programlisting>
       copying <filename>.cshrc</filename> to
       <filename>.tcshrc</filename>.</para>
 
-    <para>Now that you've installed <command>tcsh</command>, you can
+    <para>Now that you have installed <command>tcsh</command>, you can
       adjust your prompt.  You can find the details in the manual page
       for <command>tcsh</command>, but here is a line to put in your
       <filename>.tcshrc</filename> that will tell you how many
       commands you have typed, what time it is, and what directory you
-      are in.  It also produces a <literal>></literal> if you're an
-      ordinary user and a <literal>#</literal> if you're root, but
+      are in.  It also produces a <literal>></literal> if you are an
+      ordinary user and a <literal>#</literal> if you are root, but
       tsch will do that in any case:</para>
 
     <para>set prompt = "%h %t %~ %# "</para>
@@ -1004,7 +1004,7 @@ setenv XNLSPATH /usr/X11R6/lib/X11/nls</programlisting>
     <para>This should go in the same place as the existing set prompt
       line if there is one, or under "if($?prompt) then" if not.
       Comment out the old line; you can always switch back to it if
-      you prefer it.  Don't forget the spaces and quotes.  You can get
+      you prefer it.  Do not forget the spaces and quotes.  You can get
       the <filename>.tcshrc</filename> reread by typing
       <command>source .tcshrc</command>.</para>
 
@@ -1012,8 +1012,8 @@ setenv XNLSPATH /usr/X11R6/lib/X11/nls</programlisting>
       have been set by typing <command>env</command> at the prompt.
       The result will show you your default editor, pager, and
       terminal type, among possibly many others.  A useful command if
-      you log in from a remote location and can't run a program
-      because the terminal isn't capable is <command>setenv TERM
+      you log in from a remote location and can not run a program
+      because the terminal is not capable is <command>setenv TERM
       vt100</command>.</para>
   </sect1>
 
@@ -1029,21 +1029,21 @@ setenv XNLSPATH /usr/X11R6/lib/X11/nls</programlisting>
       CDROM with just <command>/sbin/mount /cdrom</command>.</para>
 
     <para>Using the live file system&mdash;the second of FreeBSD's
-      CDROM disks&mdash;is useful if you've got limited space.  What
+      CDROM disks&mdash;is useful if you have got limited space.  What
       is on the live file system varies from release to release.  You
       might try playing games from the CDROM.  This involves using
       <command>lndir</command>, which gets installed with the X Window
       System, to tell the program(s) where to find the necessary
-      files, because they're in the <filename>/cdrom</filename> file
+      files, because they are in the <filename>/cdrom</filename> file
       system instead of in <filename>/usr</filename> and its
-      subdirectories, which is where they're expected to be.  Read
+      subdirectories, which is where they are expected to be.  Read
       <command>man lndir</command>.</para>
   </sect1>
 
   <sect1>
     <title>Comments Welcome</title>
 
-    <para>If you use this guide I'd be interested in knowing where it
+    <para>If you use this guide I would be interested in knowing where it
       was unclear and what was left out that you think should be
       included, and if it was helpful.  My thanks to Eugene W. Stark,
       professor of computer science at SUNY-Stony Brook, and John
diff --git a/en_US.ISO8859-1/articles/pxe/article.sgml b/en_US.ISO8859-1/articles/pxe/article.sgml
index c64283ad34..f975081a2c 100644
--- a/en_US.ISO8859-1/articles/pxe/article.sgml
+++ b/en_US.ISO8859-1/articles/pxe/article.sgml
@@ -22,7 +22,7 @@
       </author>
     </authorgroup>
     
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/pxe/article.sgml,v 1.6 2001/09/29 08:48:35 murray Exp $</pubdate>
+    <pubdate>$FreeBSD$</pubdate>
     
     <abstract>
       <para>This article details the method used to allow machines to install
@@ -36,7 +36,7 @@
 
     <warning>
       <para>This procedure will make the 'Server' both insecure and dangerous,
-        it's best to just keep the 'Server' on it's own hub and not in any way
+        it is best to just keep the 'Server' on its own hub and not in any way
         accessable by any machines other than the 'Clients'.</para>
     </warning>
 
@@ -66,10 +66,10 @@
     <para>Please let me know if you come across anything you have problems with 
       or suggestions for additional documentation.</para>
 
-    <para>If you'd like someone to train/implement a specific netinstall system
+    <para>If you would like someone to train/implement a specific netinstall system
       for you, please send email so that we can discuss terms.</para>
 
-    <para>I'd also like to thank &a.ps; and &a.jhb; for doing most of the
+    <para>I would also like to thank &a.ps; and &a.jhb; for doing most of the
       programming work on pxeboot, the interface to Intel's PXE (netboot)
       system.</para>
   </sect1>
@@ -175,7 +175,7 @@
       <step>
         <para>Make a special <filename>loader.rc</filename> to and install it 
           in <filename>/usr/tftpboot/boot/loader.rc</filename> so that it 
-          doesn't prompt for the second disk, here's 
+          does not prompt for the second disk, here is 
           <ulink url="http://people.FreeBSD.org/~alfred/pxe/loader.rc">
           mine</ulink>.</para>
       </step>
@@ -223,7 +223,7 @@
         <para>Put the install files in an NFS accessable location on the
 	  Server. Make a directory corresponding the 'nfs' directive in the
 	  <filename> install.cfg</filename> file and mirror the FreeBSD
-	  install files there, you'll want it to look somewhat like
+	  install files there, you will want it to look somewhat like
 	  this:</para>
 
 	<screen>ABOUT.TXT       TROUBLE.TXT     compat20        floppies        ports
@@ -264,11 +264,11 @@ RELNOTES.TXT    compat1x        doc             packages</screen>
       which will then create a mypkg.tgz for you to include in your sysinstall 
       package.</para>
 
-    <para>Inside your custom package dir you'll want a file called 
+    <para>Inside your custom package dir you will want a file called 
       <filename>PLIST</filename> which contains all the files that you wish to 
       install and be incorperated into your package.</para>
       
-    <para>You'll also want files called '<filename>pre</filename>' and 
+    <para>You will also want files called '<filename>pre</filename>' and 
       '<filename>post</filename>' in the directory, these are shell scripts 
       that you want to execute before and after your package is 
       installed.</para>
diff --git a/en_US.ISO8859-1/articles/serial-uart/article.sgml b/en_US.ISO8859-1/articles/serial-uart/article.sgml
index 194816c89b..8cd3782e81 100644
--- a/en_US.ISO8859-1/articles/serial-uart/article.sgml
+++ b/en_US.ISO8859-1/articles/serial-uart/article.sgml
@@ -20,7 +20,7 @@
       </author>
     </authorgroup>
     
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/pxe/article.sgml,v 1.1 2001/06/25 14:51:37 nik Exp $</pubdate>
+    <pubdate>$FreeBSD$</pubdate>
     
     <abstract>
       <para>This article talks about using serial hardware with FreeBSD.</para>
@@ -2175,7 +2175,7 @@ sio16: type 16550A (multiport master)</screen>
 	  
 	<para>Ever wondered about FreeBSD support for your 20$
 	  multi-I/O card with two (or more) COM ports, sharing IRQs?
-	  Here's how:</para>
+	  Here is how:</para>
 	  
 	<para>Usually the only option to support these kind of boards
 	  is to use a distinct IRQ for each port.  For example, if
diff --git a/en_US.ISO8859-1/articles/solid-state/article.sgml b/en_US.ISO8859-1/articles/solid-state/article.sgml
index 00d5ee11d1..8467072ba9 100644
--- a/en_US.ISO8859-1/articles/solid-state/article.sgml
+++ b/en_US.ISO8859-1/articles/solid-state/article.sgml
@@ -27,7 +27,7 @@
      ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.
 
-     $FreeBSD: doc/en_US.ISO8859-1/articles/solid-state/article.sgml,v 1.4 2001/07/11 11:08:47 nik Exp $
+     $FreeBSD$
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -51,7 +51,7 @@
       </author>
     </authorgroup>
     
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/solid-state/article.sgml,v 1.4 2001/07/11 11:08:47 nik Exp $</pubdate>
+    <pubdate>$FreeBSD$</pubdate>
 
     <copyright>
       <year>2001</year>
@@ -184,7 +184,7 @@ pseudo-device   md              # memory disk</programlisting>
       <filename>/etc/rc.diskless2</filename>, however, is governed by a
       hard-coded value of 4096 sectors.  It is trivial to change this entry in
       the <filename>/etc/rc.diskless2</filename> file itself, although you
-      shouldn't need more space than that for
+      should not need more space than that for
       <filename>/dev</filename>.</para>
 
     <para>It is important to remember that the