summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2013-03-05 12:55:27 -0800
committerTres Seaver <tseaver@palladion.com>2013-03-05 12:55:27 -0800
commit319a0c295f2e10cf19cc7e648cd0bd52ff603f50 (patch)
tree6d3ebbc2bd251c41bb4dff6895d0e003eaf42146 /docs
parent21264e3ed45fda41fb608ea4f69948aa9f9430c1 (diff)
parent67486e9eec17b0209aebc9b2f2220fa704f23825 (diff)
downloadpyramid-319a0c295f2e10cf19cc7e648cd0bd52ff603f50.tar.gz
pyramid-319a0c295f2e10cf19cc7e648cd0bd52ff603f50.tar.bz2
pyramid-319a0c295f2e10cf19cc7e648cd0bd52ff603f50.zip
Merge pull request #886 from tshepang/DRY
remove redundant text
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/firstapp.rst6
-rw-r--r--docs/narr/project.rst2
-rw-r--r--docs/narr/urldispatch.rst4
3 files changed, 4 insertions, 8 deletions
diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst
index d61d95685..ab6a46c2f 100644
--- a/docs/narr/firstapp.rst
+++ b/docs/narr/firstapp.rst
@@ -175,9 +175,9 @@ First line above calls the :meth:`pyramid.config.Configurator.add_route`
method, which registers a :term:`route` to match any URL path that begins
with ``/hello/`` followed by a string.
-The second line, ``config.add_view(hello_world, route_name='hello')``,
-registers the ``hello_world`` function as a :term:`view callable` and makes
-sure that it will be called when the ``hello`` route is matched.
+The second line registers the ``hello_world`` function as a
+:term:`view callable` and makes sure that it will be called when the
+``hello`` route is matched.
.. index::
single: make_wsgi_app
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 5a8ea0ecf..5ddf89ec4 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -703,7 +703,7 @@ work properly.
The ``setup.py`` file is a :term:`setuptools` setup file. It is meant to be
run directly from the command line to perform a variety of functions, such as
-testing your application, packaging, and distributing your application.
+testing, packaging, and distributing your application.
.. note::
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index 749a2d49a..2a7adea81 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -76,8 +76,6 @@ this is a portion of your project's ``__init__.py``:
.. code-block:: python
- # in your project's __init__.py (mypackage.__init__)
-
config.add_route('myroute', '/prefix/{one}/{two}')
config.scan('mypackage')
@@ -92,8 +90,6 @@ that references ``myroute`` as a ``route_name`` parameter:
.. code-block:: python
- # in your project's views.py module (mypackage.views)
-
from pyramid.view import view_config
from pyramid.response import Response