Merge pull request #1069 from tisdall/master

another dose of spelling corrections...

7 files changed, 9 insertions, 9 deletions

diff --git a/HISTORY.txt b/HISTORY.txt
index 67de56998..bf054f9ed 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -2150,7 +2150,7 @@ Features
 
 - Add ``wild_domain`` argument to AuthTktAuthenticationPolicy, which defaults
   to ``True``.  If it is set to ``False``, the feature of the policy which
-  sets a cookie with a wilcard domain will be turned off.
+  sets a cookie with a wildcard domain will be turned off.
 
 - Add a ``MANIFEST.in`` file to each paster template. See
   https://github.com/Pylons/pyramid/issues#issue/95
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index bb336784f..2964686d3 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -984,7 +984,7 @@ requires no additional coding or configuration.
 
 The default locale negotiator implementation named
 :class:`~pyramid.i18n.default_locale_negotiator` uses the following
-set of steps to dermine the locale name.
+set of steps to determine the locale name.
 
 - First, the negotiator looks for the ``_LOCALE_`` attribute of the
   request object (possibly set directly by view code or by a listener
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index fa2646134..032f4be6b 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -859,7 +859,7 @@ It's our goal that no Pyramid question go unanswered.  Whether you ask a
 question on IRC, on the Pylons-discuss maillist, or on StackOverflow, you're
 likely to get a reasonably prompt response.  We don't tolerate "support
 trolls" or other people who seem to get their rocks off by berating fellow
-users in our various offical support channels.  We try to keep it well-lit
+users in our various official support channels.  We try to keep it well-lit
 and new-user-friendly.
 
 Example: Visit irc\://freenode.net#pyramid (the ``#pyramid`` channel on
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index 18cb3e4db..310c160c0 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -865,7 +865,7 @@ Debugging Route Matching
 ------------------------
 
 It's useful to be able to take a peek under the hood when requests that enter
-your application arent matching your routes as you expect them to.  To debug
+your application aren't matching your routes as you expect them to.  To debug
 route matching, use the ``PYRAMID_DEBUG_ROUTEMATCH`` environment variable or the
 ``pyramid.debug_routematch`` configuration file setting (set either to ``true``).
 Details of the route matching decision for a particular request to the
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index fd3229339..6a064c209 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -831,7 +831,7 @@ of this:
        config.add_view(
            RESTView, route_name='rest', attr='delete', request_method='DELETE')
 
-To reduce the amount of repetion in the ``config.add_view`` statements, we
+To reduce the amount of repetition in the ``config.add_view`` statements, we
 can move the ``route_name='rest'`` argument to a ``@view_default`` class
 decorator on the RESTView class:
 
diff --git a/pyramid/config/adapters.py b/pyramid/config/adapters.py
index fe8e973b1..5573b6748 100644
--- a/pyramid/config/adapters.py
+++ b/pyramid/config/adapters.py
@@ -216,7 +216,7 @@ class AdaptersConfiguratorMixin(object):
            config.add_traverser(MyCustomTraverser)
 
         This would cause the Pyramid superdefault traverser to never be used;
-        intead all traversal would be done using your ``MyCustomTraverser``
+        instead all traversal would be done using your ``MyCustomTraverser``
         class, no matter which object was returned by the :term:`root
         factory` of this application.  Note that we passed no arguments to
         the ``iface`` keyword parameter.  The default value of ``iface``,
@@ -228,7 +228,7 @@ class AdaptersConfiguratorMixin(object):
         time.  The traverser used can depend on the result of the :term:`root
         factory`.  For instance, if your root factory returns more than one
         type of object conditionally, you could claim that an alternate
-        traverser adapter should be used agsinst one particular class or
+        traverser adapter should be used against one particular class or
         interface returned by that root factory.  When the root factory
         returned an object that implemented that class or interface, a custom
         traverser would be used.  Otherwise, the default traverser would be
diff --git a/pyramid/renderers.py b/pyramid/renderers.py
index 64951a6ba..602655be8 100644
--- a/pyramid/renderers.py
+++ b/pyramid/renderers.py
@@ -114,7 +114,7 @@ def render_to_response(renderer_name, value, request=None, package=None):
     top-level system names, such as ``request``, ``context``,
     ``renderer_name``, and ``view``.  See :ref:`renderer_system_values` for
     the full list.  If :term:`renderer globals` have been specified, these
-    will also be used to agument the value.
+    will also be used to argument the value.
 
     Supply a ``request`` parameter in order to provide the renderer
     with the most correct 'system' values (``request`` and ``context``
@@ -200,7 +200,7 @@ class JSON(object):
     The default serializer uses ``json.JSONEncoder``. A different
     serializer can be specified via the ``serializer`` argument.
     Custom serializers should accept the object, a callback
-    ``default``, and any extra ``kw`` keyword argments passed during
+    ``default``, and any extra ``kw`` keyword arguments passed during
     renderer construction.
 
     .. versionadded:: 1.4