Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branch

Chris McDonough

2011-12-28 c338e2111472a2daa4b3b01e43c804f0057b92d8

Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branch

 docs/tutorials/wiki/basiclayout.rst

@@ -10,7 +10,7 @@
`http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src/basiclayout/
<http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src/basiclayout/>`_.

Appplication Configuration with ``__init__.py``
Application Configuration with ``__init__.py``
------------------------------------------------

A directory on disk can be turned into a Python :term:`package` by containing