From a3353c49fda57af5cb01abf99bed19daf3e27569 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
Date: Sun, 6 Dec 2015 16:13:55 +0100
Subject: [PATCH] prepare release 2.8.4 - changelog updates + version bump

---
 CHANGELOG           | 7 +++++--
 _pytest/__init__.py | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9e8d104b9..c07990028 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
-2.8.4.dev
----------
+2.8.4
+-----
 
 - fix #1190: ``deprecated_call()`` now works when the deprecated
   function has been already called by another test in the same
@@ -18,6 +18,9 @@
 - fix the summary printed when no tests did run.
   Thanks Florian Bruhin for the PR.
 
+- a number of documentation modernizations wrt good practices.
+  Thanks Bruno Oliveira for the PR.
+
 2.8.3
 -----
 
diff --git a/_pytest/__init__.py b/_pytest/__init__.py
index 1896cecd7..df1f82746 100644
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '2.8.4.dev1'
+__version__ = '2.8.4'