Merge branch 'osmaker-master'

8 files changed, 11 insertions, 11 deletions

diff --git a/docs/glossary.rst b/docs/glossary.rst
index f1a50a0af..0aef7672b 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -182,10 +182,10 @@ Glossary
      :ref:`urldispatch_chapter` for more information.
 
    context
-     An resource in the resource tree that is found during :term:`traversal`
+     A resource in the resource tree that is found during :term:`traversal`
      or :term:`URL dispatch` based on URL data; if it's found via traversal,
      it's usually a :term:`resource` object that is part of a resource tree;
-     if it's found via :term:`URL dispatch`, it's a object manufactured on
+     if it's found via :term:`URL dispatch`, it's an object manufactured on
      behalf of the route's "factory".  A context resource becomes the subject
      of a :term:`view`, and often has security information attached to
      it.  See the :ref:`traversal_chapter` chapter and the
@@ -488,7 +488,7 @@ Glossary
      available as its ``__parent__`` attribute.
 
    root factory
-     The "root factory" of an :app:`Pyramid` application is called
+     The "root factory" of a :app:`Pyramid` application is called
      on every request sent to the application.  The root factory
      returns the traversal root of an application.  It is
      conventionally named ``get_root``.  An application may supply a
diff --git a/docs/narr/assets.rst b/docs/narr/assets.rst
index a9dc1f129..976e7b0af 100644
--- a/docs/narr/assets.rst
+++ b/docs/narr/assets.rst
@@ -185,7 +185,7 @@ discussed in more detail later in this chapter.
 
 .. note::
 
-   The :ref:`static_directive` ZCML directive offers an declarative
+   The :ref:`static_directive` ZCML directive offers a declarative
    equivalent to :meth:`~pyramid.config.Configurator.add_static_view`.  Use of
    the :ref:`static_directive` ZCML directive is completely equivalent to
    using imperative configuration for the same purpose.
diff --git a/docs/narr/renderers.rst b/docs/narr/renderers.rst
index d8c58a66a..8ec2e3fb8 100644
--- a/docs/narr/renderers.rst
+++ b/docs/narr/renderers.rst
@@ -456,14 +456,14 @@ There are essentially two different kinds of renderer factories:
   such as a template.
 
 - A renderer factory which expects to accept a token that does not represent
-  a filesystem path or a asset specification in the ``name``
+  a filesystem path or an asset specification in the ``name``
   attribute of the ``info`` object fed to its constructor.  These renderer
   factories are registered with a ``name`` value that does not begin with a
   dot.  These renderer factories are typically object serializers.
 
 .. sidebar:: Asset Specifications
 
-   A asset specification is a colon-delimited identifier for a
+   An asset specification is a colon-delimited identifier for an
    :term:`asset`.  The colon separates a Python :term:`package`
    name from a package subpath.  For example, the asset
    specification ``my.package:static/baz.css`` identifies the file named
diff --git a/docs/narr/resources.rst b/docs/narr/resources.rst
index 4fc7e037e..90dd34bfe 100644
--- a/docs/narr/resources.rst
+++ b/docs/narr/resources.rst
@@ -231,7 +231,7 @@ The simplest call to :func:`~pyramid.url.resource_url` looks like this:
    url = resource_url(resource, request)
 
 The ``request`` passed to ``resource_url`` in the above example is an
-instance of an :app:`Pyramid` :term:`request` object.
+instance of a :app:`Pyramid` :term:`request` object.
 
 If the resource referred to as ``resource`` in the above example was the root
 resource, and the host that was used to contact the server was
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index ad0550e69..626d2db2c 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -439,7 +439,7 @@ neither predicates nor view configuration information.
   matched which contains a ``*traverse`` remainder marker in its pattern (see
   :ref:`using_traverse_in_a_route_pattern`).  The ``traverse`` argument
   allows you to associate route patterns with an arbitrary traversal path
-  without using a a ``*traverse`` remainder marker; instead you can use other
+  without using a ``*traverse`` remainder marker; instead you can use other
   match information.
 
   Note that the ``traverse`` argument is ignored when attached to a route
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 565bd0e96..17dcfc48f 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -60,7 +60,7 @@ function:
 
 #. *Lines 13-14*.  Register a :term:`route configuration` via the
    :meth:`pyramid.config.Configurator.add_route` method that will be
-   used when the URL is ``/``.  Since this route has an ``pattern`` equalling
+   used when the URL is ``/``.  Since this route has a ``pattern`` equalling
    ``/`` it is the "default" route. The argument named ``view`` with the
    value ``tutorial.views.my_view`` is the dotted name to a *function* we
    write (generated by the ``pyramid_routesalchemy`` template) that is given
diff --git a/pyramid/paster_templates/alchemy/+package+/models.py b/pyramid/paster_templates/alchemy/+package+/models.py
index 9942f2bb0..82d6bec0c 100755
--- a/pyramid/paster_templates/alchemy/+package+/models.py
+++ b/pyramid/paster_templates/alchemy/+package+/models.py
@@ -68,7 +68,7 @@ def default_get_root(request):
 
 def populate():
     session = DBSession()
-    model = MyModel(name=u'test name',value=55)
+    model = MyModel(name=u'test name', value=55)
     session.add(model)
     session.flush()
     transaction.commit()
diff --git a/pyramid/paster_templates/routesalchemy/+package+/models.py b/pyramid/paster_templates/routesalchemy/+package+/models.py
index e8755ba78..a036e8c91 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/models.py
+++ b/pyramid/paster_templates/routesalchemy/+package+/models.py
@@ -27,7 +27,7 @@ class MyModel(Base):
 
 def populate():
     session = DBSession()
-    model = MyModel(name=u'root',value=55)
+    model = MyModel(name=u'root', value=55)
     session.add(model)
     session.flush()
     transaction.commit()