2
0
Эх сурвалжийг харах

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
Aymeric Augustin 13 жил өмнө
parent
commit
5b37a02ba3

+ 1 - 1
docs/internals/contributing/writing-code/coding-style.txt

@@ -189,7 +189,7 @@ Miscellaneous
   occasionally cause unnecessary merge conflicts. Some IDE's can be
   configured to automatically remove them and most VCS tools can be set to
   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
   code improvement. Tidy up when you're next changing code in the area.
 

+ 4 - 5
docs/releases/1.4-beta-1.txt

@@ -31,10 +31,9 @@ Version numbering
 Internally, Django's version number is represented by the tuple
 ``django.VERSION``. This is used to generate human-readable version
 number strings; as of Django 1.4 beta 1, the algorithm for generating
-these strings has been changed to match the recommendations of `PEP
-386 <http://www.python.org/dev/peps/pep-0386/>`_. This only affects the
-human-readable strings identifying Django alphas, betas and release
-candidates, and should not affect end users in any way.
+these strings has been changed to match the recommendations of :pep:`386`.
+This only affects the human-readable strings identifying Django alphas,
+betas and release candidates, and should not affect end users in any way.
 
 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
@@ -1171,7 +1170,7 @@ Please open new tickets if no existing ticket corresponds to a problem you're
 running into.
 
 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