From ba0375bf06e0e0c3b2377edf913b7fddfd5a0b40 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 23 Apr 2019 22:02:29 +0200
Subject: [PATCH] docs: add systemd type change to 19.03 release notes

---
 doc/release-notes/rl-1903.xml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/doc/release-notes/rl-1903.xml b/doc/release-notes/rl-1903.xml
index f2868dea4..b3c45370f 100644
--- a/doc/release-notes/rl-1903.xml
+++ b/doc/release-notes/rl-1903.xml
@@ -33,6 +33,32 @@ home.file."my file".source = ./. + "/file with spaces!";
 </programlisting>
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The type used for the systemd unit options under
+     <option>systemd.user.services</option>,
+     <option>systemd.user.sockets</option>, etc. has been changed to offer more
+     robust merging of configurations. If you don't override values within
+     systemd units then you are not affected by this change. Unfortunately, if
+     you do override unit values you may encounter errors.
+    </para>
+    <para>
+     In particular, if you get an error saying that a <quote>unique
+     option</quote> is <quote>defined multiple times</quote> then you need to
+     use the
+     <code xlink:href="https://nixos.org/nixos/manual/#sec-option-definitions-setting-priorities">mkForce</code>
+     function. For example,
+<programlisting language="nix">
+systemd.user.services.foo.Service.ExecStart = "/foo/bar";
+</programlisting>
+     becomes
+<programlisting language="nix">
+systemd.user.services.foo.Service.ExecStart = lib.mkForce "/foo/bar";
+</programlisting>
+     We had to make this change because the old merging was causing too many
+     confusing situations for people.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>