summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS.txt2
-rw-r--r--docs/narr/logging.rst2
-rw-r--r--pyramid/config/views.py4
3 files changed, 5 insertions, 3 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 566e91195..3fe2c2d58 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -294,3 +294,5 @@ Contributors
- Martin Frlin, 2016/12/7
- Kirill Kuzminykh, 2017/03/01
+
+- Jeremy(Ching-Rui) Chen, 2017/04/19
diff --git a/docs/narr/logging.rst b/docs/narr/logging.rst
index 87682158b..9cc5b4ed8 100644
--- a/docs/narr/logging.rst
+++ b/docs/narr/logging.rst
@@ -16,7 +16,7 @@ to send log messages to loggers that you've configured.
cookiecutter which does not create these files, the configuration information in
this chapter may not be applicable.
-.. index:
+.. index::
pair: settings; logging
pair: .ini; logging
pair: logging; configuration
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index 65c9da585..2433ccfef 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -972,7 +972,7 @@ class ViewsConfiguratorMixin(object):
def register_view(classifier, request_iface, derived_view):
# A multiviews is a set of views which are registered for
# exactly the same context type/request type/name triad. Each
- # consituent view in a multiview differs only by the
+ # constituent view in a multiview differs only by the
# predicates which it possesses.
# To find a previously registered view for a context
@@ -1032,7 +1032,7 @@ class ViewsConfiguratorMixin(object):
# XXX we could try to be more efficient here and register
# a non-secured view for a multiview if none of the
- # multiview's consituent views have a permission
+ # multiview's constituent views have a permission
# associated with them, but this code is getting pretty
# rough already
if is_multiview: