mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 05:00:16 +00:00
Code Issues Wiki Activity

Merge pull request #6552 from nslqqq/master

Browse source 
Correct NetworkManager documentation
This commit is contained in:
lethalman 2015-02-24 18:32:24 +01:00
parent 3d3db3550f 25e29b3870
commit 2fdad12a8d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/doc/manual/configuration/network-manager.xml
View file

@ -10,7 +10,7 @@
use NetworkManager. You can enable NetworkManager by setting:
<programlisting>
services.networkmanager.enable = true;
networking.networkmanager.enable = true;
</programlisting>
some desktop managers (e.g., GNOME) enable NetworkManager
@ -19,8 +19,8 @@ automatically for you.</para>
<para>All users that should have permission to change network settings
must belong to the <code>networkmanager</code> group.</para>
<note><para><code>services.networkmanager</code> and
<code>services.wireless</code> can not be enabled at the same time:
<note><para><code>networking.networkmanager</code> and
<code>networking.wireless</code> can not be enabled at the same time:
you can still connect to the wireless networks using
NetworkManager.</para></note>