Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/BUILDING,v
rcsdiff: /ftp/cvs/cvsroot/src/BUILDING,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.59
retrieving revision 1.59.2.2
diff -u -p -r1.59 -r1.59.2.2
--- src/BUILDING	2006/10/08 17:54:30	1.59
+++ src/BUILDING	2007/04/16 19:52:26	1.59.2.2
@@ -485,8 +485,18 @@ BUILDING
                    INSTALLWORLDDIR is not the root directory if cross compil-
                    ing.
 
-                   Note: It is highly recommended that you upgrade your kernel
-                   and reboot before performing this operation.
+                   The INSTALLSETS environment variable may be set to a list
+                   of distribution sets to be installed.  By default, all sets
+                   except ``etc'' and ``xetc'' are installed (so most files in
+                   INSTALLWORLDDIR/etc will not be installed or modified).
+
+                   Note: Before performing this operation with
+                   INSTALLWORLDDIR=/, it is highly recommended that you
+                   upgrade your kernel and reboot.  After performing this
+                   operation, it is recommended that you use etcupdate(8) to
+                   update files in INSTALLWORLDDIR/etc and that you use
+                   postinstall(8) to check for inconsistencies (and possibly
+                   to fix them).
 
      sets          Create distribution sets from DESTDIR into
                    RELEASEDIR/MACHINE/binary/sets.  Should be run after ``make
@@ -507,12 +517,30 @@ BUILDING
                    described by release(7).  This requires that RELEASEDIR be
                    set (see above).
 
-     iso-image     Create a CD-ROM image in
-                   RELEASEDIR/MACHINE/installation/cdrom.  RELEASEDIR must
-                   already have been populated by ``make release'' or equiva-
-                   lent.  This requires the mkisofs(1) utility, which is not
-                   part of NetBSD, but which can be installed from
-                   pkgsrc/sysutils/cdrtools.
+     iso-image     Create a NetBSD installation CD-ROM image in the
+                   RELEASEDIR/iso directory.  The CD-ROM file system will have
+                   a layout as described in release(7).
+
+                   For most machine types, the CD-ROM will be bootable, and
+                   will automatically run the sysinst(8) menu-based installa-
+                   tion program, which can be used to install or upgrade a
+                   NetBSD system.  Bootable CD-ROMs also contain tools that
+                   may be useful in repairing a damaged NetBSD installation.
+
+                   Before ``make iso-image'' is attempted, RELEASEDIR must be
+                   populated by ``make release'' or equivalent.
+
+                   Note that other, smaller, CD-ROM images may be created in
+                   the RELEASEDIR/MACHINE/installation/cdrom directory by
+                   ``make release''.  These smaller images usually contain the
+                   same tools as the larger images in RELEASEDIR/iso, but do
+                   not contain additional content such as the distribution
+                   sets.
+
+                   Note that the mac68k port still uses an older method of
+                   creating CD-ROM images.  This requires the mkisofs(1) util-
+                   ity, which is not part of NetBSD, but which can be
+                   installed from pkgsrc/sysutils/cdrtools.
 
      regression-tests
                    Can only be run after building the regression tests in the
@@ -555,7 +583,8 @@ BUILDING
      tools         Build and install the host tools from src/tools.
 
      install=idir  Install the contents of DESTDIR to idir, using ``make
-                   installworld''.
+                   installworld''.  Note that files that are part of the
+                   ``etc'' or ``xetc'' sets will not be installed.
 
      kernel=kconf  Build a new kernel.  The kconf argument is the name of a
                    configuration file suitable for use by config(1).  If kconf
@@ -744,7 +773,8 @@ OBSOLETE VARIABLES
                  TOOLCHAIN_MISSING=yes.
 
 SEE ALSO
-     make(1), hier(7), release(7), pkgsrc/sysutils/cdrtools
+     make(1), hier(7), release(7), etcupdate(8), postinstall(8), sysinst(8),
+     pkgsrc/sysutils/cdrtools
 
 HISTORY
      The build.sh based build scheme was introduced for NetBSD 1.6 as
@@ -753,4 +783,4 @@ HISTORY
 BUGS
      A few platforms are not yet using this build system.
 
-NetBSD                          January 4, 2006                         NetBSD
+NetBSD                          April 13, 2007                          NetBSD