From c2fca99f975c6656f7a7d1355ca098606380f2be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 31 Dec 2020 08:49:13 +0100
Subject: Revert "Merge branch 'master' into staging-next"

This reverts commit f19b7b03a03b7f1d5beb44471eb9298de4b9e186, reversing
changes made to 572a864d024b0c91ac39133f35364362b2376c07.

Sorry. I pushed the wrong staging-next (the one that had my master
merged in). This was not intended.
---
 nixos/doc/manual/man-nixos-rebuild.xml | 37 ++--------------------------------
 1 file changed, 2 insertions(+), 35 deletions(-)

(limited to 'nixos/doc')

diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index 4510fdd44225..d0ff81c1dbb3 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -112,18 +112,6 @@
     <option>-I</option>
     <replaceable>path</replaceable>
    </arg>
-   <arg>
-    <option>-L</option>
-   </arg>
-   <arg>
-    <option>--refresh</option>
-   </arg>
-   <arg>
-    <option>--no-net</option>
-   </arg>
-   <arg>
-    <option>--impure</option>
-   </arg>
    <arg>
     <group choice='req'>
      <arg choice='plain'><option>--verbose</option></arg>
@@ -142,18 +130,6 @@
     </group>
     <replaceable>number</replaceable>
    </arg>
-   <arg>
-    <option>--fallback</option>
-   </arg>
-   <arg>
-    <option>--repair</option>
-   </arg>
-   <arg>
-    <group choice='req'>
-     <arg choice='plain'><option>--no-build-output</option></arg>
-     <arg choice='plain'><option>-Q</option></arg>
-    </group>
-   </arg>
    <arg>
     <group choice='req'>
      <arg choice='plain'><option>--keep-failed</option></arg>
@@ -591,19 +567,10 @@
 
   <para>
    In addition, <command>nixos-rebuild</command> accepts various Nix-related
-   flags: <option>-I</option>, <option>--max-jobs</option> / <option>-j</option>,
+   flags, including <option>--max-jobs</option> / <option>-j</option>,
    <option>--show-trace</option>, <option>--keep-failed</option>,
-   <option>--keep-going</option>, <option>--impure</option>,  and <option>--verbose</option> /
-   <option>--builders</option>, <option>--show-trace</option>,
-   <option>--fallback</option>, <option>--repair</option>,
-   <option>--no-build-output</option> / <option>-Q</option>,
-   <option>--keep-failed</option> / <option>-K</option>,
-   <option>--keep-going</option> / <option>-k</option> and <option>--verbose</option> /
+   <option>--keep-going</option>, <option>--impure</option>, and <option>--verbose</option> /
    <option>-v</option>. See the Nix manual for details.
-
-   The following Nix flags that are support by the upcoming nix 2.4 version:
-   <option>-L</option>, <option>--refresh</option>, <option>--no-net</option>,
-   <option>--no-net</option>, <option>--impure</option>. See <command>nix --help</command> or <command>nix build --help</command> for details.
   </para>
  </refsection>
 
-- 
cgit v1.2.3