From c233c86457273d63a32d3091d6887ad0ccba709e Mon Sep 17 00:00:00 2001
From: Ceki Gulcu <ceki@qos.ch>
Date: Thu, 1 Jul 2021 23:26:31 +0200
Subject: [PATCH] typo fixes and minor edits

---
 slf4j-api/src/main/java/org/slf4j/MDC.java | 2 ++
 slf4j-site/src/site/pages/news.html        | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/slf4j-api/src/main/java/org/slf4j/MDC.java b/slf4j-api/src/main/java/org/slf4j/MDC.java
index 7b1f12b2..36fbf8cc 100644
--- a/slf4j-api/src/main/java/org/slf4j/MDC.java
+++ b/slf4j-api/src/main/java/org/slf4j/MDC.java
@@ -227,6 +227,8 @@ public class MDC {
      * then copying the map passed as parameter. The context map passed as
      * parameter must only contain keys and values of type String.
      * 
+     * Null valued argument is allowed (since SLF4J version 2.0.0).
+     * 
      * @param contextMap
      *          must contain only keys and values of type String
      * @since 1.5.1
diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html
index 53861549..d1eaa30c 100755
--- a/slf4j-site/src/site/pages/news.html
+++ b/slf4j-site/src/site/pages/news.html
@@ -92,7 +92,14 @@
    <code>Set</code>. The spurious calls to
    <code>MessageFormatter.format()</code> were removed fixing <a
    href="https://jira.qos.ch/browse/SLF4J-421">SLF4J-421</a> and <a
-   href="https://jira.qos.ch/browse/SLF4J-287">SLF4J-287</a>.
+   href="https://jira.qos.ch/browse/SLF4J-287">SLF4J-287</a>.</p>
+
+   <p>The implementations of the
+   <code>MDCAdapter.setContextMap()</code> methods shipping with SLF4J
+   now cater for a null argument. This fixes <a
+   href="https://jira.qos.ch/browse/SLF4J-414">SLF4J-414</a>. Both
+   Alexei Orischenko and Kengo TODA kindly provided PRs for this
+   issue.</p>