summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTshepang Lekhonkhobe <tshepang@gmail.com>2013-01-01 23:56:02 +0200
committerTshepang Lekhonkhobe <tshepang@gmail.com>2013-01-01 23:56:02 +0200
commit08c2217e7f831379016e1ddee0b5d51eeca53878 (patch)
treef5c69e3e1909046bc71ac3d5b78756796940797c
parent78bacaa69f63fe2bc6980d7d40fc0523d5af9199 (diff)
downloadpyramid-08c2217e7f831379016e1ddee0b5d51eeca53878.tar.gz
pyramid-08c2217e7f831379016e1ddee0b5d51eeca53878.tar.bz2
pyramid-08c2217e7f831379016e1ddee0b5d51eeca53878.zip
eliminate repeated "the" words
-rw-r--r--BFG_HISTORY.txt6
-rw-r--r--CHANGES.txt2
-rw-r--r--docs/api/request.rst2
-rw-r--r--docs/designdefense.rst2
-rw-r--r--docs/narr/assets.rst2
-rw-r--r--docs/narr/commandline.rst2
-rw-r--r--docs/narr/hybrid.rst2
-rw-r--r--docs/narr/renderers.rst2
-rw-r--r--docs/tutorials/wiki/basiclayout.rst2
-rw-r--r--pyramid/httpexceptions.py4
-rw-r--r--pyramid/path.py2
11 files changed, 14 insertions, 14 deletions
diff --git a/BFG_HISTORY.txt b/BFG_HISTORY.txt
index 9096d6464..6de3f3776 100644
--- a/BFG_HISTORY.txt
+++ b/BFG_HISTORY.txt
@@ -1381,7 +1381,7 @@ Internal
lookup, because the registration will always be made with a specific
request interface, but registration may not be made with a specific
context interface. In general, when creating multiadapters, you
- want to order the requires interfaces so that the the elements which
+ want to order the requires interfaces so that the elements which
are more likely to be registered using specific interfaces are
ordered before those which are less likely.
@@ -1860,7 +1860,7 @@ Backwards Incompatibilities
Bug Fixes
---------
-- The the long description of this package (as shown on PyPI) was not
+- The long description of this package (as shown on PyPI) was not
valid reStructuredText, and so was not renderable.
- Trying to use an HTTP method name string such as ``GET`` as a
@@ -2920,7 +2920,7 @@ Deprecations
- The import of ``repoze.bfg.security.Unauthorized`` is deprecated in
favor of ``repoze.bfg.exceptions.Forbidden``. The old location
still functions but emits a deprecation warning. The rename from
- ``Unauthorized`` to ``Forbidden`` brings parity to the the name of
+ ``Unauthorized`` to ``Forbidden`` brings parity to the name of
the exception and the system view it invokes when raised.
Backwards Incompatibilities
diff --git a/CHANGES.txt b/CHANGES.txt
index cfa49fb1a..1f6ae742c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -536,7 +536,7 @@ Features
- An ``add_permission`` directive method was added to the Configurator. This
directive registers a free-standing permission introspectable into the
Pyramid introspection system. Frameworks built atop Pyramid can thus use
- the the ``permissions`` introspectable category data to build a
+ the ``permissions`` introspectable category data to build a
comprehensive list of permissions supported by a running system. Before
this method was added, permissions were already registered in this
introspectable category as a side effect of naming them in an ``add_view``
diff --git a/docs/api/request.rst b/docs/api/request.rst
index 3a1439874..e4034c635 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -251,7 +251,7 @@
Assigning to one is still supported but will cause a deprecation
warning to be emitted, and eventually the feature will be removed. For
new code, instead of assigning ``response_*`` attributes to the
- request, use API of the the :attr:`pyramid.request.Request.response`
+ request, use API of the :attr:`pyramid.request.Request.response`
object (exposed to view code as ``request.response``) to influence
rendered response behavior.
diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index b468ddac6..96e1001e6 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -873,7 +873,7 @@ means:
#) When I use the security proxy machinery, I can have a view that
conditionally displays certain HTML elements (like form fields) or
- prevents certain attributes from being modified depending on the the
+ prevents certain attributes from being modified depending on the
permissions that the accessing user possesses with respect to a context
object.
diff --git a/docs/narr/assets.rst b/docs/narr/assets.rst
index e8e915297..7b620548d 100644
--- a/docs/narr/assets.rst
+++ b/docs/narr/assets.rst
@@ -252,7 +252,7 @@ static assets that live *outside* the :app:`Pyramid` application. This will
happen when the :meth:`~pyramid.config.Configurator.add_static_view` API
associated with the path fed to :meth:`~pyramid.request.Request.static_url`
is a *URL* instead of a view name. For example, the ``name`` argument may be
-``http://example.com`` while the the ``path`` given may be
+``http://example.com`` while the ``path`` given may be
``mypackage:images``:
.. code-block:: python
diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index 3bdf8c5cd..8d6b9d984 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -758,7 +758,7 @@ we'll pretend you have a distribution with a package in it named
This script uses the Python ``optparse`` module to allow us to make sense out
of extra arguments passed to the script. It uses the
-:func:`pyramid.paster.bootstrap` function to get information about the the
+:func:`pyramid.paster.bootstrap` function to get information about the
application defined by a config file, and prints the deployment settings
defined in that config file.
diff --git a/docs/narr/hybrid.rst b/docs/narr/hybrid.rst
index ab1bf20bb..1773a6b8c 100644
--- a/docs/narr/hybrid.rst
+++ b/docs/narr/hybrid.rst
@@ -477,7 +477,7 @@ Registering a Default View for a Route That Has a ``view`` Attribute
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. warning:: As of :app:`Pyramid` 1.1 this section is slated to be removed in
- a later documentation release because the the ability to add views
+ a later documentation release because the ability to add views
directly to the :term:`route configuration` by passing a ``view`` argument
to ``add_route`` has been deprecated.
diff --git a/docs/narr/renderers.rst b/docs/narr/renderers.rst
index 1158d2225..9017156a6 100644
--- a/docs/narr/renderers.rst
+++ b/docs/narr/renderers.rst
@@ -366,7 +366,7 @@ For example (Javascript):
'&callback=?';
jqhxr = $.getJSON(api_url);
-The string ``callback=?`` above in the the ``url`` param to the JQuery
+The string ``callback=?`` above in the ``url`` param to the JQuery
``getAjax`` function indicates to jQuery that the query should be made as
a JSONP request; the ``callback`` parameter will be automatically filled
in for you and used.
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index 12cf86a91..a7d8f1439 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -44,7 +44,7 @@ point happens to be the ``main`` function within the file named
and image files, for us, in this case, at
``http://localhost:6543/static/`` and below. The first argument is the
"name" ``static``, which indicates that the URL path prefix of the view
- will be ``/static``. the The second argument of this tag is the "path",
+ will be ``/static``. The second argument of this tag is the "path",
which is a relative :term:`asset specification`, so it finds the resources
it should serve within the ``static`` directory inside the ``tutorial``
package. The scaffold could have alternately used an *absolute* asset
diff --git a/pyramid/httpexceptions.py b/pyramid/httpexceptions.py
index c82d6900c..64afc346a 100644
--- a/pyramid/httpexceptions.py
+++ b/pyramid/httpexceptions.py
@@ -378,7 +378,7 @@ class HTTPResetContent(HTTPOk):
"""
subclass of :class:`~HTTPOk`
- This indicates that the the server has fulfilled the request and
+ This indicates that the server has fulfilled the request and
the user agent SHOULD reset the document view which caused the
request to be sent.
@@ -754,7 +754,7 @@ class HTTPLengthRequired(HTTPClientError):
"""
subclass of :class:`~HTTPClientError`
- This indicates that the the server refuses to accept the request
+ This indicates that the server refuses to accept the request
without a defined Content-Length.
code: 411, title: Length Required
diff --git a/pyramid/path.py b/pyramid/path.py
index d1c3b6d31..e9c63a365 100644
--- a/pyramid/path.py
+++ b/pyramid/path.py
@@ -175,7 +175,7 @@ class AssetResolver(Resolver):
If ``spec`` is a *relative* asset specification (an asset
specification without a ``:`` in it, e.g. ``templates/foo.pt``), the
- ``package`` argument of the constructor is used as the the package
+ ``package`` argument of the constructor is used as the package
portion of the asset spec. For example:
.. code-block:: python