diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-09 02:50:15 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-09 02:50:15 -0500 |
| commit | f360d9e6d9689dfe92a950e97e7e19c414655997 (patch) | |
| tree | f0456af418ecfaf7d5a342556d2c5786b2aee979 /docs/narr/models.rst | |
| parent | c18b16d293ee60117747f0de042e2d75361d1fd8 (diff) | |
| parent | 13173e9e1d1c5f3873e8bfed91e6f3ed561dafaf (diff) | |
| download | pyramid-f360d9e6d9689dfe92a950e97e7e19c414655997.tar.gz pyramid-f360d9e6d9689dfe92a950e97e7e19c414655997.tar.bz2 pyramid-f360d9e6d9689dfe92a950e97e7e19c414655997.zip | |
Merge branch 'twophase'
Conflicts:
pyramid/configuration.py
Diffstat (limited to 'docs/narr/models.rst')
| -rw-r--r-- | docs/narr/models.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/models.rst b/docs/narr/models.rst index 20f443571..2c72e766d 100644 --- a/docs/narr/models.rst +++ b/docs/narr/models.rst @@ -9,14 +9,14 @@ omnipresent in :app:`Pyramid`: willing to walk over when :term:`traversal` is used. - The ``context`` and ``containment`` arguments to - :meth:`pyramid.configuration.Configurator.add_view` often + :meth:`pyramid.config.Configurator.add_view` often reference a model class. - A :term:`root factory` returns a model instance. - A model instance is generated as a result of :term:`url dispatch` (see the ``factory`` argument to - :meth:`pyramid.configuration.Configurator.add_route`). + :meth:`pyramid.config.Configurator.add_route`). - A model instance is exposed to :term:`view` code as the :term:`context` of a view. |