Merged documentation changes from 2008-04-29
Authored by: cboos 2008-04-29
Parent: [r6914]
Child: [r6916]