Fixed docs typos in lines ending with a dash.

This commit is contained in:
Tim Graham 2016-10-06 11:00:36 -04:00
parent 5d35181de4
commit e261337eea
5 changed files with 11 additions and 11 deletions

View File

@ -109,9 +109,9 @@ Committing guidelines
In addition, please follow the following guidelines when committing code to In addition, please follow the following guidelines when committing code to
Django's Git repository: Django's Git repository:
* Never change the published history of django/django branches! **Never force- * Never change the published history of django/django branches! **Never
push your changes to django/django.** If you absolutely must (for security force-push your changes to django/django.** If you absolutely must (for
reasons for example) first discuss the situation with the core team. security reasons for example) first discuss the situation with the core team.
* For any medium-to-big changes, where "medium-to-big" is according to * For any medium-to-big changes, where "medium-to-big" is according to
your judgment, please bring things up on the |django-developers| your judgment, please bring things up on the |django-developers|

View File

@ -179,8 +179,8 @@ commit, for example to fix a typo in a docstring::
# The second and third commits should be applied. # The second and third commits should be applied.
If your topic branch is already published at GitHub, for example if you're If your topic branch is already published at GitHub, for example if you're
making minor changes to take into account a review, you will need to force- making minor changes to take into account a review, you will need to force-push
push the changes:: the changes::
git push -f origin ticket_xxxxx git push -f origin ticket_xxxxx

View File

@ -340,8 +340,8 @@ Application registry
Returns the :class:`~django.db.models.Model` with the given ``app_label`` Returns the :class:`~django.db.models.Model` with the given ``app_label``
and ``model_name``. As a shortcut, this method also accepts a single and ``model_name``. As a shortcut, this method also accepts a single
argument in the form ``app_label.model_name``. ``model_name`` is case- argument in the form ``app_label.model_name``. ``model_name`` is
insensitive. case-insensitive.
Raises :exc:`LookupError` if no such application or model exists. Raises Raises :exc:`LookupError` if no such application or model exists. Raises
:exc:`ValueError` when called with a single argument that doesn't contain :exc:`ValueError` when called with a single argument that doesn't contain

View File

@ -1035,8 +1035,8 @@ with the following notable differences:
:class:`StreamingHttpResponse` should only be used in situations where it is :class:`StreamingHttpResponse` should only be used in situations where it is
absolutely required that the whole content isn't iterated before transferring absolutely required that the whole content isn't iterated before transferring
the data to the client. Because the content can't be accessed, many the data to the client. Because the content can't be accessed, many
middlewares can't function normally. For example the ``ETag`` and ``Content- middlewares can't function normally. For example the ``ETag`` and
Length`` headers can't be generated for streaming responses. ``Content-Length`` headers can't be generated for streaming responses.
Attributes Attributes
---------- ----------

View File

@ -21,8 +21,8 @@ handling date/times. When enabled, this Django will store date/times in UTC,
use timezone-aware objects internally, and translate them to users' local use timezone-aware objects internally, and translate them to users' local
timezones for display. timezones for display.
If you're upgrading an existing project to Django 1.4, switching to the time- If you're upgrading an existing project to Django 1.4, switching to the timezone
zone aware mode may take some care: the new mode disallows some rather sloppy aware mode may take some care: the new mode disallows some rather sloppy
behavior that used to be accepted. We encourage anyone who's upgrading to check behavior that used to be accepted. We encourage anyone who's upgrading to check
out the :ref:`timezone migration guide <time-zones-migration-guide>` and the out the :ref:`timezone migration guide <time-zones-migration-guide>` and the
:ref:`timezone FAQ <time-zones-faq>` for useful pointers. :ref:`timezone FAQ <time-zones-faq>` for useful pointers.