tweaks

Author: rachel-mack

source/upgrade.txt

@@ -61,21 +61,18 @@ the version after v4.0 including any listed under v4.5.
 Version 5.0 Breaking Changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- This driver version introduces the following changes to the ``ConnectionId`` class:
+This driver version introduces the following breaking changes:
+
+- Changes to the ``ConnectionId`` class:
 
   - The ``ConnectionId`` constructor now accepts a value of type ``long`` as its second
     parameter instead of type ``int``. Similarly, the constructor now accepts a value of
     type ``Long`` as its third parameter instead of type ``Integer``. Because this change breaks
     binary compatibility, recompile any existing code that calls the ``ConnectionId`` constructor.
 
-- Changes the data type of the timeout duration parameter in the
-  ``SocketSettings.Builder.connectTimeout()`` and
-  ``SocketSettings.Builder.readTimeout()`` methods. The data type of this
-  parameter is now ``long`` instead of ``int``. To view an example that shows
-  how to call ``SocketSettings`` methods, see the :ref:`SocketSettings Example
-  <java-socketsettings-example>` in the Specify MongoClient Settings guide. This
-  change breaks binary compatibility (requires recompiling) but does not require
-  code changes.
+  - The ``withServerValue()`` method now accepts a parameter of type ``long`` rather than
+    type ``int``. This change breaks binary compatibility, so you must recompile any code
+    that calls the ``withServerValue()`` method.
 
   - The ``getServerValue()`` method now returns a value of type ``Long`` instead of type
     ``Integer``. Similarly, the ``getLocalValue()`` method returns a value of type
@@ -116,15 +113,13 @@ Version 5.0 Breaking Changes
 
 .. _java-breaking-changes-v5.0-observables:
 
-- This driver version removes the
-  ``org.mongodb.scala.ObservableImplicits.ToSingleObservableVoid`` implicit
-  class. This means the ``org.reactivestreams.Publisher[Void]`` type no longer
-  converts automatically to ``org.mongodb.scala.SingleObservable[Void]``. The
-  API also exposes ``org.mongodb.scala.Observable[Unit]`` instead of
+- Removes the ``org.mongodb.scala.ObservableImplicits.ToSingleObservableVoid``
+  implicit class. This means the ``org.reactivestreams.Publisher[Void]`` type no
+  longer converts automatically to ``org.mongodb.scala.SingleObservable[Void]``.
+  The API also exposes ``org.mongodb.scala.Observable[Unit]`` instead of
   ``org.mongodb.scala.Observable[Void]``.
 
   .. After the 5.0 Scala API docs are released, this line will be uncommented.
-
     For more information, see the `Observable trait documentation <https://mongodb.github.io/mongo-java-driver/5.0/apidocs/mongo-scala-driver/org/mongodb/scala/Observable.html>`__.
 
 - Changes how ``ClusterSettings`` computes
@@ -246,14 +241,6 @@ Version 5.0 Breaking Changes
   constructor that includes an ``errorLabels`` parameter. Instead, you can use
   the error labels included in the top-level response document.
 
-- Removes the
-  ``org.mongodb.scala.ObservableImplicits.ToSingleObservableVoid`` implicit
-  class from the Scala driver package. This means the
-  ``org.reactivestreams.Publisher[Void]`` type no longer
-  converts automatically to ``org.mongodb.scala.SingleObservable[Void]``. The
-  API also exposes ``org.mongodb.scala.Observable[Unit]`` instead of
-  ``org.mongodb.scala.Observable[Void]``. 
-
 - Introduces the following changes to the ``ConnectionId`` class:
 
   - The ``ConnectionId`` constructor now accepts a value of type ``long`` as its second

source/whats-new.txt

@@ -285,9 +285,10 @@ What's New in 4.8
 
 .. important:: Deprecation Notice
 
-   The ``IterableCodec`` and ``MapCodec`` classes are deprecated.
-   Use ``MapCodecProvider`` instead of ``MapCodec`` and ``CollectionCodecProvider``
-   instead of ``IterableCodec``.
+   The ``MapCodec`` and ``IterableCodec`` classes are deprecated.
+   Instead of ``MapCodec``, use ``MapCodecProvider``. Instead of ``IterableCodec``,
+   use ``CollectionCodecProvider``, or ``IterableCodecProvider`` for ``Iterable``
+   types that aren't ``Collection`` types.
 
 Behavioral changes with the 4.8 driver release include: