diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-04-22 16:42:44 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-04-22 16:42:44 -0700 |
| commit | c3152e5bcd5bb2027fac1411f238adc70eec20e7 (patch) | |
| tree | b17abc194dba021a8a9ca75d8c1da06e5bf6b9f1 /docs/internals | |
| parent | 985377980513dbe7d5a6d7f7c139ce5446b5c288 (diff) | |
| parent | 11d453bcadad3c9a5ae35882792d0f1e8e8e7818 (diff) | |
Merge pull request #2602 from intgr/typofix
Various documentation typo/spelling fixes
Diffstat (limited to 'docs/internals')
| -rw-r--r-- | docs/internals/committers.txt | 4 | ||||
| -rw-r--r-- | docs/internals/contributing/writing-code/coding-style.txt | 2 | ||||
| -rw-r--r-- | docs/internals/contributing/writing-documentation.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt index 1122130a58..d32e65d314 100644 --- a/docs/internals/committers.txt +++ b/docs/internals/committers.txt @@ -310,7 +310,7 @@ Ramiro Morales Honza Král Honza first discovered Django in 2006 and started using it right away, - first for school and personal projects and later in his full time job. He + first for school and personal projects and later in his full-time job. He contributed various patches and fixes mostly to the newforms library, newforms admin and, through participation in the Google Summer of Code project, assisted in creating the :ref:`model validation @@ -510,7 +510,7 @@ Marc Tamlyn documentation at DjangoCon EU 2012, and also helped to develop `CCBV`_, an additional class based view reference tool. - Marc is currently a full time parent, part time developer, and lives in + Marc is currently a full-time parent, part-time developer, and lives in Oxford, UK. .. _CCBV: http://ccbv.co.uk/ diff --git a/docs/internals/contributing/writing-code/coding-style.txt b/docs/internals/contributing/writing-code/coding-style.txt index b0004bd979..9ff58e8b30 100644 --- a/docs/internals/contributing/writing-code/coding-style.txt +++ b/docs/internals/contributing/writing-code/coding-style.txt @@ -206,7 +206,7 @@ Miscellaneous * Remove ``import`` statements that are no longer used when you change code. `flake8`_ will identify these imports for you. If an unused import needs to - remain for backwards-compatibility, mark the end of of with ``# NOQA`` to + remain for backwards-compatibility, mark the end of with ``# NOQA`` to silence the flake8 warning. * Systematically remove all trailing whitespaces from your code as those diff --git a/docs/internals/contributing/writing-documentation.txt b/docs/internals/contributing/writing-documentation.txt index 2ceef3d05d..fcefbdccae 100644 --- a/docs/internals/contributing/writing-documentation.txt +++ b/docs/internals/contributing/writing-documentation.txt @@ -205,7 +205,7 @@ Our policy for new features is: release, not the development version. Our preferred way for marking new features is by prefacing the features' -documentation with: "``.. versionadded:: X.Y``", followed by a a mandatory +documentation with: "``.. versionadded:: X.Y``", followed by a mandatory blank line and an optional content (indented). General improvements, or other changes to the APIs that should be emphasized |