summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-12-13 11:43:39 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-12-13 11:43:39 +0100
commitdfdf1597a7cc13c40653722a771be12afaa64edb (patch)
tree4d7cd3f21ba89453f23ea1addb55e00574a638bf /nixos/doc
parentd5d8b3514d64fcd4022186795f604ec3f360ae17 (diff)
parent418ad571c3ec856d49b65fa53ab99f185c2d9def (diff)
downloadnixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar
nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.gz
nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.bz2
nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.lz
nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.xz
nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.zst
nixpkgs-dfdf1597a7cc13c40653722a771be12afaa64edb.zip
Merge master into staging-next
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/installation/installing.xml2
-rw-r--r--nixos/doc/manual/release-notes/rl-2003.xml10
2 files changed, 11 insertions, 1 deletions
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 5655295871e..4041b4ad163 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -478,7 +478,7 @@ Retype new UNIX password: ***</screen>
      shows what packages are available, and
 <screen>
 <prompt>$ </prompt>nix-env -f '&lt;nixpkgs&gt;' -iA w3m</screen>
-     install the <literal>w3m</literal> browser.
+     installs the <literal>w3m</literal> browser.
     </para>
    </listitem>
   </orderedlist>
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 77f11ae836f..7791a72d263 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -233,6 +233,16 @@
      The fourStore and fourStoreEndpoint modules have been removed.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     Polkit no longer has the user of uid 0 (root) as an admin identity.
+     We now follow the upstream default of only having every member of the wheel
+     group admin privileged. Before it was root and members of wheel.
+     The positive outcome of this is pkexec GUI popups or terminal prompts
+     will no longer require the user to choose between two essentially equivalent
+     choices (whether to perform the action as themselves with wheel permissions, or as the root user).
+    </para>
+   </listitem>
   </itemizedlist>
  </section>