From a04df803a590c5bffd9437d9199bc0107ba0e966 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sat, 29 Dec 2012 18:52:50 -0500 Subject: [PATCH] Removed links to deprecated IGNORABLE_404_STARTS/ENDS settings. refs #19516 and 641acf76e7 --- docs/internals/deprecation.txt | 6 +++--- docs/releases/1.4-alpha-1.txt | 17 +++++++++-------- docs/releases/1.4-beta-1.txt | 17 +++++++++-------- docs/releases/1.4.txt | 17 +++++++++-------- 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 74f544c220f..c976f5a8809 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -227,9 +227,9 @@ these changes. be accessible through their GB-prefixed names (GB is the correct ISO 3166 code for United Kingdom). -* The :setting:`IGNORABLE_404_STARTS` and :setting:`IGNORABLE_404_ENDS` - settings have been superseded by :setting:`IGNORABLE_404_URLS` in - the 1.4 release. They will be removed. +* The ``IGNORABLE_404_STARTS`` and ``IGNORABLE_404_ENDS`` settings have been + superseded by :setting:`IGNORABLE_404_URLS` in the 1.4 release. They will be + removed. * The :doc:`form wizard ` has been refactored to use class-based views with pluggable backends in 1.4. diff --git a/docs/releases/1.4-alpha-1.txt b/docs/releases/1.4-alpha-1.txt index fc19e903844..4086cfdecc1 100644 --- a/docs/releases/1.4-alpha-1.txt +++ b/docs/releases/1.4-alpha-1.txt @@ -813,11 +813,12 @@ For more details, see the documentation about Until Django 1.3, it was possible to exclude some URLs from Django's :doc:`404 error reporting` by adding prefixes to -:setting:`IGNORABLE_404_STARTS` and suffixes to :setting:`IGNORABLE_404_ENDS`. +``IGNORABLE_404_STARTS`` and suffixes to ``IGNORABLE_404_ENDS``. In Django 1.4, these two settings are superseded by -:setting:`IGNORABLE_404_URLS`, which is a list of compiled regular expressions. -Django won't send an email for 404 errors on URLs that match any of them. +:setting:`IGNORABLE_404_URLS`, which is a list of compiled regular +expressions. Django won't send an email for 404 errors on URLs that match any +of them. Furthermore, the previous settings had some rather arbitrary default values:: @@ -827,12 +828,12 @@ Furthermore, the previous settings had some rather arbitrary default values:: It's not Django's role to decide if your website has a legacy ``/cgi-bin/`` section or a ``favicon.ico``. As a consequence, the default values of -:setting:`IGNORABLE_404_URLS`, :setting:`IGNORABLE_404_STARTS` and -:setting:`IGNORABLE_404_ENDS` are all now empty. +:setting:`IGNORABLE_404_URLS`, ``IGNORABLE_404_STARTS``, and +``IGNORABLE_404_ENDS`` are all now empty. -If you have customized :setting:`IGNORABLE_404_STARTS` or -:setting:`IGNORABLE_404_ENDS`, or if you want to keep the old default value, -you should add the following lines in your settings file:: +If you have customized ``IGNORABLE_404_STARTS`` or ``IGNORABLE_404_ENDS``, or +if you want to keep the old default value, you should add the following lines +in your settings file:: import re IGNORABLE_404_URLS = ( diff --git a/docs/releases/1.4-beta-1.txt b/docs/releases/1.4-beta-1.txt index 2c84d21b8d3..a8732a9e65f 100644 --- a/docs/releases/1.4-beta-1.txt +++ b/docs/releases/1.4-beta-1.txt @@ -881,11 +881,12 @@ For more details, see the documentation about Until Django 1.3, it was possible to exclude some URLs from Django's :doc:`404 error reporting` by adding prefixes to -:setting:`IGNORABLE_404_STARTS` and suffixes to :setting:`IGNORABLE_404_ENDS`. +``IGNORABLE_404_STARTS`` and suffixes to ``IGNORABLE_404_ENDS``. In Django 1.4, these two settings are superseded by -:setting:`IGNORABLE_404_URLS`, which is a list of compiled regular expressions. -Django won't send an email for 404 errors on URLs that match any of them. +:setting:`IGNORABLE_404_URLS`, which is a list of compiled regular +expressions. Django won't send an email for 404 errors on URLs that match any +of them. Furthermore, the previous settings had some rather arbitrary default values:: @@ -895,12 +896,12 @@ Furthermore, the previous settings had some rather arbitrary default values:: It's not Django's role to decide if your website has a legacy ``/cgi-bin/`` section or a ``favicon.ico``. As a consequence, the default values of -:setting:`IGNORABLE_404_URLS`, :setting:`IGNORABLE_404_STARTS` and -:setting:`IGNORABLE_404_ENDS` are all now empty. +:setting:`IGNORABLE_404_URLS`, ``IGNORABLE_404_STARTS``, and +``IGNORABLE_404_ENDS`` are all now empty. -If you have customized :setting:`IGNORABLE_404_STARTS` or -:setting:`IGNORABLE_404_ENDS`, or if you want to keep the old default value, -you should add the following lines in your settings file:: +If you have customized ``IGNORABLE_404_STARTS`` or ``IGNORABLE_404_ENDS``, or +if you want to keep the old default value, you should add the following lines +in your settings file:: import re IGNORABLE_404_URLS = ( diff --git a/docs/releases/1.4.txt b/docs/releases/1.4.txt index d700ba8b89e..cf53b37f172 100644 --- a/docs/releases/1.4.txt +++ b/docs/releases/1.4.txt @@ -966,11 +966,12 @@ For more details, see the documentation about Until Django 1.3, it was possible to exclude some URLs from Django's :doc:`404 error reporting` by adding prefixes to -:setting:`IGNORABLE_404_STARTS` and suffixes to :setting:`IGNORABLE_404_ENDS`. +``IGNORABLE_404_STARTS`` and suffixes to ``IGNORABLE_404_ENDS``. In Django 1.4, these two settings are superseded by -:setting:`IGNORABLE_404_URLS`, which is a list of compiled regular expressions. -Django won't send an email for 404 errors on URLs that match any of them. +:setting:`IGNORABLE_404_URLS`, which is a list of compiled regular +expressions. Django won't send an email for 404 errors on URLs that match any +of them. Furthermore, the previous settings had some rather arbitrary default values:: @@ -980,12 +981,12 @@ Furthermore, the previous settings had some rather arbitrary default values:: It's not Django's role to decide if your website has a legacy ``/cgi-bin/`` section or a ``favicon.ico``. As a consequence, the default values of -:setting:`IGNORABLE_404_URLS`, :setting:`IGNORABLE_404_STARTS` and -:setting:`IGNORABLE_404_ENDS` are all now empty. +:setting:`IGNORABLE_404_URLS`, ``IGNORABLE_404_STARTS``, and +``IGNORABLE_404_ENDS`` are all now empty. -If you have customized :setting:`IGNORABLE_404_STARTS` or -:setting:`IGNORABLE_404_ENDS`, or if you want to keep the old default value, -you should add the following lines in your settings file:: +If you have customized ``IGNORABLE_404_STARTS`` or ``IGNORABLE_404_ENDS``, or +if you want to keep the old default value, you should add the following lines +in your settings file:: import re IGNORABLE_404_URLS = (