summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-01 18:25:29 -0800
committerChris McDonough <chrism@plope.com>2013-01-01 18:25:29 -0800
commitc5d01d4667d678782898b7d6859d60c617e30a9e (patch)
treec792a3bf12b2b2615fbb306e354c85b10983d63b /docs/tutorials
parent1b5c1c3df5eadf02b0e8818e32ee45e69b2c051f (diff)
parent043ccddb909327106264d10ed5d413760a51770d (diff)
downloadpyramid-c5d01d4667d678782898b7d6859d60c617e30a9e.tar.gz
pyramid-c5d01d4667d678782898b7d6859d60c617e30a9e.tar.bz2
pyramid-c5d01d4667d678782898b7d6859d60c617e30a9e.zip
Merge pull request #760 from tshepang/typos
lots of typos
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki/basiclayout.rst4
-rw-r--r--docs/tutorials/wiki/definingmodels.rst2
-rw-r--r--docs/tutorials/wiki/definingviews.rst2
-rw-r--r--docs/tutorials/wiki2/definingviews.rst4
4 files changed, 6 insertions, 6 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.
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index 6b8689b5b..8714927c3 100644
--- a/docs/tutorials/wiki2/definingviews.rst
+++ b/docs/tutorials/wiki2/definingviews.rst
@@ -144,7 +144,7 @@ The ``check()`` function is used as the first argument to
each WikiWord match found in the content. If the wiki already contains a
page with the matched WikiWord name, ``check()`` 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 matched WikiWord name, ``check()``
+not already contain a page with the matched WikiWord name, ``check()``
generates an "add" link as the substitution value and returns it.
As a result, the ``content`` variable is now a fully formed bit of HTML
@@ -358,7 +358,7 @@ each of the following URLs, check that the result is as expected:
of the FrontPage page object.
- ``http://localhost:6543/FrontPage`` in a browser invokes
- the ``view_page`` view of the front page page object.
+ the ``view_page`` view of the front page object.
- ``http://localhost:6543/FrontPage/edit_page`` in a browser
invokes the edit view for the front page object.