diff options
| author | Marti Raudsepp <marti@juffo.org> | 2014-04-23 02:05:14 +0300 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-04-22 20:13:43 -0400 |
| commit | c5306d4af1e9430d2397e8d83b37fa3598a17e83 (patch) | |
| tree | 4bc6b1fd1b4112152fd299bfedf6b5dc7846cb49 /docs/internals | |
| parent | 49f5a2949311c6aaaac0005c4f6ab79cf96ee09d (diff) | |
[1.6.x] Various documentation typo/spelling fixes
Errors detected by Topy (https://github.com/intgr/topy), all changes
verified by hand.
Backport of 11d453bcadad3c9a5ae35882792d0f1e8e8e7818 from master
Diffstat (limited to 'docs/internals')
| -rw-r--r-- | docs/internals/committers.txt | 5 | ||||
| -rw-r--r-- | docs/internals/contributing/writing-documentation.txt | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt index f9f9d2fd91..e2934a8db1 100644 --- a/docs/internals/committers.txt +++ b/docs/internals/committers.txt @@ -321,7 +321,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 @@ -520,11 +520,10 @@ Marc Tamlyn documentation at DjangoCon EU 2012, and also helped to develop `CCBV`_, an additional class based view reference tool. - Marc currently works at `Incuna Ltd`_, a digital healthcare agency in + Marc is currently a full-time parent, part-time developer, and lives in Oxford, UK. .. _CCBV: http://ccbv.co.uk/ -.. _Incuna Ltd: http://incuna.com/ Baptiste Mispelon Baptiste discovered Django around the 1.2 version and promptly switched away diff --git a/docs/internals/contributing/writing-documentation.txt b/docs/internals/contributing/writing-documentation.txt index f7a6fe6b97..9d6ddc3059 100644 --- a/docs/internals/contributing/writing-documentation.txt +++ b/docs/internals/contributing/writing-documentation.txt @@ -192,7 +192,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 |