Merge pull request #7240 from DahlitzFlorian/fix-issue-7233

asottile · web-flow · commit c594bbbd19af · 2020-05-23T12:31:27.000-07:00
Add note about --strict and --strict-markers to references
diff --git a/AUTHORS b/AUTHORS
@@ -103,6 +103,7 @@ Fabio Zadrozny
 Felix Nieuwenhuizen
 Feng Ma
 Florian Bruhin
+Florian Dahlitz
 Floris Bruynooghe
 Gabriel Reis
 Gene Wood
diff --git a/changelog/7233.doc.rst b/changelog/7233.doc.rst
@@ -0,0 +1 @@
+Add a note about ``--strict`` and ``--strict-markers`` and the preference for the latter one.
diff --git a/doc/en/reference.rst b/doc/en/reference.rst
@@ -1447,6 +1447,11 @@ passed multiple times. The expected format is ``name=value``. For example::
             slow
             serial
 
+    .. note::
+        The use of ``--strict-markers`` is highly preferred. ``--strict`` was kept for
+        backward compatibility only and may be confusing for others as it only applies to
+        markers and not to other options.
+
 .. confval:: minversion
 
    Specifies a minimal pytest version required for running tests.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Add a note about ``--strict`` and ``--strict-markers`` and the preference for the latter one.