mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

[5.1.x] Removed unneeded hyphens in "counterintuitive".

Browse Source 
Follow-up to 65ad4ade74dc9208b9d686a451cd6045df0c9c3a which added
counterintuitive to the wordlist. Removes unneeded (antiquated)
hyphenated usages.

See e.g. https://www.merriam-webster.com/dictionary/counterintuitive

Backport of 704192e478885762411252979021771ba23b8adb from main.
This commit is contained in:
Carlton Gibson 2024-07-03 18:54:21 +02:00 committed by Sarah Boyce
parent 9f4725fa8f
commit 3b5d04f879
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/middleware/cache.py
View File

@ -10,7 +10,7 @@ URL. The canonical way to enable cache middleware is to set
'django.middleware.cache.FetchFromCacheMiddleware' 'django.middleware.cache.FetchFromCacheMiddleware'
] ]
This is counter-intuitive, but correct: ``UpdateCacheMiddleware`` needs to run This is counterintuitive, but correct: ``UpdateCacheMiddleware`` needs to run
last during the response phase, which processes middleware bottom-up; last during the response phase, which processes middleware bottom-up;
``FetchFromCacheMiddleware`` needs to run last during the request phase, which ``FetchFromCacheMiddleware`` needs to run last during the request phase, which
processes middleware top-down. processes middleware top-down.

2
docs/intro/tutorial05.txt
View File

@ -111,7 +111,7 @@ There are many ways to approach writing tests.
Some programmers follow a discipline called "`test-driven development`_"; they Some programmers follow a discipline called "`test-driven development`_"; they
actually write their tests before they write their code. This might seem actually write their tests before they write their code. This might seem
counter-intuitive, but in fact it's similar to what most people will often do counterintuitive, but in fact it's similar to what most people will often do
anyway: they describe a problem, then create some code to solve it. Test-driven anyway: they describe a problem, then create some code to solve it. Test-driven
development formalizes the problem in a Python test case. development formalizes the problem in a Python test case.

2
docs/ref/databases.txt
View File

@ -826,7 +826,7 @@ specific to SQLite that you should be aware of.
Substring matching and case sensitivity Substring matching and case sensitivity
--------------------------------------- ---------------------------------------
For all SQLite versions, there is some slightly counter-intuitive behavior when For all SQLite versions, there is some slightly counterintuitive behavior when
attempting to match some types of strings. These are triggered when using the attempting to match some types of strings. These are triggered when using the
:lookup:`iexact` or :lookup:`contains` filters in Querysets. The behavior :lookup:`iexact` or :lookup:`contains` filters in Querysets. The behavior
splits into two cases: splits into two cases: