From d7036e52ab856b9e7125391cddcd18c08b5b0938 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Tue, 24 May 2011 18:39:28 +0000 Subject: [PATCH] Made some small tweaks/fixes to documentation from IGNORABLE_404_URLS changeset [16160] git-svn-id: http://code.djangoproject.com/svn/django/trunk@16275 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/middleware/common.py | 4 ++-- docs/howto/error-reporting.txt | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/django/middleware/common.py b/django/middleware/common.py index 689929bea4..fb55412c9b 100644 --- a/django/middleware/common.py +++ b/django/middleware/common.py @@ -130,7 +130,7 @@ def _is_ignorable_404(uri): if getattr(settings, 'IGNORABLE_404_STARTS', ()): import warnings warnings.warn('The IGNORABLE_404_STARTS setting has been deprecated ' - 'in favour of IGNORABLE_404_URLS.', + 'in favor of IGNORABLE_404_URLS.', PendingDeprecationWarning) for start in settings.IGNORABLE_404_STARTS: if uri.startswith(start): @@ -138,7 +138,7 @@ def _is_ignorable_404(uri): if getattr(settings, 'IGNORABLE_404_ENDS', ()): import warnings warnings.warn('The IGNORABLE_404_ENDS setting has been deprecated ' - 'in favour of IGNORABLE_404_URLS.', + 'in favor of IGNORABLE_404_URLS.', PendingDeprecationWarning) for end in settings.IGNORABLE_404_ENDS: if uri.endswith(end): diff --git a/docs/howto/error-reporting.txt b/docs/howto/error-reporting.txt index 4642c39a92..c15c1d872d 100644 --- a/docs/howto/error-reporting.txt +++ b/docs/howto/error-reporting.txt @@ -84,10 +84,12 @@ crawlers often request:: import re IGNORABLE_404_URLS = ( re.compile(r'^/apple-touch-icon.*\.png$'), - re.compile(r'^/favicon.ico$), - re.compile(r'^/robots.txt$), + re.compile(r'^/favicon\.ico$), + re.compile(r'^/robots\.txt$), ) +(Note that these are regular expressions, so we put a backslash in front of +periods to escape them.) The best way to disable this behavior is to set :setting:`SEND_BROKEN_LINK_EMAILS` to ``False``.