summaryrefslogtreecommitdiff
path: root/docs/internals/contributing/writing-code
diff options
context:
space:
mode:
Diffstat (limited to 'docs/internals/contributing/writing-code')
-rw-r--r--docs/internals/contributing/writing-code/unit-tests.txt2
-rw-r--r--docs/internals/contributing/writing-code/working-with-git.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/internals/contributing/writing-code/unit-tests.txt b/docs/internals/contributing/writing-code/unit-tests.txt
index bb248a68cf..6a5bd5ab8f 100644
--- a/docs/internals/contributing/writing-code/unit-tests.txt
+++ b/docs/internals/contributing/writing-code/unit-tests.txt
@@ -311,7 +311,7 @@ You can also install the database adapter(s) of your choice using
If you want to test the memcached cache backend, you'll also need to define
a :setting:`CACHES` setting that points at your memcached instance.
-To run the GeoDjango tests, you will need to :doc:`setup a spatial database
+To run the GeoDjango tests, you will need to :doc:`set up a spatial database
and install the Geospatial libraries</ref/contrib/gis/install/index>`.
Each of these dependencies is optional. If you're missing any of them, the
diff --git a/docs/internals/contributing/writing-code/working-with-git.txt b/docs/internals/contributing/writing-code/working-with-git.txt
index 9b8713b476..1a70579845 100644
--- a/docs/internals/contributing/writing-code/working-with-git.txt
+++ b/docs/internals/contributing/writing-code/working-with-git.txt
@@ -24,7 +24,7 @@ your operating system's package manager.
Django's `Git repository`_ is hosted on `GitHub`_, and it is recommended
that you also work using GitHub.
-After installing Git, the first thing you should do is setup your name and
+After installing Git, the first thing you should do is set up your name and
email::
$ git config --global user.name "Your Real Name"
@@ -55,7 +55,7 @@ cloned directory, so switch to it now::
Your GitHub repository will be called "origin" in Git.
-You should also setup ``django/django`` as an "upstream" remote (that is, tell
+You should also set up ``django/django`` as an "upstream" remote (that is, tell
git that the reference Django repository was the source of your fork of it)::
git remote add upstream git@github.com:django/django.git