regen

1 files changed, 22 insertions, 8 deletions

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index 01d95e4f9f1..53f8983d3d2 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -445,7 +445,8 @@ C. Directory layout of the pkgsrc FTP server
     C.3. iso: Currently empty
     C.4. misc: Miscellaneous things
     C.5. packages: Binary packages
-    C.6. current, pkgsrc-200xQy: source packages
+    C.6. reports: Bulk build reports
+    C.7. current, pkgsrc-200xQy: source packages
 
 D. Editing guidelines for the pkgsrc guide
 
@@ -9031,7 +9032,8 @@ C.2. distfiles: The distributed source files
 C.3. iso: Currently empty
 C.4. misc: Miscellaneous things
 C.5. packages: Binary packages
-C.6. current, pkgsrc-200xQy: source packages
+C.6. reports: Bulk build reports
+C.7. current, pkgsrc-200xQy: source packages
 
 As in other big projects, the directory layout of pkgsrc is quite complex for
 newbies. This chapter explains where you find things on the FTP server. The
@@ -9043,7 +9045,8 @@ which are explained below.
 C.1. bootstrap-pkgsrc: Bootstrap kits
 
 For those who only want to manage binary packages on systems other than NetBSD,
-we provide the package management tools in a separate, small tar file.
+we provide the package management tools in a separate, small tar file. Please
+note that most of these files are horribly outdated.
 
 C.2. distfiles: The distributed source files
 
@@ -9069,14 +9072,19 @@ supported by pkgsrc. Each subdirectory is of the form OPSYS/ARCH/OSVERSION_TAG.
 The meaning of these variables is:
 
   * OPSYS is the name of the operating system for which the packages have been
-    built,
+    built.
 
-  * ARCH is the hardware architecture,
+  * ARCH is the hardware architecture of the platform for which the packages
+    have been built.
 
-  * OSVERSION is the version of the operating system,
+  * OSVERSION is the version of the operating system. For version numbers that
+    change often (for example NetBSD-current), the often-changing part should
+    be replaced with an x, for example 4.99.x.
 
   * TAG is either 200xQy for a stable branch, or head for packages built from
-    the HEAD branch.
+    the HEAD branch. The latter should only be used when the packages are
+    updated on a regular basis. Otherwise the date from checking out pkgsrc
+    should be appended, for example head_20071015.
 
 The rationale for exactly this scheme is that the pkgsrc users looking for
 binary packages can quickly click through the directories on the server and
@@ -9091,7 +9099,13 @@ specific platform. It has a directory called All which contains all binary
 packages. Besides that, there are various category directories that contain
 symbolic links to the real binary packages.
 
-C.6. current, pkgsrc-200xQy: source packages
+C.6. reports: Bulk build reports
+
+Here are the reports from bulk builds, for those who want to fix packages that
+didn't build on some of the platforms. The structure of subdirectories should
+look like the one in Section C.5, "packages: Binary packages".
+
+C.7. current, pkgsrc-200xQy: source packages
 
 These directories contain the "real" pkgsrc, that is the files that define how
 to create binary packages from source archives.