summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-03-13 17:32:15 -0700
committerChris McDonough <chrism@plope.com>2012-03-13 17:32:15 -0700
commit0d57eb63ff4a495c5b652a708e31888e5f0a49c6 (patch)
tree3d3228950c446d22253cde371d900a72ee11d3ea /docs
parente47a859a01927a5dca28d9830100dd0f30954a0e (diff)
parentc946fc7b717359cf26dab45a9b84f06f6c1bc466 (diff)
downloadpyramid-0d57eb63ff4a495c5b652a708e31888e5f0a49c6.tar.gz
pyramid-0d57eb63ff4a495c5b652a708e31888e5f0a49c6.tar.bz2
pyramid-0d57eb63ff4a495c5b652a708e31888e5f0a49c6.zip
Merge pull request #480 from ppaez/typos
Typos
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/advconfig.rst2
-rw-r--r--docs/narr/introduction.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst
index 0060ef65c..9cb4db325 100644
--- a/docs/narr/advconfig.rst
+++ b/docs/narr/advconfig.rst
@@ -227,7 +227,7 @@ to :meth:`~pyramid.config.Configurator.commit` between them:
In the above example we've issued a call to
:meth:`~pyramid.config.Configurator.commit` between the two ``add_view``
-calls. :meth:`~pyramid.config.Configurator.commit` will cause any pending
+calls. :meth:`~pyramid.config.Configurator.commit` will execute any pending
configuration statements.
Calling :meth:`~pyramid.config.Configurator.commit` is safe at any time. It
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index d7e719bb1..8f7b17dc3 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -347,7 +347,7 @@ You can do this:
When this view callable is called by Pyramid, the ``{'a':1}`` dictionary will
be rendered to a response on your behalf. The string passed as ``renderer=``
above is an :term:`asset specification`. It is in the form
-``packagename:directoryname/filename.ext``. In this case, it names the
+``packagename:directoryname/filename.ext``. In this case, it refers to the
``mytemplate.pt`` file in the ``templates`` directory within the ``myapp``
Python package. Asset specifications are omnipresent in Pyramid: see
:ref:`intro_asset_specs` for more information.