summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorMatthew Harm Bekkema <id@mbekkema.name>2019-11-23 19:07:06 +1100
committerMatthew Harm Bekkema <id@mbekkema.name>2019-12-04 12:26:30 +1100
commitaecfea098e17eaf5cd4a80fab440e0e29b12420c (patch)
tree83c74c2f3dfb469c2b3573fe7ad3c409c4c2e4ec /nixos/doc
parent7e952c3321bec026a10e3bf0e04b7e3c82ac126d (diff)
downloadnixpkgs-aecfea098e17eaf5cd4a80fab440e0e29b12420c.tar
nixpkgs-aecfea098e17eaf5cd4a80fab440e0e29b12420c.tar.gz
nixpkgs-aecfea098e17eaf5cd4a80fab440e0e29b12420c.tar.bz2
nixpkgs-aecfea098e17eaf5cd4a80fab440e0e29b12420c.tar.lz
nixpkgs-aecfea098e17eaf5cd4a80fab440e0e29b12420c.tar.xz
nixpkgs-aecfea098e17eaf5cd4a80fab440e0e29b12420c.tar.zst
nixpkgs-aecfea098e17eaf5cd4a80fab440e0e29b12420c.zip
nixos/upower: Allow customization of UPower.conf
Documentation of options and default values taken from the upstream
UPower.conf. The documentation was modified slightly to make more sense
when displayed on https://nixos.org/nixos/options.html.

A copy of upstream UPower.conf can be found here:
https://cgit.freedesktop.org/upower/tree/etc/UPower.conf?id=28bd86c181e2510ef6a1dc7cfa26f97803698a79
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/release-notes/rl-2003.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 6916fd225da..645f7416ab1 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -77,6 +77,12 @@
     be set if the hostname of the node should be non default.
     </para>
    </listitem>
+   <listitem>
+    <para>
+    UPower's configuration is now managed by NixOS and can be customized
+    via <option>services.upower</option>.
+    </para>
+   </listitem>
   </itemizedlist>
 
  </section>