From 16bff06a507a9e01dd7fa87e917c3cdbcddd628f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Wed, 14 Nov 2018 08:53:53 +0200
Subject: [PATCH] Update release notes and upgrading document

Added a section about unknown global parameters being treated as errors to
both documents and fixed the passwd deprecation description in the
upgrading document.
---
 .../Release-Notes/MaxScale-2.3.1-Release-Notes.md |  6 ++++++
 .../Upgrading/Upgrading-To-MaxScale-2.3.md        | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

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 58ce331fd..5d055a2e9 100644
--- a/Documentation/Release-Notes/MaxScale-2.3.1-Release-Notes.md
+++ b/Documentation/Release-Notes/MaxScale-2.3.1-Release-Notes.md
@@ -10,6 +10,12 @@ report at [Jira](https://jira.mariadb.org).
 
 ## Changed Features
 
+### Unknown global parameters
+
+Unknown global parameters or parameters with invalid values are now treated as
+errors. If MaxScale refuses to start after upgrading to 2.3.1, check whether it
+is due to an unknown global parameter.
+
 ### REST-API
 
 #### `/v1/sessions`
diff --git a/Documentation/Upgrading/Upgrading-To-MaxScale-2.3.md b/Documentation/Upgrading/Upgrading-To-MaxScale-2.3.md
index bccf17197..5c41af177 100644
--- a/Documentation/Upgrading/Upgrading-To-MaxScale-2.3.md
+++ b/Documentation/Upgrading/Upgrading-To-MaxScale-2.3.md
@@ -9,11 +9,16 @@ to the [ChangeLog](../Changelog.md).
 Before starting the upgrade, we recommend you back up your current
 configuration file.
 
-### `passwd` is no longer accepted
+### Unknown global parameters
 
-In the configuration file, passwords for monitors and services must be
-specified using `password`; the support for the earlier deprecated
-`passwd` has been removed. That is, the following
+All unknown parameters are now treated as errors. Check your configuration for
+errors if MaxScale fails to start after upgrading to 2.3.1.
+
+### `passwd` is deprecated
+
+In the configuration file, passwords for monitors and services should be
+specified using `password`; the support for the deprecated
+`passwd` will be removed in the future. That is, the following
 ```
 [The-Service]
 type=service
@@ -25,7 +30,7 @@ type=monitor
 passwd=some-monitor-password
 ...
 ```
-must be changed to
+should be changed to
 ```
 [The-Service]
 type=service