Combine the 2.0 release notes

Author: ashawley

CHANGELOG.md

@@ -2,63 +2,39 @@
 
 ## 2.0.0 (2021-05-13)
 
-Published for Scala 2.12 and 2.13, Scala 3.0.0 (and -RC3), Scala.js 1.5, and Scala Native 0.4.
+Not binary compatible with Scala XML 1.3.0.
 
-- Support Scala 3.0.0
-- Drop `scala.xml.Properties
-- Remove deprecated logging
+Published for Scala 2.12, 2.13, and 3.0 (and 3.0.0-RC3), Scala.js 1.5,
+and Scala Native 0.4.
 
-## 2.0.0-RC1 (2021-03-29)
+Artifacts are no longer published for Scala 2.11 and Scala.js 0.6.
 
-NOTICE: The safe-defaults change may be a breaking change for some users. Details on PR.
-
-- Set safe defaults for parser settings
-- Use a `ThreadLocal` to allow reusing parser instances
-- Declare version policy
-
-Published for Scala 2.12 and 2.13, Scala 3.0.0-RC2 and -RC1, Scala.js 1.5, and Scala Native 0.4.
-
-## 2.0.0-M4 (2021-02-16)
-
-Published for Scala 2.12 and 2.13, Scala 3.0.0-RC1 and -M3, Scala.js 1.5, and Scala Native 0.4.
-
-- Support Scala 3.0.0-RC1 (and drop 3.0.0-M2)
-- Upgrade Scala.js to 1.5.0
-
-## 2.0.0-M3 (2021-01-30)
-
-Published for Scala 2.12 and 2.13, Scala 3.0.0-M2 and -M3, Scala.js 1.4, and Scala Native 0.4.
-
-- Add support for Scala Native 0.4
-- Make RuleTransformer fully recursive
-- Fix invalid comment edge case
-
-## 2.0.0-M2 (2020-09-15)
-
-Published for Scala 2.12 and 2.13, Scala.js 1.2.0,
-and Dotty 0.27.0-RC1.
-
-### Removed
-
-- Removed `scala.xml.dtd.ElementValidator`
-
-## 2.0.0-M1 (2019-10-21)
-
-Not binary compatible with Scala XML 1.2.0.
-
-Published for Scala 2.12, 2.13 and Scala.js 0.6, 1.0.0-M8.
-Artifacts are no longer published for Scala 2.11.
-
-Some deprecated elements have been removed; see the "[Removed](#Removed)" section below.
+A number of deprecated elements have been removed from the library;
+see the "[Removed](#Removed)" section below.  The library's JAR byte
+size is about 15% smaller.
 
 ### Added
 
+- Add `scala.xml.transform.NestingTransformer`, to apply a single rule
+  recursively, to give the original behavior of `RuleTransformer`, see
+  below.
 - The `apiURL` is now published in ivy metadata so that hyperlinks
   exist in downstream projects that reference Scala XML in their
   Scaladocs.
+- Declare version policy of with early-semver in Mima with
+  sbt-version-policy plugin
 
 ### Changed
 
+- Changes to the default parser settings for the JDK SAXParser, see
+  [Safe parser defaults](https://github.com/scala/scala-xml/wiki/Safer-parser-defaults)
+  page on the wiki.
+- The parser used by the load methods from `scala.xml.XML` and from
+  `scala.xml.factory.XMLLoader` is now a `ThreadLocal` instance of
+  SAXParser to reuse the parser instance and avoid repeatedly
+  allocating one on every file load.
+- Improve `scala.xml.transform.RuleTransformer` to apply all rules recursively.
+- Reject invalid comment text that ends in a dash (-) in `scala.xml.Comment`.
 - Changed use of `scala.collection.mutable.Stack` in `FactoryAdapter` to a
   `scala.collection.immutable.List`.  These members were affected.
   - `attribStack`
@@ -82,8 +58,8 @@ Most of these deletions are of vestigial code that is either unused,
 of poor quality or both.  Very few users of Scala XML will even notice
 the removed parts.  Most users will not be affected.
 
-The deletions represent about one thousand lines of code (sloc).  By
-comparison Scala XML is 10,000 sloc, so this is about 10% reduction in
+The deletions represent about 1500 lines of code (sloc).  By
+comparison Scala XML is 10,000 sloc, so this is about 15% reduction in
 sloc.  The code that supports XML literals is maintained upstream in
 the Scala compiler, not in the Scala XML library.
 
@@ -101,3 +77,6 @@ the Scala compiler, not in the Scala XML library.
 - Remove `scala.xml.dtd.ElementValidator`
 - Remove `scala.xml.factory.Binder`
 - Remove `scala.xml.parsing.ValidatingMarkupHandler`
+- Remove `scala.xml.Properties`
+- Remove `scala.xml.factory.LoggedNodeFactory`
+- Remove `scala.xml.parsing.MarkupHandler.log`