summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReed OBrien <reed@koansys.com>2010-02-22 17:52:41 +0000
committerReed OBrien <reed@koansys.com>2010-02-22 17:52:41 +0000
commit27d735c93ca849e14a086dfa00902f20deeb3248 (patch)
tree1edd8bed2db2091b5fa50f2afe2764a025f599f3
parent998cd478d3eae88c9630e411e91f03fc20d41a96 (diff)
downloadpyramid-27d735c93ca849e14a086dfa00902f20deeb3248.tar.gz
pyramid-27d735c93ca849e14a086dfa00902f20deeb3248.tar.bz2
pyramid-27d735c93ca849e14a086dfa00902f20deeb3248.zip
remove duplicate conjunctions
-rw-r--r--docs/tutorials/modwsgi/index.rst2
-rw-r--r--repoze/bfg/view.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials/modwsgi/index.rst b/docs/tutorials/modwsgi/index.rst
index d4250db2f..ed9a7a90b 100644
--- a/docs/tutorials/modwsgi/index.rst
+++ b/docs/tutorials/modwsgi/index.rst
@@ -17,7 +17,7 @@ commands and files.
.. note:: Unfortunately these instructions almost certainly won't work
for deploying a :mod:`repoze.bfg` application on a Windows system
using ``mod_wsgi``. If you have experience with :mod:`repoze.bfg`
- and and ``mod_wsgi`` on Windows systems, please help us document
+ and ``mod_wsgi`` on Windows systems, please help us document
this experience by submitting documentation to the `mailing list
<http://lists.repoze.org/listinfo/repoze-dev>`_.
diff --git a/repoze/bfg/view.py b/repoze/bfg/view.py
index ac0977378..8c1430654 100644
--- a/repoze/bfg/view.py
+++ b/repoze/bfg/view.py
@@ -123,7 +123,7 @@ def render_view_to_iterable(context, request, name='', secure=True):
def render_view(context, request, name='', secure=True):
""" Call the :term:`view callable` configured with a :term:`view
configuration` that matches the :term:`view name` ``name``
- registered against the specified ``context`` and ``request`` and
+ registered against the specified ``context`` and ``request``
and unwind the view response's ``app_iter`` (see
:ref:`the_response`) into a single string. This function will
return ``None`` if a corresponding :term:`view callable` cannot be