summaryrefslogtreecommitdiff
path: root/docs/howto
diff options
context:
space:
mode:
authorDavid <smithdc@gmail.com>2022-03-11 08:11:42 +0000
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2022-04-28 10:44:14 +0200
commitce586ed6931092d3a5f06df9031cdeb891793ddb (patch)
treeb80a053de16b65cfaa7969cb34713cdb20dc6d84 /docs/howto
parent33e89de8ca2bf4be23ec1506db8a7624511718d2 (diff)
Removed hyphen from pre-/re- prefixes.
"prepopulate", "preload", and "preprocessing" are already in the spelling_wordlist. This also removes hyphen from double "e" combinations with "pre" and "re", e.g. preexisting, preempt, reestablish, or reenter. See also: - https://ahdictionary.com/word/search.html?q=rerun - https://ahdictionary.com/word/search.html?q=recreate - https://ahdictionary.com/word/search.html?q=predetermined - https://ahdictionary.com/word/search.html?q=reuse - https://ahdictionary.com/word/search.html?q=reopening
Diffstat (limited to 'docs/howto')
-rw-r--r--docs/howto/custom-model-fields.txt4
-rw-r--r--docs/howto/initial-data.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/howto/custom-model-fields.txt b/docs/howto/custom-model-fields.txt
index c4621c8500..5f563d920b 100644
--- a/docs/howto/custom-model-fields.txt
+++ b/docs/howto/custom-model-fields.txt
@@ -98,7 +98,7 @@ Normally, you're either writing a Django field to match a particular database
column type, or you will need a way to convert your data to, say, a string.
For our ``Hand`` example, we could convert the card data to a string of 104
-characters by concatenating all the cards together in a pre-determined order --
+characters by concatenating all the cards together in a predetermined order --
say, all the *north* cards first, then the *east*, *south* and *west* cards. So
``Hand`` objects can be saved to text or character columns in the database.
@@ -234,7 +234,7 @@ The counterpoint to writing your ``__init__()`` method is writing the
:meth:`~.Field.deconstruct` method. It's used during :doc:`model migrations
</topics/migrations>` to tell Django how to take an instance of your new field
and reduce it to a serialized form - in particular, what arguments to pass to
-``__init__()`` to re-create it.
+``__init__()`` to recreate it.
If you haven't added any extra options on top of the field you inherited from,
then there's no need to write a new ``deconstruct()`` method. If, however,
diff --git a/docs/howto/initial-data.txt b/docs/howto/initial-data.txt
index aafe14cc76..7a43196957 100644
--- a/docs/howto/initial-data.txt
+++ b/docs/howto/initial-data.txt
@@ -2,7 +2,7 @@
How to provide initial data for models
======================================
-It's sometimes useful to pre-populate your database with hard-coded data when
+It's sometimes useful to prepopulate your database with hard-coded data when
you're first setting up an app. You can provide initial data with migrations or
fixtures.
@@ -76,7 +76,7 @@ You'll store this data in a ``fixtures`` directory inside your app.
You can load data by calling :djadmin:`manage.py loaddata <loaddata>`
``<fixturename>``, where ``<fixturename>`` is the name of the fixture file
you've created. Each time you run :djadmin:`loaddata`, the data will be read
-from the fixture and re-loaded into the database. Note this means that if you
+from the fixture and reloaded into the database. Note this means that if you
change one of the rows created by a fixture and then run :djadmin:`loaddata`
again, you'll wipe out any changes you've made.