diff --git a/UPGRADE-3.1.md b/UPGRADE-3.1.md
index bdaa959b6b..2fa48dd6cd 100644
--- a/UPGRADE-3.1.md
+++ b/UPGRADE-3.1.md
@@ -15,6 +15,7 @@ Form
 
  * The `choices_as_values` option of the `ChoiceType` has been deprecated and
    will be removed in Symfony 4.0.
+
  * Support for data objects that implements both `Traversable` and `ArrayAccess`
    in `ResizeFormListener::preSubmit` method has been deprecated and will be
    removed in Symfony 4.0.
@@ -25,8 +26,8 @@ FrameworkBundle
  * As it was never an officially supported feature, the support for absolute
    template paths has been deprecated and will be removed in Symfony 4.0.
 
- * The following form types registered as services are deprecated since 3.1
-   and will be removed in 4.0; use their fully-qualified class name instead:
+ * The following form types registered as services have been deprecated and
+   will be removed in Symfony 4.0; use their fully-qualified class name instead:
 
     - `"form.type.birthday"`
     - `"form.type.checkbox"`
@@ -75,7 +76,8 @@ Serializer
 Yaml
 ----
 
- * Deprecated usage of `%` at the beginning of an unquoted string.
+ * Usage of `%` at the beginning of an unquoted string has been deprecated and
+   will lead to a `ParseException` in Symfony 4.0.
 
  * The `Dumper::setIndentation()` method is deprecated and will be removed in
    Symfony 4.0. Pass the indentation level to the constructor instead.
@@ -140,7 +142,8 @@ Yaml
    Yaml::dump(array('foo' => new A(), 'bar' => 1), 0, 0, Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE);
    ```
 
- * Deprecated support for passing `true`/`false` as the fifth argument to the `dump()` method to toggle object support.
+ * Deprecated support for passing `true`/`false` as the fifth argument to the
+   `dump()` method to toggle object support.
 
    Before:
 
@@ -160,5 +163,5 @@ Yaml
 Validator
 ---------
 
- * The `DateTimeValidator::PATTERN` constant is deprecated and will be removed in
-   Symfony 4.0.
+ * The `DateTimeValidator::PATTERN` constant has been deprecated and will be
+   removed in Symfony 4.0.
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index cc5d789a31..5d455f18af 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -15,10 +15,15 @@ Form
  * The `choices_as_values` option of the `ChoiceType` has been removed.
 
  * Support for data objects that implements both `Traversable` and
-   `ArrayAccess` in `ResizeFormListener::preSubmit` method has been removed
+   `ArrayAccess` in `ResizeFormListener::preSubmit` method has been removed.
 
- * The following form types registered as services has been removed; use
-   their fully-qualified class name instead:
+FrameworkBundle
+---------------
+
+ * Support for absolute template paths has been removed.
+
+ * The following form types registered as services have been removed; use their
+   fully-qualified class name instead:
 
     - `"form.type.birthday"`
     - `"form.type.checkbox"`
@@ -50,16 +55,12 @@ Form
     - `"form.type.submit"`
     - `"form.type.reset"`
 
-FrameworkBundle
----------------
-
- * Support for absolute template paths has been removed from the template name parser.
-
 HttpKernel
 ----------
 
  * Possibility to pass objects as URI attributes to the ESI and SSI renderers
-   has been removed. The inline fragment renderer should be used with object attributes.
+   has been removed. The inline fragment renderer should be used with object
+   attributes.
 
 Serializer
 ----------
@@ -136,7 +137,8 @@ Yaml
    Yaml::dump(array('foo' => new A(), 'bar' => 1), 0, 0, Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE);
    ```
 
- * Removed support for passing `true`/`false` as the fifth argument to the `dump()` method to toggle object support.
+ * Removed support for passing `true`/`false` as the fifth argument to the
+   `dump()` method to toggle object support.
 
    Before: