summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-03-13 20:28:55 -0700
committerChris McDonough <chrism@plope.com>2012-03-13 20:28:55 -0700
commit34942793f03dea9d7f13b6e00d34946dee98d098 (patch)
tree81315666ea3063de6776de3b5c5b070396a34188 /docs/narr
parent3c48872ca9f08bf87d2bf5df9516861216210a49 (diff)
parenta9aed5f471ceddc4dfaa6781455b0429389f3da1 (diff)
downloadpyramid-34942793f03dea9d7f13b6e00d34946dee98d098.tar.gz
pyramid-34942793f03dea9d7f13b6e00d34946dee98d098.tar.bz2
pyramid-34942793f03dea9d7f13b6e00d34946dee98d098.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr')
-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.