From ad0b82d067ae29d41662e225552470c2507a7c39 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 25 Feb 2019 19:36:23 +0100
Subject: [PATCH] nixos-rebuild: add changelog/docs for edit subcommand

---
 nixos/doc/manual/man-nixos-rebuild.xml     | 13 +++++++++++++
 nixos/doc/manual/release-notes/rl-1903.xml |  5 +++++
 2 files changed, 18 insertions(+)

diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index b6a247286d4..cc223ff1a32 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -38,6 +38,10 @@
     <option>dry-activate</option>
    </arg>
 
+   <arg choice='plain'>
+    <option>edit</option>
+   </arg>
+
    <arg choice='plain'>
     <option>build-vm</option>
    </arg>
@@ -188,6 +192,15 @@ $ nix-build /path/to/nixpkgs/nixos -A system
       </para>
      </listitem>
     </varlistentry>
+    <varlistentry>
+     <term>
+      <option>edit</option>
+     </term>
+     <listitem>
+      <para>
+        Opens <filename>configuration.nix</filename> in the default editor.
+      </para>
+     </listitem>
     <varlistentry>
      <term>
       <option>build-vm</option>
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 0a5fe858f07..a78791971e8 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -673,6 +673,11 @@
        An upgrade guide can be found <link xlink:href="https://www.open-mpi.org/faq/?category=mpi-removed">here</link>.
      </para>
    </listitem>
+   <listitem>
+     <para>
+       A new subcommand <command>nixos-rebuild edit</command> was added.
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>