summary refs log tree commit diff
path: root/nixos/doc/manual
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2018-04-06 01:19:06 +0000
committerJan Malakhovski <oxij@oxij.org>2018-05-12 19:27:09 +0000
commit095fe5b43def40279a243e663c662b02caac5318 (patch)
tree943f7d7550221ba6f3b7cd855e00b265bbbcf316 /nixos/doc/manual
parentb0d29e7e179f20c92f18e2eff13b871d015adc5a (diff)
downloadnixlib-095fe5b43def40279a243e663c662b02caac5318.tar
nixlib-095fe5b43def40279a243e663c662b02caac5318.tar.gz
nixlib-095fe5b43def40279a243e663c662b02caac5318.tar.bz2
nixlib-095fe5b43def40279a243e663c662b02caac5318.tar.lz
nixlib-095fe5b43def40279a243e663c662b02caac5318.tar.xz
nixlib-095fe5b43def40279a243e663c662b02caac5318.tar.zst
nixlib-095fe5b43def40279a243e663c662b02caac5318.zip
nixos: rename system.{stateVersion,defaultChannel} -> system.nixos.\1
Diffstat (limited to 'nixos/doc/manual')
-rwxr-xr-xnixos/doc/manual/development/releases.xml2
-rw-r--r--nixos/doc/manual/release-notes/rl-1509.xml4
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml
index d4e5ff3f4312..863110a1c7ca 100755
--- a/nixos/doc/manual/development/releases.xml
+++ b/nixos/doc/manual/development/releases.xml
@@ -70,7 +70,7 @@
     <listitem>
      <para>
       <link xlink:href="https://github.com/NixOS/nixpkgs/compare/bdf161ed8d21...6b63c4616790">
-      Bump the <literal>system.defaultChannel</literal> attribute in
+      Bump the <literal>system.nixos.defaultChannel</literal> attribute in
       <literal>nixos/modules/misc/version.nix</literal> </link>
      </para>
     </listitem>
diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml
index e500c9d63422..734bc076b852 100644
--- a/nixos/doc/manual/release-notes/rl-1509.xml
+++ b/nixos/doc/manual/release-notes/rl-1509.xml
@@ -433,9 +433,9 @@ system.autoUpgrade.enable = true;
      default. If you have existing systems with such host keys and want to
      continue to use them, please set
 <programlisting>
-system.stateVersion = "14.12";
+system.nixos.stateVersion = "14.12";
 </programlisting>
-     The new option <option>system.stateVersion</option> ensures that certain
+     The new option <option>system.nixos.stateVersion</option> ensures that certain
      configuration changes that could break existing systems (such as the
      <command>sshd</command> host key setting) will maintain compatibility with
      the specified NixOS release. NixOps sets the state version of existing