test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Used Sphinx markup for PEPs and fixed a typo in the 1.4-beta-1 release notes. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Aymeric Augustin 2012-02-16 18:27:42 +00:00
parent 758a0cd0f1
commit 5b37a02ba3
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/internals/contributing/writing-code/coding-style.txt
View File

@ -189,7 +189,7 @@ Miscellaneous
occasionally cause unnecessary merge conflicts. Some IDE's can be occasionally cause unnecessary merge conflicts. Some IDE's can be
configured to automatically remove them and most VCS tools can be set to configured to automatically remove them and most VCS tools can be set to
highlight them in diff outputs. Note, however, that patches which only highlight them in diff outputs. Note, however, that patches which only
remove whitespace (or only make changes for nominal PEP 8 conformance) remove whitespace (or only make changes for nominal :pep:`8` conformance)
are likely to be rejected, since they only introduce noise rather than are likely to be rejected, since they only introduce noise rather than
code improvement. Tidy up when you're next changing code in the area. code improvement. Tidy up when you're next changing code in the area.

9
docs/releases/1.4-beta-1.txt
View File

@ -31,10 +31,9 @@ Version numbering
Internally, Django's version number is represented by the tuple Internally, Django's version number is represented by the tuple
``django.VERSION``. This is used to generate human-readable version ``django.VERSION``. This is used to generate human-readable version
number strings; as of Django 1.4 beta 1, the algorithm for generating number strings; as of Django 1.4 beta 1, the algorithm for generating
these strings has been changed to match the recommendations of `PEP these strings has been changed to match the recommendations of :pep:`386`.
386 <http://www.python.org/dev/peps/pep-0386/>`_. This only affects the This only affects the human-readable strings identifying Django alphas,
human-readable strings identifying Django alphas, betas and release betas and release candidates, and should not affect end users in any way.
candidates, and should not affect end users in any way.
For example purposes, the old algorithm would give Django 1.4 beta 1 a For example purposes, the old algorithm would give Django 1.4 beta 1 a
version string of the form "1.4 beta 1". The new algorithm generates version string of the form "1.4 beta 1". The new algorithm generates
@ -1171,7 +1170,7 @@ Please open new tickets if no existing ticket corresponds to a problem you're
running into. running into.
Additionally, discussion of Django development, including progress toward the Additionally, discussion of Django development, including progress toward the
1.3 release, takes place daily on the django-developers mailing list: 1.4 release, takes place daily on the django-developers mailing list:
* http://groups.google.com/group/django-developers * http://groups.google.com/group/django-developers