diff --git a/docs/changelog.rst b/docs/changelog.rst
index 747fa12c1..57f1a17a5 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -39,10 +39,10 @@ Compatibility
 
 * Settings defined in `pytest.ini`/`tox.ini`/`setup.cfg` used to override
   `DJANGO_SETTINGS_MODULE` defined in the environment. Previously the order was
-  undocmented. Now, instead the settings from the environment will be used
-  instead. If you previously relied on overriding the enviornment variable, you
-  can instead specify `addopts = --ds=yourtestsettings` in the ini-file which
-  will use the test settings. See `PR #199
+  undocumented. Now, instead the settings from the environment will be used
+  instead. If you previously relied on overriding the environment variable,
+  you can instead specify `addopts = --ds=yourtestsettings` in the ini-file
+  which will use the test settings. See `PR #199
   <https://github.com/pytest-dev/pytest-django/pull/199>`_.
 
 * Support for Django 1.9.
diff --git a/docs/configuring_django.rst b/docs/configuring_django.rst
index 13a078655..f4a9b5342 100644
--- a/docs/configuring_django.rst
+++ b/docs/configuring_django.rst
@@ -41,9 +41,12 @@ Example contents of pytest.ini::
 Order of choosing settings
 --------------------------
 
-If `--ds`, the environment variable and the pytest.ini configuration is used at
-the same time, pytest-django will first prefer using settings from the command
-line option `--ds`, then the environment variable and last the pytest.ini.
+When the command option `--ds`, the environment variable and the pytest.ini
+configuration is used at the same time, pytest-django will prefer using
+settings from the command line option `--ds`, then the environment variable and
+last the pytest.ini.
+You can use `addopts = --ds=yourtestsettings` in your pytest configuration
+to automatically add the `--ds` option.
 
 Using django-configurations
 ---------------------------