From edaf4ad42e7304c88f1b0f5d934110ff7cf7aa23 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Mon, 5 Nov 2018 10:47:24 +0200
Subject: [PATCH] Add deprecation notes to release notes

---
 Documentation/Reference/MaxAdmin.md            |  2 --
 .../MaxScale-2.3.1-Release-Notes.md            | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Documentation/Reference/MaxAdmin.md b/Documentation/Reference/MaxAdmin.md
index bc1dec8ae..b8f13e90f 100644
--- a/Documentation/Reference/MaxAdmin.md
+++ b/Documentation/Reference/MaxAdmin.md
@@ -393,8 +393,6 @@ alter:
 
 set:
     set server - Set the status of a server
-    set pollsleep - Set poll sleep period
-    set nbpolls - Set non-blocking polls
     set log_throttling - Set the log throttling configuration
 
 clear:
diff --git a/Documentation/Release-Notes/MaxScale-2.3.1-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.3.1-Release-Notes.md
index e7eeaed57..504c7e9da 100644
--- a/Documentation/Release-Notes/MaxScale-2.3.1-Release-Notes.md
+++ b/Documentation/Release-Notes/MaxScale-2.3.1-Release-Notes.md
@@ -23,6 +23,24 @@ release. The functionality in `mmmon` has been largely obsoleted by the
 advancements in `mariadbmon`. The `ndbclustermon` is largely obsolete due to the
 fact that there are virtually no users who use it.
 
+### Deprecated options
+
+The following configuration file options have been deprecated and will
+be removed in 2.4.
+
+#### Global section
+* `non_blocking_polls`
+* `poll_sleep`
+* `thread_stack_size`
+
+#### Services and Monitors
+* `passwd`
+
+### MaxAdmin
+
+The commands `set pollsleep` and `set nbpolls` have been deprecated and
+will be removed in 2.4.
+
 ## New Features
 
 ### MaxCtrl