fix markup
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
Merge pull request #971 from tshepang/diff

some doc improvements
fix some cross-references

Also, pyramid_zcml is cross-referenced, so add it to intersphinx_mapping dict.
typo
remove repetition; improve readability
trim commented-out parts of docs/conf.py

proposed here:
https://groups.google.com/forum/?fromgroups=#!topic/pylons-devel/n2-7zvLWK3E
Merge pull request #972 from tshepang/diff

fix some cross-references
Merge pull request #973 from tshepang/better

some doc improvements
grammar
Documentation regarding missing Accept header

If a request doesn't contain an Accept header routes will match it
regardless of thier accept attribute.
Merge pull request #975 from danielholmstrom/master

Documentation regarding missing Accept header
fix some cross-references
Merge pull request #978 from tshepang/diff

fix some cross-references
grammar fix
Merge pull request #980 from tshepang/grammar

grammar fix
update changes.txt