summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-09-20 18:37:17 +0200
committerEelco Dolstra <edolstra@gmail.com>2020-02-05 23:15:18 +0100
commitfb051f0dece79d2ac28ad368d6e26289d780bc0a (patch)
treedfb93e77a3e052eec3f601855dbdedbfa780cf2c /nixos/doc
parent20087bd5534e115a1c7ddd5279610bc437c39046 (diff)
downloadnixpkgs-fb051f0dece79d2ac28ad368d6e26289d780bc0a.tar
nixpkgs-fb051f0dece79d2ac28ad368d6e26289d780bc0a.tar.gz
nixpkgs-fb051f0dece79d2ac28ad368d6e26289d780bc0a.tar.bz2
nixpkgs-fb051f0dece79d2ac28ad368d6e26289d780bc0a.tar.lz
nixpkgs-fb051f0dece79d2ac28ad368d6e26289d780bc0a.tar.xz
nixpkgs-fb051f0dece79d2ac28ad368d6e26289d780bc0a.tar.zst
nixpkgs-fb051f0dece79d2ac28ad368d6e26289d780bc0a.zip
nixos-{rebuild,container}: Use flakeref#attrpath syntax
This makes them consistent with the 'nix' command line.
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/man-nixos-rebuild.xml25
1 files changed, 4 insertions, 21 deletions
diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index 4341b8918df..f4f663b84f0 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -83,10 +83,6 @@
     <option>--flake</option> <replaceable>flake-uri</replaceable>
    </arg>
 
-   <arg>
-    <option>--config</option> <replaceable>name</replaceable>
-   </arg>
-
    <sbr />
 
    <arg>
@@ -525,7 +521,7 @@
 
    <varlistentry>
     <term>
-     <option>--flake</option> <replaceable>flake-uri</replaceable>
+     <option>--flake</option> <replaceable>flake-uri</replaceable>[<replaceable>name</replaceable>]
     </term>
     <listitem>
      <para>
@@ -533,22 +529,9 @@
       the directory containing the target of the symlink
       <filename>/etc/nixos/flake.nix</filename>, if it exists. The
       flake must contain an output named
-      <literal>nixosConfigurations.<replaceable>name</replaceable></literal>,
-      where <replaceable>name</replaceable> denotes the name of the
-      configuration and can be specified using the
-      <option>--config</option> option.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
-    <term>
-     <option>--config</option> <replaceable>name</replaceable>
-    </term>
-    <listitem>
-     <para>
-      Specifies which NixOS configuration to use from the
-      flake. Defaults to the current hostname.
+      <literal>nixosConfigurations.<replaceable>name</replaceable></literal>. If
+      <replaceable>name</replaceable> is omitted, it default to the
+      current host name.
      </para>
     </listitem>
    </varlistentry>