regen, this time with valid HTML.

1 files changed, 76 insertions, 77 deletions

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index fcceb281bd6..cac722d9389 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -347,7 +347,15 @@ B. Build logs
     B.1. Building figlet
     B.2. Packaging figlet
 
-C. Layout of the FTP server's package archive
+C. Directory layout of the pkgsrc FTP server
+
+    C.1. bootstrap-pkgsrc: Bootstrap kits
+    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, 200xQy: source packages
+
 D. Editing guidelines for the pkgsrc guide
 
     D.1. Targets
@@ -638,7 +646,7 @@ a tar file, via SUP, or via CVS. All three ways are described here.
 
 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
-described in detail in Appendix C, Layout of the FTP server's package archive.
+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.
@@ -6752,81 +6760,72 @@ Using SrcDir value of /usr/pkg
 Registering depends:.
 #
 
-Appendix C. Layout of the FTP server's package archive
-
-Layout for precompiled binary packages on ftp.NetBSD.org:
-
-    /pub/NetBSD/packages/
-        distfiles/
-
-        # Unpacked pkgsrc trees
-        pkgsrc-current -> /pub/NetBSD/NetBSD-current/pkgsrc
-        pkgsrc-2003Q4 -> N/A
-        pkgsrc-2004Q1/pkgsrc
-
-        # pkgsrc archives
-        pkgsrc-current.tar.gz -> ../NetBSD-current/tar_files/pkgsrc.tar.gz
-        pkgsrc-2003Q4.tar.gz -> N/A
-        pkgsrc-2004Q1.tar.gz -> N/A
-
-        # Per pkgsrc-release/OS-release/arch package archives
-        pkgsrc-2003Q4/
-            NetBSD-1.6.2/
-                i386/
-                    All/
-                    archivers/
-                        foo -> ../All/foo
-                    ...
-        pkgsrc-2004Q1/
-            NetBSD-1.6.2/
-                i386/
-                    All/
-                    ...
-            NetBSD-2.0/
-                i386/
-                    All/
-                    ...
-            SunOS-5.9/
-                sparc/
-                    All/
-                    ...
-                x86/
-                    All/
-                    ...
-
-        # Per os-release package archive convenience links
-        NetBSD-1.6.2 -> 1.6.2
-        1.6.2/
-            i386 -> ../pkgsrc-2004Q1/NetBSD-1.6.2/i386
-            m68k/
-                All/
-                archivers/
-                    foo -> ../All/foo
-                ...
-            amiga -> m68k
-            atari -> m68k
-            ...
-
-        2.0 -> NetBSD-2.0       # backward compat, historic
-        NetBSD-2.0/
-            i386 -> ../pkgsrc-2004Q1/NetBSD-2.0/i386
-        SunOS-5.9/
-            sparc -> ../pkgsrc-2004Q1/SunOS-5.9/sparc
-            x86 -> ../pkgsrc-2004Q1/SunOS-5.9/x86
-
-To create:
-
- 1. Run bulk build, see Section 6.3, "Doing a bulk build of all packages"
-
- 2. Upload /usr/pkgsrc/packages to
-
-        ftp://ftp.NetBSD.org/pub/NetBSD/packages/\
-            pkgsrc-2004Q4/\             # pkgsrc-branch
-            `uname -s`-`uname -r`/\     # OS & version
-            `uname -p`                  # architecture
-
- 3. If necessary, create a symlink ln -s `uname -m` `uname -p` (amiga -> m68k,
-    ...)
+Appendix C. Directory layout of the pkgsrc FTP server
+
+Table of Contents
+
+C.1. bootstrap-pkgsrc: Bootstrap kits
+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, 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
+base directory on ftp.NetBSD.org is /pub/pkgsrc. This directory contains some
+subdirectories, 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.
+
+C.2. distfiles: The distributed source files
+
+The directory distfiles contains lots of archive files from all pkgsrc
+packages, which are mirrored here. The subdirectories are called after their
+package names and are used when the distributed files have names that don't
+explicitly contain a version number or are otherwise too generic (for example
+release.tar.gz).
+
+C.3. iso: Currently empty
+
+This directory is currently not in use.
+
+C.4. misc: Miscellaneous things
+
+This directory contains things that individual pkgsrc developers find worth
+publishing.
+
+C.5. packages*: Binary packages
+
+These directories contain binary packages. Those directories that have a branch
+name (200xQy) contain packages from that particular branch. The directory
+packages contains binary packages from pkgsrc-current. (However, this does not
+necessarily mean that the packages are still current anymore.)
+
+Below the packages* directories are directories that distinguish the packages
+by operating system and version, the next directory level specifies the
+hardware architecture.
+
+In each of the platform-specific directories, there is a whole binary packages
+collection. 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, 200xQy: source packages
+
+These directories contain the "real" pkgsrc, that is the files that define how
+to create binary packages from source archives.
+
+The directory pkgsrc contains a snapshot of the CVS repository, which is
+updated on a regularly basis. The file pkgsrc.tar.gz contains the same as the
+directory, ready to be downloaded as a whole.
+
+In the directories for the quarterly branches, there is an additional file
+called pkgsrc-200xQy.tar.gz, which contains the state of pkgsrc when it was
+branched.
 
 Appendix D. Editing guidelines for the pkgsrc guide