1.0dev: clean-up TracGuide by syncing the relevant changes from t.e.o
(from the trac-guide-1.0 hg branch actually)
Authored by: cboos 2012-07-16
Parent: [r11120]
Child: [r11122]