regen

1 files changed, 22 insertions, 8 deletions

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index d74f5324ec0..0a8b446d296 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -47,7 +47,7 @@ I. The pkgsrc user's guide
 
         2.1. Getting pkgsrc for the first time
 
-            2.1.1. As tar file
+            2.1.1. As tar archive
             2.1.2. Via anonymous CVS
 
         2.2. Keeping pkgsrc up-to-date
@@ -699,7 +699,7 @@ Table of Contents
 
     2.1. Getting pkgsrc for the first time
 
-        2.1.1. As tar file
+        2.1.1. As tar archive
         2.1.2. Via anonymous CVS
 
     2.2. Keeping pkgsrc up-to-date
@@ -817,7 +817,7 @@ Table of Contents
 
 2.1. Getting pkgsrc for the first time
 
-    2.1.1. As tar file
+    2.1.1. As tar archive
     2.1.2. Via anonymous CVS
 
 2.2. Keeping pkgsrc up-to-date
@@ -844,14 +844,26 @@ of the stable branches are built from the year and the quarter, for example
 The second step is to decide how you want to download pkgsrc. You can get it as
 a tar file or via CVS. Both ways are described here.
 
-2.1.1. As tar file
+Note that tar archive contains CVS working copy. Thus you can switch to using
+CVS at any later time.
 
-The primary download location for all pkgsrc files is ftp://ftp.NetBSD.org/pub/
-pkgsrc/. There are a number of subdirectories for different purposes, which are
+Note also that quarterly branch is not frozen in stone. It receives critical
+updates.
+
+2.1.1. As tar archive
+
+The primary download location for all pkgsrc files is http://ftp.NetBSD.org/pub
+/pkgsrc/ or ftp://ftp.NetBSD.org/pub/pkgsrc/ (it points to the same location).
+There are a number of subdirectories for different purposes, which are
 described in detail in Appendix C, Directory layout of the pkgsrc FTP server.
 
-The tar file for the current branch is in the directory current and is called
-pkgsrc.tar.gz. It is autogenerated daily.
+The tar archive for the current branch is in the directory current and is
+called pkgsrc.tar.gz. It is autogenerated daily.
+
+To save download time we provide bzip2- and xz-compressed archives which are
+published at pkgsrc.tar.bz2 and pkgsrc.tar.xz respectively.
+
+You can fetch the same files using FTP.
 
 The tar file for the stable branch 2009Q1 is in the directory pkgsrc-2009Q1 and
 is also called pkgsrc-2009Q1.tar.gz.
@@ -863,6 +875,8 @@ $ ftp ftp://ftp.NetBSD.org/pub/pkgsrc/pkgsrc-20xxQy/pkgsrc-20xxQy.tar.gz
 Where pkgsrc-20xxQy is the stable branch to be downloaded, for example, "
 pkgsrc-2009Q1".
 
+You can use fetch it also using "wget", "curl", or your web browser.
+
 Then, extract it with:
 
 $ tar -xzf pkgsrc-20xxQy.tar.gz -C /usr