Merge from trunk:

Merge from trunk:
------------------------------------------------------------------------
r10291 | zmedico | 2008-05-11 12:37:31 -0700 (Sun, 11 May 2008) | 2 lines

Add back the warning for DISTDIR about storing stuff inside PORTDIR.

------------------------------------------------------------------------
r10290 | zmedico | 2008-05-11 12:35:26 -0700 (Sun, 11 May 2008) | 2 lines

Sync make.conf.example with make.conf.5 for bug #220111.

------------------------------------------------------------------------
r10289 | zmedico | 2008-05-11 12:21:28 -0700 (Sun, 11 May 2008) | 3 lines

Bug #220111 - Update the DISTDIR docs to clarify that it's safe to remove
any and all files from this location after packages are built.

------------------------------------------------------------------------
r10288 | zmedico | 2008-05-11 11:25:35 -0700 (Sun, 11 May 2008) | 2 lines

Make the summary more accurate.

------------------------------------------------------------------------

svn path=/main/branches/2.1.2/; revision=10292