diff options
| author | Tim Graham <timograham@gmail.com> | 2016-10-06 11:00:36 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-10-06 11:01:20 -0400 |
| commit | e261337eea46b472c92cf1c351b22d62a7045e11 (patch) | |
| tree | 3a0a3746b5a93004b0d0f32adbfa3a9e7ca497e6 /docs/internals/contributing | |
| parent | 5d35181de4a9d693c4702680974b30db3035a0c9 (diff) | |
Fixed docs typos in lines ending with a dash.
Diffstat (limited to 'docs/internals/contributing')
| -rw-r--r-- | docs/internals/contributing/committing-code.txt | 6 | ||||
| -rw-r--r-- | docs/internals/contributing/writing-code/working-with-git.txt | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt index 0877511dc8..32be5f1f06 100644 --- a/docs/internals/contributing/committing-code.txt +++ b/docs/internals/contributing/committing-code.txt @@ -109,9 +109,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| diff --git a/docs/internals/contributing/writing-code/working-with-git.txt b/docs/internals/contributing/writing-code/working-with-git.txt index 00f9b79c09..d2e45ad829 100644 --- a/docs/internals/contributing/writing-code/working-with-git.txt +++ b/docs/internals/contributing/writing-code/working-with-git.txt @@ -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 |