From 61b8ea8656c6cc3577c9cd5178a105a450cb0252 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Mon, 12 Mar 2018 19:27:17 -0300
Subject: [PATCH] Add doctest_encoding and junit_suite_name ini options

---
 doc/en/reference.rst | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/en/reference.rst b/doc/en/reference.rst
index a027d5c9e..25e7fcef0 100644
--- a/doc/en/reference.rst
+++ b/doc/en/reference.rst
@@ -957,6 +957,13 @@ passed multiple times. The expected format is ``name=value``. For example::
    One or more doctest flag names from the standard ``doctest`` module.
    :doc:`See how pytest handles doctests <doctest>`.
 
+.. confval:: doctest_encoding
+
+   .. versionadded:: 3.1
+
+   Default encoding to use to decode text files with docstrings.
+   :doc:`See how pytest handles doctests <doctest>`.
+
 .. confval:: confcutdir
 
    Sets a directory where search upwards for ``conftest.py`` files stops.
@@ -1036,5 +1043,17 @@ passed multiple times. The expected format is ``name=value``. For example::
       as this is considered less error prone, see `#3155`_ for more details.
 
 
+.. confval:: junit_suite_name
+
+    .. versionadded:: 3.1
+
+    To set the name of the root test suite xml item, you can configure the ``junit_suite_name`` option in your config file:
+
+    .. code-block:: ini
+
+        [pytest]
+        junit_suite_name = my_suite
+
+
 
 .. _`#3155`: https://github.com/pytest-dev/pytest/issues/3155