summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/basiclayout.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2018-09-27 21:54:04 -0500
committerMichael Merickel <michael@merickel.org>2018-09-27 21:54:04 -0500
commit58d2a5f14bb787defefe7a2b1b36665c4991c0da (patch)
tree3eff83e38ad641e7285ce6788cad47a12fa14262 /docs/tutorials/wiki2/basiclayout.rst
parentf081ae991a9107363fceeeeccd361c2f85bdd046 (diff)
parent279ee00fff1894b3451d84a8eeafae42e8638776 (diff)
downloadpyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.tar.gz
pyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.tar.bz2
pyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.zip
Merge branch 'master' into fix-deprecated-accept-predicate
Diffstat (limited to 'docs/tutorials/wiki2/basiclayout.rst')
-rw-r--r--docs/tutorials/wiki2/basiclayout.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 313b5998e..315aca29e 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -44,7 +44,7 @@ When you invoke the ``pserve development.ini`` command, the ``main`` function
above is executed. It accepts some settings and returns a :term:`WSGI`
application. (See :ref:`startup_chapter` for more about ``pserve``.)
-Next in ``main``, construct a :term:`Configurator` object:
+Next in ``main``, construct a :term:`Configurator` object using a context manager:
.. literalinclude:: src/basiclayout/tutorial/__init__.py
:lines: 7
@@ -65,7 +65,7 @@ with the ``.jinja2`` extension within our project.
:lineno-match:
:language: py
-Next include the the package ``models`` using a dotted Python path. The exact
+Next include the package ``models`` using a dotted Python path. The exact
setup of the models will be covered later.
.. literalinclude:: src/basiclayout/tutorial/__init__.py