summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2010-11-02 16:19:17 +0000
committerCarl Meyer <carl@oddbird.net>2010-11-02 16:19:17 +0000
commit4ba6348a004352ba1790c043e7bc195637cb0b72 (patch)
tree7735655101dd96ce002dc57e0fb05812c16d195c
parenta89e02637b04b95f50087d53289e8aca8cd58007 (diff)
Fixed #14598 -- Changed some 'domain.com' uses to 'example.com'
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/global_settings.py2
-rw-r--r--django/conf/project_template/settings.py2
-rw-r--r--tests/modeltests/validators/tests.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index e9ab5c7c98..6ca0704257 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -21,7 +21,7 @@ DEBUG_PROPAGATE_EXCEPTIONS = False
USE_ETAGS = False
# People who get code error notifications.
-# In the format (('Full Name', 'email@domain.com'), ('Full Name', 'anotheremail@domain.com'))
+# In the format (('Full Name', 'email@example.com'), ('Full Name', 'anotheremail@example.com'))
ADMINS = ()
# Tuple of IP addresses, as strings, that:
diff --git a/django/conf/project_template/settings.py b/django/conf/project_template/settings.py
index 7791b47cab..d3e6973d04 100644
--- a/django/conf/project_template/settings.py
+++ b/django/conf/project_template/settings.py
@@ -4,7 +4,7 @@ DEBUG = True
TEMPLATE_DEBUG = DEBUG
ADMINS = (
- # ('Your Name', 'your_email@domain.com'),
+ # ('Your Name', 'your_email@example.com'),
)
MANAGERS = ADMINS
diff --git a/tests/modeltests/validators/tests.py b/tests/modeltests/validators/tests.py
index b4411a221a..6fe154288d 100644
--- a/tests/modeltests/validators/tests.py
+++ b/tests/modeltests/validators/tests.py
@@ -92,7 +92,7 @@ TEST_DATA = (
(URLValidator(), 'http://www.example.com/', None),
(URLValidator(), 'http://www.example.com:8000/test', None),
(URLValidator(), 'http://valid-with-hyphens.com/', None),
- (URLValidator(), 'http://subdomain.domain.com/', None),
+ (URLValidator(), 'http://subdomain.example.com/', None),
(URLValidator(), 'http://200.8.9.10/', None),
(URLValidator(), 'http://200.8.9.10:8000/test', None),
(URLValidator(), 'http://valid-----hyphens.com/', None),