diff options
| author | Chris McDonough <chrism@plope.com> | 2013-01-01 21:39:48 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-01-01 21:39:48 -0500 |
| commit | cf7c15a6ceb0b96a7950daef2a33ee2464c655cb (patch) | |
| tree | c792a3bf12b2b2615fbb306e354c85b10983d63b /docs/tutorials/wiki | |
| parent | 1b5c1c3df5eadf02b0e8818e32ee45e69b2c051f (diff) | |
| parent | c5d01d4667d678782898b7d6859d60c617e30a9e (diff) | |
| download | pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.tar.gz pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.tar.bz2 pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/tutorials/wiki')
| -rw-r--r-- | docs/tutorials/wiki/basiclayout.rst | 4 | ||||
| -rw-r--r-- | docs/tutorials/wiki/definingmodels.rst | 2 | ||||
| -rw-r--r-- | docs/tutorials/wiki/definingviews.rst | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst index 12cf86a91..da381ad7b 100644 --- a/docs/tutorials/wiki/basiclayout.rst +++ b/docs/tutorials/wiki/basiclayout.rst @@ -38,13 +38,13 @@ point happens to be the ``main`` function within the file named factory is named ``root_factory``. #. *Line 15*. Register a 'static view' which answers requests which start - with with URL path ``/static`` using the + with URL path ``/static`` using the :meth:`pyramid.config.Configurator.add_static_view method`. This statement registers a view that will serve up static assets, such as CSS and image files, for us, in this case, at ``http://localhost:6543/static/`` and below. The first argument is the "name" ``static``, which indicates that the URL path prefix of the view - will be ``/static``. the The second argument of this tag is the "path", + will be ``/static``. The second argument of this tag is the "path", which is a relative :term:`asset specification`, so it finds the resources it should serve within the ``static`` directory inside the ``tutorial`` package. The scaffold could have alternately used an *absolute* asset diff --git a/docs/tutorials/wiki/definingmodels.rst b/docs/tutorials/wiki/definingmodels.rst index 1a5d38b10..2cbe691fa 100644 --- a/docs/tutorials/wiki/definingmodels.rst +++ b/docs/tutorials/wiki/definingmodels.rst @@ -63,7 +63,7 @@ contain the :term:`ReStructuredText` body representing the wiki page content. Note that ``Page`` objects don't have an initial ``__name__`` or ``__parent__`` attribute. All objects in a traversal graph must have a ``__name__`` and a ``__parent__`` attribute. We don't specify these here -because both ``__name__`` and ``__parent__`` will be set by by a :term:`view` +because both ``__name__`` and ``__parent__`` will be set by a :term:`view` function when a Page is added to our Wiki mapping. As a last step, we want to change the ``appmaker`` function in our diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst index 529603546..27f55da13 100644 --- a/docs/tutorials/wiki/definingviews.rst +++ b/docs/tutorials/wiki/definingviews.rst @@ -115,7 +115,7 @@ The curried function named ``check`` is used as the first argument to each WikiWord match found in the content. If the wiki (our page's ``__parent__``) already contains a page with the matched WikiWord name, the ``check`` function generates a view link to be used as the substitution value -and returns it. If the wiki does not already contain a page with with the +and returns it. If the wiki does not already contain a page with the matched WikiWord name, the function generates an "add" link as the substitution value and returns it. |
