From e862dd637350ddd1812a6c1fb5811c6464e74ff5 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 24 Sep 2019 09:36:49 +0200
Subject: networking.useDHCP: add release notes and docs

---
 nixos/doc/manual/release-notes/rl-1909.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'nixos/doc/manual/release-notes')

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 58ab7207f533..012c2e4f9929 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -484,6 +484,14 @@
        (<literal>citrix_workspace</literal>).
      </para>
    </listitem>
+   <listitem>
+    <para>
+      The <option>networking.useDHCP</option> option is unsupported in combination with
+      <option>networking.useNetworkd</option> in anticipation of defaulting to it by default.
+      It has to be set to <literal>false</literal> and enabled per
+      interface with <option>networking.interfaces.&lt;name&gt;.useDHCP = true;</option>
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
-- 
cgit 1.4.1