From 708256228bab55d595c170ac385b3d96a6777230 Mon Sep 17 00:00:00 2001
From: feuillemorte <fmorte@ya.ru>
Date: Tue, 16 Jan 2018 21:49:54 +0300
Subject: [PATCH 1/2] Add changelog entry

---
 changelog/234.trivial | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog/234.trivial

diff --git a/changelog/234.trivial b/changelog/234.trivial
new file mode 100644
index 0000000..a571622
--- /dev/null
+++ b/changelog/234.trivial
@@ -0,0 +1 @@
+Change terminology to master/worker in arguments to xdist (--max-worker-reset)

From 9efe14946a0db31d49e0635f40e290ddcde6cdda Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Tue, 16 Jan 2018 18:26:50 -0200
Subject: [PATCH 2/2] Improve changelog formatting

---
 changelog/234.trivial | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog/234.trivial b/changelog/234.trivial
index a571622..1184206 100644
--- a/changelog/234.trivial
+++ b/changelog/234.trivial
@@ -1 +1 @@
-Change terminology to master/worker in arguments to xdist (--max-worker-reset)
+Change terminology used by ``pytest-xdist`` to *master* and *worker* in arguments and messages (for example ``--max-worker-reset``).