From 8979b2a9d78161739fe870ef71be800067cff33a Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
Date: Fri, 26 Jan 2018 11:26:48 +0100
Subject: [PATCH] document empty_parameterset in customize.rst

---
 doc/en/customize.rst | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/doc/en/customize.rst b/doc/en/customize.rst
index 6edeedf98..bbff9d189 100644
--- a/doc/en/customize.rst
+++ b/doc/en/customize.rst
@@ -346,3 +346,21 @@ passed multiple times. The expected format is ``name=value``. For example::
         # content of pytest.ini
         [pytest]
         console_output_style = classic
+
+
+.. confval:: empty_parameterset
+
+	.. versionadded:: 3.4
+
+	allows to pick the action for empty parametersets in parameterization
+
+	* ``skip`` skips tests with a empty parameterset
+	* ``xfail`` marks tests with a empty parameterset as xfail(run=False)
+
+	The default is ``skip``, it will be shifted to xfail in future.
+
+	.. code-block:: ini
+
+        # content of pytest.ini
+        [pytest]
+        empty_parameterset = xfail
\ No newline at end of file