From 5b37a02ba3c2857d192ec4311270113ed71c275d Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Thu, 16 Feb 2012 18:27:42 +0000 Subject: [PATCH] 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 --- .../internals/contributing/writing-code/coding-style.txt | 2 +- docs/releases/1.4-beta-1.txt | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/internals/contributing/writing-code/coding-style.txt b/docs/internals/contributing/writing-code/coding-style.txt index 915cc7724b..1f8be33e05 100644 --- a/docs/internals/contributing/writing-code/coding-style.txt +++ b/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. diff --git a/docs/releases/1.4-beta-1.txt b/docs/releases/1.4-beta-1.txt index 851139f4c7..62766549e7 100644 --- a/docs/releases/1.4-beta-1.txt +++ b/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 `_. 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