Skip to content

Commit

Permalink
Fixed typos in docs and comments
Browse files Browse the repository at this point in the history
  • Loading branch information
timgraham committed Jan 29, 2013
1 parent b99a4e1 commit ee26797
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 17 deletions.
2 changes: 1 addition & 1 deletion django/contrib/gis/gdal/geometries.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def __init__(self, geom_input, srs=None):

str_instance = isinstance(geom_input, six.string_types)

# If HEX, unpack input to to a binary buffer.
# If HEX, unpack input to a binary buffer.
if str_instance and hex_regex.match(geom_input):
geom_input = memoryview(a2b_hex(geom_input.upper().encode()))
str_instance = False
Expand Down
2 changes: 1 addition & 1 deletion django/contrib/gis/geos/prototypes/geom.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def bin_constructor(func):

# HEX & WKB output
def bin_output(func):
"Generates a prototype for the routines that return a a sized string."
"Generates a prototype for the routines that return a sized string."
func.argtypes = [GEOM_PTR, POINTER(c_size_t)]
func.errcheck = check_sized_string
func.restype = c_uchar_p
Expand Down
2 changes: 1 addition & 1 deletion django/contrib/gis/utils/srs.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def add_srs_entry(srs, auth_name='EPSG', auth_srid=None, ref_sys_name=None,
Defaults to the SRID determined by GDAL.
ref_sys_name:
For SpatiaLite users only, sets the value of the the `ref_sys_name` field.
For SpatiaLite users only, sets the value of the `ref_sys_name` field.
Defaults to the name determined by GDAL.
database:
Expand Down
2 changes: 1 addition & 1 deletion django/contrib/staticfiles/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def serve(request, path, document_root=None, insecure=False, **kwargs):
"""
if not settings.DEBUG and not insecure:
raise ImproperlyConfigured("The staticfiles view can only be used in "
"debug mode or if the the --insecure "
"debug mode or if the --insecure "
"option of 'runserver' is used")
normalized_path = posixpath.normpath(unquote(path)).lstrip('/')
absolute_path = finders.find(normalized_path)
Expand Down
2 changes: 1 addition & 1 deletion django/db/models/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -1587,7 +1587,7 @@ def prefetch_related_objects(result_cache, related_lookups):
continue
done_lookups.add(lookup)

# Top level, the list of objects to decorate is the the result cache
# Top level, the list of objects to decorate is the result cache
# from the primary QuerySet. It won't be for deeper levels.
obj_list = result_cache

Expand Down
4 changes: 2 additions & 2 deletions django/middleware/csrf.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ def _get_new_csrf_key():

def get_token(request):
"""
Returns the the CSRF token required for a POST form. The token is an
Returns the CSRF token required for a POST form. The token is an
alphanumeric value.
A side effect of calling this function is to make the the csrf_protect
A side effect of calling this function is to make the csrf_protect
decorator and the CsrfViewMiddleware add a CSRF cookie and a 'Vary: Cookie'
header to the outgoing response. For this reason, you may need to use this
function lazily, as is done by the csrf context processor.
Expand Down
2 changes: 1 addition & 1 deletion docs/internals/contributing/committing-code.txt
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Practicality beats purity, so it is up to each committer to decide how much
history mangling to do for a pull request. The main points are engaging the
community, getting work done, and having a usable commit history.

.. _committing-guidlines:
.. _committing-guidelines:

Committing guidelines
---------------------
Expand Down
4 changes: 2 additions & 2 deletions docs/internals/contributing/writing-code/working-with-git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ commit them::
git commit

When writing the commit message, follow the :ref:`commit message
guidelines <committing-guidlines>` to ease the work of the committer. If
guidelines <committing-guidelines>` to ease the work of the committer. If
you're uncomfortable with English, try at least to describe precisely what the
commit does.

Expand Down Expand Up @@ -121,7 +121,7 @@ a pull request at GitHub. A good pull request means:

* well-formed messages for each commit: a summary line and then paragraphs
wrapped at 72 characters thereafter -- see the :ref:`committing guidelines
<committing-guidlines>` for more details,
<committing-guidelines>` for more details,

* documentation and tests, if needed -- actually tests are always needed,
except for documentation changes.
Expand Down
4 changes: 3 additions & 1 deletion docs/intro/overview.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ Enjoy the free API
==================

With that, you've got a free, and rich, :doc:`Python API </topics/db/queries>` to
access your data. The API is created on the fly, no code generation necessary::
access your data. The API is created on the fly, no code generation necessary:

.. code-block:: python

# Import the models we created from our "news" app
>>> from news.models import Reporter, Article
Expand Down
3 changes: 2 additions & 1 deletion docs/misc/api-stability.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ Security fixes

If we become aware of a security problem -- hopefully by someone following our
:ref:`security reporting policy <reporting-security-issues>` -- we'll do
everything necessary to fix it. This might mean breaking backwards compatibility; security trumps the compatibility guarantee.
everything necessary to fix it. This might mean breaking backwards
compatibility; security trumps the compatibility guarantee.

Contributed applications (``django.contrib``)
---------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/ref/contrib/admin/index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ subclass::
added last after all editable fields.

A read-only field can not only display data from a model's field, it can
also display the output of a a model's method or a method of the
also display the output of a model's method or a method of the
``ModelAdmin`` class itself. This is very similar to the way
:attr:`ModelAdmin.list_display` behaves. This provides an easy way to use
the admin interface to provide feedback on the status of the objects being
Expand Down
2 changes: 1 addition & 1 deletion docs/ref/contrib/gis/install/index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ described above, ``psycopg2`` may be installed using the following command::

.. note::

If you don't have ``pip``, follow the the :ref:`installation instructions
If you don't have ``pip``, follow the :ref:`installation instructions
<installing-official-release>` to install it.

.. _fink:
Expand Down
2 changes: 1 addition & 1 deletion docs/topics/auth/default.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Changing passwords
Django does not store raw (clear text) passwords on the user model, but only
a hash (see :doc:`documentation of how passwords are managed
</topics/auth/passwords>` for full details). Because of this, do not attempt to
manipulate the password attribute of the user directly. This is why a a helper
manipulate the password attribute of the user directly. This is why a helper
function is used when creating a user.

To change a user's password, you have several options:
Expand Down
2 changes: 1 addition & 1 deletion tests/regressiontests/admin_views/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -2454,7 +2454,7 @@ def test_custom_changelist(self):
self.assertEqual(response.status_code, 302) # redirect somewhere
# Hit the page once to get messages out of the queue message list
response = self.client.get('/test_admin/%s/admin_views/gadget/' % self.urlbit)
# Ensure that that data is still not visible on the page
# Ensure that data is still not visible on the page
response = self.client.get('/test_admin/%s/admin_views/gadget/' % self.urlbit)
self.assertEqual(response.status_code, 200)
self.assertNotContains(response, 'First Gadget')
Expand Down
2 changes: 1 addition & 1 deletion tests/regressiontests/builtin_server/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#
# Tests for #9659: wsgi.file_wrapper in the builtin server.
# We need to mock a couple of of handlers and keep track of what
# We need to mock a couple of handlers and keep track of what
# gets called when using a couple kinds of WSGI apps.
#

Expand Down

0 comments on commit ee26797

Please sign in to comment.