summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2019-03-22 19:18:47 +0100
committerGitHub <noreply@github.com>2019-03-22 19:18:47 +0100
commit9aa57902cc9bb5c87204cc8b9b9b5a3b7587f64c (patch)
tree7e8ab9473061b54e928fdd05d08bb5165e57b3f3
parenta7044d33e0272b2cd4e49c908b398be6badce28d (diff)
parenta54e41a673c309b7d8d88a899a1f71a3428a0930 (diff)
downloadnixpkgs-9aa57902cc9bb5c87204cc8b9b9b5a3b7587f64c.tar
nixpkgs-9aa57902cc9bb5c87204cc8b9b9b5a3b7587f64c.tar.gz
nixpkgs-9aa57902cc9bb5c87204cc8b9b9b5a3b7587f64c.tar.bz2
nixpkgs-9aa57902cc9bb5c87204cc8b9b9b5a3b7587f64c.tar.lz
nixpkgs-9aa57902cc9bb5c87204cc8b9b9b5a3b7587f64c.tar.xz
nixpkgs-9aa57902cc9bb5c87204cc8b9b9b5a3b7587f64c.tar.zst
nixpkgs-9aa57902cc9bb5c87204cc8b9b9b5a3b7587f64c.zip
Merge pull request #57938 from flokli/network-manager-rename-changelog
network-manager: move para about service rename to 19.09 changelog
-rw-r--r--nixos/doc/manual/release-notes/rl-1903.xml7
-rw-r--r--nixos/doc/manual/release-notes/rl-1909.xml23
2 files changed, 23 insertions, 7 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index fab5b5aecb9..3871d54c59c 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -218,13 +218,6 @@
    </listitem>
    <listitem>
     <para>
-      The NetworkManager systemd unit was renamed back from network-manager.service to
-      NetworkManager.service for better compatibility with other applications expecting this name.
-      The same applies to ModemManager where modem-manager.service is now called ModemManager.service again.
-    </para>
-   </listitem>
-   <listitem>
-    <para>
      Package <varname>rabbitmq_server</varname> is renamed to
      <varname>rabbitmq-server</varname>.
     </para>
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index f54592b6bf6..925dadcb03d 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -46,6 +46,29 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
+         xml:id="sec-release-19.09-incompatibilities">
+  <title>Backward Incompatibilities</title>
+
+  <para>
+   When upgrading from a previous release, please be aware of the following
+   incompatible changes:
+  </para>
+
+  <itemizedlist>
+   <listitem>
+    <para>
+      The NetworkManager systemd unit was renamed back from network-manager.service to
+      NetworkManager.service for better compatibility with other applications expecting this name.
+      The same applies to ModemManager where modem-manager.service is now called ModemManager.service again.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
+
+ <section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
          xml:id="sec-release-19.09-notable-changes">
   <title>Other Notable Changes</title>