[1.10.x] Fixed docs typos in lines ending with a dash.

Backport of e261337eea from master
This commit is contained in:
Tim Graham 2016-10-06 11:00:36 -04:00
parent 86ebc4e524
commit c2853807bc
5 changed files with 11 additions and 11 deletions

View file

@ -106,9 +106,9 @@ Committing guidelines
In addition, please follow the following guidelines when committing code to
Django's Git repository:
* Never change the published history of django/django branches! **Never force-
push your changes to django/django.** If you absolutely must (for security
reasons for example) first discuss the situation with the core team.
* Never change the published history of django/django branches! **Never
force-push your changes to django/django.** If you absolutely must (for
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
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.
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-
push the changes::
making minor changes to take into account a review, you will need to force-push
the changes::
git push -f origin ticket_xxxxx