Skip to content

Commit

Permalink
eliminate other repeated words
Browse files Browse the repository at this point in the history
  • Loading branch information
tshepang committed Jan 2, 2013
1 parent 08c2217 commit 043ccdd
Show file tree
Hide file tree
Showing 24 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions BFG_HISTORY.txt
Expand Up @@ -387,7 +387,7 @@ Features
Bug Fixes
---------

- The route pattern registered internally for a a local "static view"
- The route pattern registered internally for a local "static view"
(either via the ``static`` ZCML directive or via the
``add_static_view`` method of the configurator) was incorrect. It
was regsistered for e.g. ``static*traverse``, while it should have
Expand Down Expand Up @@ -688,7 +688,7 @@ Features
A similar combining of routing and traversal is available when a
route is matched which contains a ``*traverse`` remainder marker in
its path. The ``traverse`` argument allows you to associate route
patterns with an arbitrary traversal path without using a a
patterns with an arbitrary traversal path without using a
``*traverse`` remainder marker; instead you can use other match
information.

Expand Down
2 changes: 1 addition & 1 deletion CHANGES.txt
Expand Up @@ -332,7 +332,7 @@ Bug Fixes

- When registering a view configuration that named a Chameleon ZPT renderer
with a macro name in it (e.g. ``renderer='some/template#somemacro.pt``) as
well as a view configuration without a macro name it it that pointed to the
well as a view configuration without a macro name in it that pointed to the
same template (e.g. ``renderer='some/template.pt'``), internal caching could
confuse the two, and your code might have rendered one instead of the
other.
Expand Down
2 changes: 1 addition & 1 deletion docs/api/registry.rst
Expand Up @@ -33,7 +33,7 @@

The default implementation of the interface
:class:`pyramid.interfaces.IIntrospectable` used by framework exenders.
An instance of this class is is created when
An instance of this class is created when
:attr:`pyramid.config.Configurator.introspectable` is called.

This class is new as of :app:`Pyramid` 1.3.
Expand Down
6 changes: 3 additions & 3 deletions docs/glossary.rst
Expand Up @@ -486,8 +486,8 @@ Glossary
is in use.

physical root
The object returned by the application :term:`root factory`. Unlike the
the :term:`virtual root` of a request, it is not impacted by
The object returned by the application :term:`root factory`.
Unlike the :term:`virtual root` of a request, it is not impacted by
:ref:`vhosting_chapter`: it will always be the actual object returned by
the root factory, never a subobject.

Expand Down Expand Up @@ -840,7 +840,7 @@ Glossary
information.

Mako
`Mako <http://www.makotemplates.org/>`_ is a template language language
`Mako <http://www.makotemplates.org/>`_ is a template language
which refines the familiar ideas of componentized layout and inheritance
using Python with Python scoping and calling semantics.

Expand Down
2 changes: 1 addition & 1 deletion docs/narr/extconfig.rst
Expand Up @@ -289,7 +289,7 @@ The ``title`` is a human-consumable string that can be used by introspection
system frontends to show a friendly summary of this introspectable.

The ``type_name`` is a value that can be used to subtype this introspectable
within its category for for sorting and presentation purposes. It can be any
within its category for sorting and presentation purposes. It can be any
value.

An introspectable is also dictionary-like. It can contain any set of
Expand Down
2 changes: 1 addition & 1 deletion docs/narr/hooks.rst
Expand Up @@ -1082,7 +1082,7 @@ entirely by the relative ordering of calls to
:meth:`pyramid.config.Configurator.add_tween`. However, the caller of
add_tween can provide an optional hint that can influence the implicit tween
chain ordering by supplying ``under`` or ``over`` (or both) arguments to
:meth:`~pyramid.config.Configurator.add_tween`. These hints are only used
:meth:`~pyramid.config.Configurator.add_tween`. These hints are only
used when an explicit tween ordering is not used. See
:ref:`explicit_tween_ordering` for a description of how to set an explicit
tween ordering.
Expand Down
2 changes: 1 addition & 1 deletion docs/narr/i18n.rst
Expand Up @@ -301,7 +301,7 @@ You need to add a few boilerplate lines to your application's ``setup.py``
file in order to properly generate :term:`gettext` files from your
application.

.. note:: See :ref:`project_narr` to learn about about the
.. note:: See :ref:`project_narr` to learn about the
composition of an application's ``setup.py`` file.

In particular, add the ``Babel`` and ``lingua`` distributions to the
Expand Down
2 changes: 1 addition & 1 deletion docs/narr/introspector.rst
Expand Up @@ -496,7 +496,7 @@ introspectables in categories not described here.
``translation directories``

Each introspectable in the ``asset overrides`` category represents an
individual element in a ``specs`` argument passed to to
individual element in a ``specs`` argument passed to
:meth:`pyramid.config.Configurator.add_translation_dirs`; each will have
the following data.

Expand Down
2 changes: 1 addition & 1 deletion docs/narr/renderers.rst
Expand Up @@ -264,7 +264,7 @@ will be the active request object at render time.
# [{"x": 1}, {"x": 2}]
If you aren't the author of the objects being serialized, it won't be
possible (or at least not reasonable) to add a custom ``__json__`` method to
possible (or at least not reasonable) to add a custom ``__json__`` method
to their classes in order to influence serialization. If the object passed
to the renderer is not a serializable type, and has no ``__json__`` method,
usually a :exc:`TypeError` will be raised during serialization. You can
Expand Down
2 changes: 1 addition & 1 deletion docs/narr/subrequest.rst
Expand Up @@ -142,7 +142,7 @@ generated. We can change this behavior; how to do so is described below in
our discussion of the ``use_tweens`` argument.

The :meth:`pyramid.request.Request.invoke_subrequest` API accepts two
arguments: a positional argument ``request`` that must be provided, and and
arguments: a positional argument ``request`` that must be provided, and
``use_tweens`` keyword argument that is optional; it defaults to ``False``.

The ``request`` object passed to the API must be an object that implements
Expand Down
2 changes: 1 addition & 1 deletion docs/narr/templates.rst
Expand Up @@ -109,7 +109,7 @@ supply the renderer with more correct system values (see
to compose proper system values is present in the request. If your
template relies on the name ``request`` or ``context``, or if you've
configured special :term:`renderer globals`, make sure to pass
``request`` as a keyword argument in every call to to a
``request`` as a keyword argument in every call to a
``pyramid.renderers.render_*`` function.

Every view must return a :term:`response` object, except for views
Expand Down
4 changes: 2 additions & 2 deletions docs/narr/urldispatch.rst
Expand Up @@ -87,7 +87,7 @@ setup code. However, the above :term:`scan` execution
decoration`, including any objects decorated with the
:class:`pyramid.view.view_config` decorator in the ``mypackage`` Python
package. For example, if you have a ``views.py`` in your package, a scan will
pick up any of its configuration decorators, so we can add one there that
pick up any of its configuration decorators, so we can add one there
that references ``myroute`` as a ``route_name`` parameter:

.. code-block:: python
Expand Down Expand Up @@ -860,7 +860,7 @@ exactly the same job:
request into a ``GET``, losing any ``POST`` data in the original
request.

See :ref:`view_module` and :ref:`changing_the_notfound_view` for for a more
See :ref:`view_module` and :ref:`changing_the_notfound_view` for a more
general description of how to configure a view and/or a not found view.

.. index::
Expand Down
2 changes: 1 addition & 1 deletion docs/narr/views.rst
Expand Up @@ -180,7 +180,7 @@ All classes documented in the :mod:`pyramid.httpexceptions` module documented
as inheriting from the :class:`pyramid.httpexceptions.HTTPException` are
:term:`http exception` objects. Instances of an HTTP exception object may
either be *returned* or *raised* from within view code. In either case
(return or raise) the instance will be used as as the view's response.
(return or raise) the instance will be used as the view's response.

For example, the :class:`pyramid.httpexceptions.HTTPUnauthorized` exception
can be raised. This will cause a response to be generated with a ``401
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/wiki/basiclayout.rst
Expand Up @@ -38,7 +38,7 @@ point happens to be the ``main`` function within the file named
factory is named ``root_factory``.

#. *Line 15*. Register a 'static view' which answers requests which start
with with URL path ``/static`` using the
with URL path ``/static`` using the
:meth:`pyramid.config.Configurator.add_static_view method`. This
statement registers a view that will serve up static assets, such as CSS
and image files, for us, in this case, at
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/wiki/definingmodels.rst
Expand Up @@ -63,7 +63,7 @@ contain the :term:`ReStructuredText` body representing the wiki page content.
Note that ``Page`` objects don't have an initial ``__name__`` or
``__parent__`` attribute. All objects in a traversal graph must have a
``__name__`` and a ``__parent__`` attribute. We don't specify these here
because both ``__name__`` and ``__parent__`` will be set by by a :term:`view`
because both ``__name__`` and ``__parent__`` will be set by a :term:`view`
function when a Page is added to our Wiki mapping.

As a last step, we want to change the ``appmaker`` function in our
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/wiki/definingviews.rst
Expand Up @@ -115,7 +115,7 @@ The curried function named ``check`` is used as the first argument to
each WikiWord match found in the content. If the wiki (our page's
``__parent__``) already contains a page with the matched WikiWord name, the
``check`` function generates a view link to be used as the substitution value
and returns it. If the wiki does not already contain a page with with the
and returns it. If the wiki does not already contain a page with the
matched WikiWord name, the function generates an "add" link as the
substitution value and returns it.

Expand Down
4 changes: 2 additions & 2 deletions docs/tutorials/wiki2/definingviews.rst
Expand Up @@ -144,7 +144,7 @@ The ``check()`` function is used as the first argument to
each WikiWord match found in the content. If the wiki already contains a
page with the matched WikiWord name, ``check()`` generates a view
link to be used as the substitution value and returns it. If the wiki does
not already contain a page with with the matched WikiWord name, ``check()``
not already contain a page with the matched WikiWord name, ``check()``
generates an "add" link as the substitution value and returns it.

As a result, the ``content`` variable is now a fully formed bit of HTML
Expand Down Expand Up @@ -358,7 +358,7 @@ each of the following URLs, check that the result is as expected:
of the FrontPage page object.

- ``http://localhost:6543/FrontPage`` in a browser invokes
the ``view_page`` view of the front page page object.
the ``view_page`` view of the front page object.

- ``http://localhost:6543/FrontPage/edit_page`` in a browser
invokes the edit view for the front page object.
Expand Down
2 changes: 1 addition & 1 deletion pyramid/config/__init__.py
Expand Up @@ -244,7 +244,7 @@ class Configurator(
prepended to their pattern. This parameter is new in Pyramid 1.2.
If ``introspection`` is passed, it must be a boolean value. If it's
``True``, introspection values during actions will be kept for for use
``True``, introspection values during actions will be kept for use
for tools like the debug toolbar. If it's ``False``, introspection
values provided by registrations will be ignored. By default, it is
``True``. This parameter is new as of Pyramid 1.3.
Expand Down
2 changes: 1 addition & 1 deletion pyramid/config/routes.py
Expand Up @@ -109,7 +109,7 @@ def add_route(self,
remainder marker in its pattern (see
:ref:`using_traverse_in_a_route_pattern`). The ``traverse``
argument to add_route allows you to associate route patterns
with an arbitrary traversal path without using a a
with an arbitrary traversal path without using a
``*traverse`` remainder marker; instead you can use other
match information.
Expand Down
4 changes: 2 additions & 2 deletions pyramid/interfaces.py
Expand Up @@ -974,7 +974,7 @@ def add(intr):
indirectly by :meth:`pyramid.interfaces.IIntrospector.register`"""

def relate(*pairs):
""" Given any number of of ``(category_name, discriminator)`` pairs
""" Given any number of ``(category_name, discriminator)`` pairs
passed as positional arguments, relate the associated introspectables
to each other. The introspectable related to each pair must have
already been added via ``.add`` or ``.add_intr``; a :exc:`KeyError`
Expand All @@ -986,7 +986,7 @@ def relate(*pairs):
"""

def unrelate(*pairs):
""" Given any number of of ``(category_name, discriminator)`` pairs
""" Given any number of ``(category_name, discriminator)`` pairs
passed as positional arguments, unrelate the associated introspectables
from each other. The introspectable related to each pair must have
already been added via ``.add`` or ``.add_intr``; a :exc:`KeyError`
Expand Down
2 changes: 1 addition & 1 deletion pyramid/scripts/pserve.py
Expand Up @@ -753,7 +753,7 @@ class Monitor(object): # pragma: no cover
this).
Use the ``watch_file(filename)`` function to cause a reload/restart for
other other non-Python files (e.g., configuration files). If you have
other non-Python files (e.g., configuration files). If you have
a dynamic set of files that grows over time you can use something like::
def watch_config_files():
Expand Down
2 changes: 1 addition & 1 deletion pyramid/traversal.py
Expand Up @@ -414,7 +414,7 @@ def virtual_root(resource, request):
'virtual root path': the :func:`pyramid.traversal.find_resource`
API will be used to find the virtual root resource using this path;
if the resource is found, it will be returned. If the
``HTTP_X_VHM_ROOT`` key is is not present in the WSGI environment,
``HTTP_X_VHM_ROOT`` key is not present in the WSGI environment,
the physical :term:`root` of the resource tree will be returned instead.
Virtual roots are not useful at all in applications that use
Expand Down
2 changes: 1 addition & 1 deletion pyramid/url.py
Expand Up @@ -194,7 +194,7 @@ def route_url(self, route_name, *elements, **kw):
names are ignored.
If the route object which matches the ``route_name`` argument has
a :term:`pregenerator`, the ``*elements`` and ``**kw`` arguments
a :term:`pregenerator`, the ``*elements`` and ``**kw``
arguments passed to this function might be augmented or changed.
"""
try:
Expand Down
2 changes: 1 addition & 1 deletion pyramid/util.py
Expand Up @@ -71,7 +71,7 @@ def _set_properties(self, properties):
``attrs`` is a sequence of 2-tuples *or* a data structure with
an ``.items()`` method which returns a sequence of 2-tuples
(presumably a dictionary). It will be used used to add several
(presumably a dictionary). It will be used to add several
properties to the instance in a manner that is more efficient
than simply calling ``set_property`` repeatedly.
"""
Expand Down

0 comments on commit 043ccdd

Please sign in to comment.