diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-05 10:19:54 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-05 10:19:54 +0100 |
| commit | c9a19b5f7e0c63f16d4fd265f68675e4495b9284 (patch) | |
| tree | e6a8b4be6bccef324c8f30b46fec90d9a7ceb178 /nixos/doc/manual | |
| parent | 484b469cafef87f51deea03c5970d67cc47cf2aa (diff) | |
| parent | 51ef7c3e497ec09d4bc6b67c7e47e61c308454aa (diff) | |
| download | nixpkgs-c9a19b5f7e0c63f16d4fd265f68675e4495b9284.tar nixpkgs-c9a19b5f7e0c63f16d4fd265f68675e4495b9284.tar.gz nixpkgs-c9a19b5f7e0c63f16d4fd265f68675e4495b9284.tar.bz2 nixpkgs-c9a19b5f7e0c63f16d4fd265f68675e4495b9284.tar.lz nixpkgs-c9a19b5f7e0c63f16d4fd265f68675e4495b9284.tar.xz nixpkgs-c9a19b5f7e0c63f16d4fd265f68675e4495b9284.tar.zst nixpkgs-c9a19b5f7e0c63f16d4fd265f68675e4495b9284.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/doc/manual')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2003.xml | 6 |
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 45071449f9d..f6348d88aaf 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> |