Merge in Ping's changes to the cgitb documentation, and add a version

annotation as well.
This closes SF patch #494582.