Merge pull request #970 from tshepang/diff

fix some cross-references and markup
fix markup
replace a sentence that doesn't quite fit

It's as if pyramid_traversalwrapper was already introduced.
fix some cross-references