summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-12-28 09:32:34 -0500
committerChris McDonough <chrism@plope.com>2011-12-28 09:32:34 -0500
commitc338e2111472a2daa4b3b01e43c804f0057b92d8 (patch)
tree7d528d069bef73280f98da88d5ee25a2d2176de6
parent5a3ddb76a7ac4ee6f41652f774e8387a8c9b131a (diff)
parentcd5fd7cc06939ea7dc26371f687ffaeb58a0e491 (diff)
downloadpyramid-c338e2111472a2daa4b3b01e43c804f0057b92d8.tar.gz
pyramid-c338e2111472a2daa4b3b01e43c804f0057b92d8.tar.bz2
pyramid-c338e2111472a2daa4b3b01e43c804f0057b92d8.zip
Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branch
-rw-r--r--docs/tutorials/wiki/basiclayout.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index 56f817a85..308c8e292 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -10,7 +10,7 @@ The source code for this tutorial stage can be browsed via
`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