summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-11-23 18:36:31 -0800
committerSteve Piercy <web@stevepiercy.com>2018-11-23 18:36:31 -0800
commitdd2aefc04435b65d67163c432409b4f76685b93a (patch)
tree2fb99d17c4fc1f6c53fdc4aabca4aaf5935111a7 /docs
parenta4b1059b4c92f8b25486159cc650a8a94cd62772 (diff)
downloadpyramid-dd2aefc04435b65d67163c432409b4f76685b93a.tar.gz
pyramid-dd2aefc04435b65d67163c432409b4f76685b93a.tar.bz2
pyramid-dd2aefc04435b65d67163c432409b4f76685b93a.zip
Clean up grammar in models section
Diffstat (limited to 'docs')
-rw-r--r--docs/tutorials/wiki/basiclayout.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index 33e0b4ff3..7e6e86143 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -170,16 +170,16 @@ Here is the source for ``models.py``:
The ``MyModel`` :term:`resource` class is implemented here.
Instances of this class are capable of being persisted in :term:`ZODB` because the class inherits from the :class:`persistent.mapping.PersistentMapping` class.
The ``__parent__`` and ``__name__`` are important parts of the :term:`traversal` protocol.
- By default, set these to ``None`` to indicate that this is the :term:`root` object.
+ By default, these are set to ``None`` to indicate that this is the :term:`root` object.
#. *Lines 8-12*.
``appmaker`` is used to return the *application root* object.
It is called on *every request* to the :app:`Pyramid` application.
It also performs bootstrapping by *creating* an application root (inside the ZODB root object) if one does not already exist.
- It is used by the ``root_factory`` we've defined in our ``__init__.py``.
+ It is used by the ``root_factory`` we have defined in our ``__init__.py``.
Bootstrapping is done by first seeing if the database has the persistent application root.
- If not, we make an instance, store it, and commit the transaction.
+ If not, then we make an instance, store it, and commit the transaction.
We then return the application root object.