summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAdam Johnson <me@adamj.eu>2020-01-05 10:04:51 +0000
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-01-06 13:50:43 +0100
commit2ea3fb3e6386c43f124b542e92b817dbc227c76b (patch)
tree2decee1530b738f997c05b2c9b4438659125935a /docs
parent1487f16f2d29c7aeaf48117d02a1d7bbeafa3d94 (diff)
Removed "Don't do that" from docs and error messages.
It's slightly aggressive and doesn't explain itself.
Diffstat (limited to 'docs')
-rw-r--r--docs/intro/tutorial03.txt7
-rw-r--r--docs/topics/db/managers.txt5
-rw-r--r--docs/topics/i18n/timezones.txt11
3 files changed, 8 insertions, 15 deletions
diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
index 23282c4f6d..73cc778106 100644
--- a/docs/intro/tutorial03.txt
+++ b/docs/intro/tutorial03.txt
@@ -125,13 +125,6 @@ view function. The ``:question_id>`` part of the string defines the name that
will be used to identify the matched pattern, and the ``<int:`` part is a
converter that determines what patterns should match this part of the URL path.
-There's no need to add URL cruft such as ``.html`` -- unless you want to, in
-which case you can do something like this::
-
- path('polls/latest.html', views.index),
-
-But, don't do that. It's silly.
-
Write views that actually do something
======================================
diff --git a/docs/topics/db/managers.txt b/docs/topics/db/managers.txt
index 1b34bea69b..473965d897 100644
--- a/docs/topics/db/managers.txt
+++ b/docs/topics/db/managers.txt
@@ -228,9 +228,8 @@ model. In those situations, Django has to be able to see all the objects for
the model it is fetching, so that *anything* which is referred to can be
retrieved.
-If you override the ``get_queryset()`` method and filter out any rows, Django
-will return incorrect results. Don't do that. A manager that filters results
-in ``get_queryset()`` is not appropriate for use as a base manager.
+Therefore, you should not override ``get_queryset()`` to filter out any rows.
+If you do so, Django will return incomplete results.
.. _calling-custom-queryset-methods-from-manager:
diff --git a/docs/topics/i18n/timezones.txt b/docs/topics/i18n/timezones.txt
index cc357137a6..367835a247 100644
--- a/docs/topics/i18n/timezones.txt
+++ b/docs/topics/i18n/timezones.txt
@@ -495,10 +495,11 @@ Setup
datetimes safely, their representation should include the UTC offset, or
their values should be in UTC (or both!).
- Finally, our calendar system contains interesting traps for computers::
+ Finally, our calendar system contains interesting edge cases. For example,
+ you can't always subtract one year directly from a given date::
>>> import datetime
- >>> def one_year_before(value): # DON'T DO THAT!
+ >>> def one_year_before(value): # Wrong example.
... return value.replace(year=value.year - 1)
>>> one_year_before(datetime.datetime(2012, 3, 1, 10, 0))
datetime.datetime(2011, 3, 1, 10, 0)
@@ -507,9 +508,9 @@ Setup
...
ValueError: day is out of range for month
- (To implement this function, you must decide whether 2012-02-29 minus
- one year is 2011-02-28 or 2011-03-01, which depends on your business
- requirements.)
+ To implement such a function correctly, you must decide whether 2012-02-29
+ minus one year is 2011-02-28 or 2011-03-01, which depends on your business
+ requirements.
#. **How do I interact with a database that stores datetimes in local time?**