Brought directories into line with current source tree.
Some clarifications. Fixed some errors.
Authored by: delphidabbler 2012-08-16
Parent: [r2214]
Child: [r2216]
