Merge branch 'doc'

Author: RKrahl

doc/src/configuration.rst

@@ -1,17 +1,17 @@
 Configuring pytest-dependency
 =============================
 
-This section explains configuration options for pytest-dependency and
-also other configuration that is recommended for the use with
-pytest-dependency.
+This section explains configuration options for pytest-dependency, but
+also options for pytest itself or other plugins that are recommended
+for the use with pytest-dependency.
 
 Configuration file options
 --------------------------
 
 Configuration file options can be set in the `ini file`.
 
    minversion
-      This is a builtin configuration of pytest itself.  Since
+      This is a builtin configuration option of pytest itself.  Since
       pytest-dependency requires pytest 2.8.0 or newer, it is
       recommended to set this option accordingly.