summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt2
-rw-r--r--docs/narr/introduction.rst5
-rw-r--r--docs/narr/project.rst12
-rw-r--r--pyramid/config/routes.py1
4 files changed, 10 insertions, 10 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 051328a02..6e73de823 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,6 +21,8 @@ Bug Fixes
allowing traversal to continue.
See https://github.com/Pylons/pyramid/issues/1104
+- Remove unused ``renderer`` argument from ``Configurator.add_route``.
+
Documentation
-------------
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index ece720a97..bb2d85e94 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -180,10 +180,9 @@ Fully Interactive Development
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
When developing a Pyramid application, several interactive features are
-available. Pyramid can automatically utilize changed templates when rendering
+available. Pyramid can automatically utilize changed templates when rendering
pages and automatically restart the application to incorporate changed python
-code. Plain old ``printf()`` calls used for debugging can display to a
-console.
+code. Plain old ``print()`` calls used for debugging can display to a console.
Pyramid's debug toolbar comes activated when you use a Pyramid scaffold to
render a project. This toolbar overlays your application in the browser, and
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 9a15649d7..d7292d187 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -890,12 +890,12 @@ returns the HTML in a :term:`response`.
.. note:: Dictionaries provide values to :term:`template`\s.
.. note:: When the application is run with the scaffold's :ref:`default
- development.ini <MyProject_ini>` configuration :ref:`logging is setup
- <MyProject_ini_logging>` to aid debugging. Should an exception be raised,
- uncaught tracebacks are displayed, after the startup messages, on :ref:`the
- console running the server <running_the_project_application>`.
- Conveniently, ``print()``\s inserted into the application for debugging
- also send output to this console.
+ development.ini <MyProject_ini>` configuration :ref:`logging is set up
+ <MyProject_ini_logging>` to aid debugging. If an exception is raised,
+ uncaught tracebacks are displayed after the startup messages on :ref:`the
+ console running the server <running_the_project_application>`. Also
+ ``print()`` statements may be inserted into the application for debugging
+ to send output to this console.
.. note:: ``development.ini`` has a setting that controls how templates are
reloaded, ``pyramid.reload_templates``.
diff --git a/pyramid/config/routes.py b/pyramid/config/routes.py
index 9dca9e51e..4de4663a8 100644
--- a/pyramid/config/routes.py
+++ b/pyramid/config/routes.py
@@ -36,7 +36,6 @@ class RoutesConfiguratorMixin(object):
request_param=None,
traverse=None,
custom_predicates=(),
- renderer=None,
use_global_views=False,
path=None,
pregenerator=None,