From 9562ffea9719f2b1795e676718c6d433a1f8d4ed Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@oscaro.com>
Date: Mon, 8 Sep 2014 21:16:59 +0200
Subject: [PATCH] Avoid the word "stupid".

There's always a better word.
---
 docs/intro/tutorial04.txt        |  2 +-
 docs/ref/templates/builtins.txt  |  4 +---
 tests/prefetch_related/tests.py  |  2 +-
 tests/settings_tests/tests.py    | 16 ++++++++--------
 tests/staticfiles_tests/tests.py |  2 +-
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/docs/intro/tutorial04.txt b/docs/intro/tutorial04.txt
index 48e38bf159..2169d5207c 100644
--- a/docs/intro/tutorial04.txt
+++ b/docs/intro/tutorial04.txt
@@ -182,7 +182,7 @@ Use generic views: Less code is better
 ======================================
 
 The ``detail()`` (from :doc:`Tutorial 3 </intro/tutorial03>`) and ``results()``
-views are stupidly simple -- and, as mentioned above, redundant. The ``index()``
+views are very simple -- and, as mentioned above, redundant. The ``index()``
 view (also from Tutorial 3), which displays a list of polls, is similar.
 
 These views represent a common case of basic Web development: getting data from
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index da860c4bb7..35481fcd53 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -407,9 +407,7 @@ variables or to negate a given variable::
     {% endif %}
 
     {% if not athlete_list or coach_list %}
-        There are no athletes or there are some coaches (OK, so
-        writing English translations of boolean logic sounds
-        stupid; it's not our fault).
+        There are no athletes or there are some coaches.
     {% endif %}
 
     {% if athlete_list and not coach_list %}
diff --git a/tests/prefetch_related/tests.py b/tests/prefetch_related/tests.py
index 691067b8d6..a1272c1e0b 100644
--- a/tests/prefetch_related/tests.py
+++ b/tests/prefetch_related/tests.py
@@ -683,7 +683,7 @@ class GenericRelationTests(TestCase):
     def test_prefetch_GFK(self):
         TaggedItem.objects.create(tag="awesome", content_object=self.book1)
         TaggedItem.objects.create(tag="great", content_object=self.reader1)
-        TaggedItem.objects.create(tag="stupid", content_object=self.book2)
+        TaggedItem.objects.create(tag="outstanding", content_object=self.book2)
         TaggedItem.objects.create(tag="amazing", content_object=self.reader3)
 
         # 1 for TaggedItem table, 1 for Book table, 1 for Reader table
diff --git a/tests/settings_tests/tests.py b/tests/settings_tests/tests.py
index 2dcf62abb5..51bcd114e2 100644
--- a/tests/settings_tests/tests.py
+++ b/tests/settings_tests/tests.py
@@ -366,18 +366,18 @@ class TrailingSlashURLTests(TestCase):
         If the value ends in more than one slash, presume they know what
         they're doing.
         """
-        self.settings_module.MEDIA_URL = '/stupid//'
-        self.assertEqual('/stupid//', self.settings_module.MEDIA_URL)
+        self.settings_module.MEDIA_URL = '/wrong//'
+        self.assertEqual('/wrong//', self.settings_module.MEDIA_URL)
 
-        self.settings_module.MEDIA_URL = 'http://media.foo.com/stupid//'
-        self.assertEqual('http://media.foo.com/stupid//',
+        self.settings_module.MEDIA_URL = 'http://media.foo.com/wrong//'
+        self.assertEqual('http://media.foo.com/wrong//',
                          self.settings_module.MEDIA_URL)
 
-        self.settings_module.STATIC_URL = '/stupid//'
-        self.assertEqual('/stupid//', self.settings_module.STATIC_URL)
+        self.settings_module.STATIC_URL = '/wrong//'
+        self.assertEqual('/wrong//', self.settings_module.STATIC_URL)
 
-        self.settings_module.STATIC_URL = 'http://static.foo.com/stupid//'
-        self.assertEqual('http://static.foo.com/stupid//',
+        self.settings_module.STATIC_URL = 'http://static.foo.com/wrong//'
+        self.assertEqual('http://static.foo.com/wrong//',
                          self.settings_module.STATIC_URL)
 
 
diff --git a/tests/staticfiles_tests/tests.py b/tests/staticfiles_tests/tests.py
index 1161318a7a..67afd25351 100644
--- a/tests/staticfiles_tests/tests.py
+++ b/tests/staticfiles_tests/tests.py
@@ -73,7 +73,7 @@ class BaseStaticFilesTestCase(object):
         self._nonascii_filepath = os.path.join(self.testfiles_path, '\u2297.txt')
         with codecs.open(self._nonascii_filepath, 'w', 'utf-8') as f:
             f.write("\u2297 in the app dir")
-        # And also create the stupid hidden file to dwarf the setup.py's
+        # And also create the magic hidden file to trick the setup.py's
         # package data handling.
         self._hidden_filepath = os.path.join(self.testfiles_path, '.hidden')
         with codecs.open(self._hidden_filepath, 'w', 'utf-8') as f: