escaped double quotes are now unescaped
Added a test case for templating with escaped double braces.
Added edged test cases for templating with escpaed doubled braces.
Merge branch 'master' of github.com:Pylons/pyramid
update changes.txt
docs/narr/hooks.rst: some improvements

* consistency fixes: "not found view" --> "Not Found View"
* use comparable code for Imperative and Declarative configuration
* remove unused import, HTTPForbidden
Merge pull request #987 from tshepang/diff

docs/narr/hooks.rst: some improvements
remove ambiguity by indicating that the target is API documentation
add a cross-ref... hyperlinks are nice
remove redundant text
no need to reference oneself
Merge pull request #988 from tshepang/patch-1

remove ambiguity by indicating that the target is API documentation
Merge pull request #989 from tshepang/patch-2

add a cross-ref... hyperlinks are nice
Merge pull request #990 from tshepang/patch-3

remove redundant text
Merge pull request #991 from tshepang/patch-5

no need to reference oneself
no need to link to a chapter that follows immediately
simplify explanation

The sentence was simply too long-winded (and not too clear).
grammar
remove redundant text

Also, this fact has already been explained in the chapter, so mention that.
remove redundancy