summaryrefslogtreecommitdiff
path: root/docs/narr/assets.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-01 21:39:48 -0500
committerChris McDonough <chrism@plope.com>2013-01-01 21:39:48 -0500
commitcf7c15a6ceb0b96a7950daef2a33ee2464c655cb (patch)
treec792a3bf12b2b2615fbb306e354c85b10983d63b /docs/narr/assets.rst
parent1b5c1c3df5eadf02b0e8818e32ee45e69b2c051f (diff)
parentc5d01d4667d678782898b7d6859d60c617e30a9e (diff)
downloadpyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.tar.gz
pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.tar.bz2
pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/assets.rst')
-rw-r--r--docs/narr/assets.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/assets.rst b/docs/narr/assets.rst
index e8e915297..7b620548d 100644
--- a/docs/narr/assets.rst
+++ b/docs/narr/assets.rst
@@ -252,7 +252,7 @@ static assets that live *outside* the :app:`Pyramid` application. This will
happen when the :meth:`~pyramid.config.Configurator.add_static_view` API
associated with the path fed to :meth:`~pyramid.request.Request.static_url`
is a *URL* instead of a view name. For example, the ``name`` argument may be
-``http://example.com`` while the the ``path`` given may be
+``http://example.com`` while the ``path`` given may be
``mypackage:images``:
.. code-block:: python