regen

1 files changed, 14 insertions, 11 deletions

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index 65b467c10e2..e8c7e08ac44 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -871,23 +871,25 @@ Protocol, SUP. To do so, make sure your supfile has a line
 release=pkgsrc
 
 in it, see the examples in /usr/share/examples/supfiles, and that the /usr/
-pkgsrc directory exists. Then, simply run sup -v /path/to/your/supfile.
+pkgsrc directory exists. Then, simply run:
+
+$ sup -v /path/to/your/supfile.
 
 2.1.3. Via anonymous CVS
 
 To do an initial (full) checkout of pkgsrc, you first have to set some
 environment variables. For the C-Shell, type:
 
-    % setenv CVSROOT anoncvs@anoncvs.NetBSD.org:/cvsroot
-    % setenv CVS_RSH ssh
+% setenv CVSROOT anoncvs@anoncvs.NetBSD.org:/cvsroot
+% setenv CVS_RSH ssh
 
 Or, the same for the bourne shell:
 
-    $ export CVSROOT="anoncvs@anoncvs.NetBSD.org:/cvsroot"
-    $ export CVS_RSH="ssh"
+$ export CVSROOT="anoncvs@anoncvs.NetBSD.org:/cvsroot"
+$ export CVS_RSH="ssh"
 
-By default, cvs doesn't do things like most people would expect it to do. But
-there is a way to convince cvs, by creating a file called .cvsrc in your home
+By default, CVS doesn't do things like most people would expect it to do. But
+there is a way to convince CVS, by creating a file called .cvsrc in your home
 directory and saving the following lines to it. This file will save you lots of
 headache and some bug reports, so we strongly recommend it. You can find an
 explanation of this file in the CVS documentation.
@@ -903,7 +905,7 @@ rdiff -u
 To fetch a specific pkgsrc stable branch from scratch, run:
 
 $ cd /usr
-        $ cvs checkout -r pkgsrc-200xQy -P pkgsrc
+$ cvs checkout -r pkgsrc-200xQy -P pkgsrc
 
 Where pkgsrc-200xQy is the stable branch to be checked out, for example,
 "pkgsrc-2007Q4"
@@ -914,7 +916,7 @@ package source will be stored under /usr/pkgsrc/.
 To fetch the pkgsrc current branch, run:
 
 $ cd /usr
-$ cvs checkout -r -P pkgsrc
+$ cvs checkout -P pkgsrc
 
 2.2. Keeping pkgsrc up-to-date
 
@@ -946,8 +948,9 @@ directory. Remove the pkgsrc directory and extract the new tar file. Done.
 2.2.2. Via CVS
 
 To update pkgsrc via CVS, make sure the environment variable CVS_RSH is set as
-above. Then, change to the pkgsrc directory and run:
+above. Then, change to the pkgsrc directory and run cvs:
 
+$ cd /usr/pkgsrc
 $ cvs update -dP
 
 2.2.2.1. Switching between different pkgsrc branches
@@ -956,7 +959,7 @@ When updating pkgsrc, the CVS program keeps track of the branch you selected.
 But if you, for whatever reason, want to switch from the stable branch to the
 current one, you can do it by adding the option "-A" after the "update"
 keyword. To switch from the current branch back to the stable branch, add the
-"-rpkgsrc-2007Q1" option.
+"-rpkgsrc-2007Q4" option.
 
 2.2.2.2. What happens to my changes when updating?