From 7e135934528732c6628c4ba83fa12ed00b951889 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Mon, 3 Sep 2018 14:15:23 -0300
Subject: [PATCH] Add CHANGELOG entries for #2452

Fix #2452
Fix #2684
---
 changelog/2452.feature.rst | 5 +++++
 changelog/2452.removal.rst | 2 ++
 2 files changed, 7 insertions(+)
 create mode 100644 changelog/2452.feature.rst
 create mode 100644 changelog/2452.removal.rst

diff --git a/changelog/2452.feature.rst b/changelog/2452.feature.rst
new file mode 100644
index 000000000..847e9540f
--- /dev/null
+++ b/changelog/2452.feature.rst
@@ -0,0 +1,5 @@
+Internal pytest warnings are now issued using the standard ``warnings`` module, making it possible to use
+the standard warnings filters to manage those warnings. This introduces ``PytestWarning``,
+``PytestDeprecationWarning`` and ``RemovedInPytest4Warning`` warning types as part of the public API.
+
+Consult `the documentation <https://docs.pytest.org/en/latest/warnings.html#internal-pytest-warnings>`_ for more info.
diff --git a/changelog/2452.removal.rst b/changelog/2452.removal.rst
new file mode 100644
index 000000000..3c60f8803
--- /dev/null
+++ b/changelog/2452.removal.rst
@@ -0,0 +1,2 @@
+The functions ``Node.warn`` and ``Config.warn`` have been deprecated. Instead of ``Node.warn`` users should now use
+``Node.std_warn``, while ``Config.warn`` should be replaced by the standard ``warnings.warn``.