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/project.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/project.rst')
| -rw-r--r-- | docs/narr/project.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst index b2b0931b6..6cfd31c0b 100644 --- a/docs/narr/project.rst +++ b/docs/narr/project.rst @@ -743,7 +743,7 @@ also informs Python that the directory which contains it is a *package*. :linenos: #. Line 1 imports the :term:`Configurator` class from - :mod:`pyramid.configuration` that we use later. + :mod:`pyramid.config` that we use later. #. Line 2 imports the ``get_root`` function from :mod:`myproject.models` that we use later. @@ -904,7 +904,7 @@ made for you by any paster template, you can decide to lay your code out any way you see fit. For example, the configuration method named -:meth:`~pyramid.configuration.Configurator.add_view` requires you to pass a +:meth:`~pyramid.config.Configurator.add_view` requires you to pass a :term:`dotted Python name` or a direct object reference as the class or function to be used as a view. By default, the ``pyramid_starter`` paster template would have you add view functions to the ``views.py`` module in your |