diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2019-09-19 19:17:30 +0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2019-09-19 19:17:30 +0200 |
commit | b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30 (patch) | |
tree | ee6367837650bb97dc5117d518217b11294900fe /nixos/doc/manual/configuration/network-manager.xml | |
parent | db3d31b903da12bc471e91d811d231dfe5b662ef (diff) | |
download | nixpkgs-b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30.tar nixpkgs-b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30.tar.gz nixpkgs-b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30.tar.bz2 nixpkgs-b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30.tar.lz nixpkgs-b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30.tar.xz nixpkgs-b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30.tar.zst nixpkgs-b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30.zip |
Revert "nixos/doc: re-format"
This reverts commit ea6e8775bd69e4676c623a85c39f1da540d29ad1. The new format is not an improvement.
Diffstat (limited to 'nixos/doc/manual/configuration/network-manager.xml')
-rw-r--r-- | nixos/doc/manual/configuration/network-manager.xml | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml index fb06d60b487..d103ee24978 100644 --- a/nixos/doc/manual/configuration/network-manager.xml +++ b/nixos/doc/manual/configuration/network-manager.xml @@ -6,27 +6,39 @@ <title>NetworkManager</title> <para> - To facilitate network configuration, some desktop environments use NetworkManager. You can enable NetworkManager by setting: + To facilitate network configuration, some desktop environments use + NetworkManager. You can enable NetworkManager by setting: <programlisting> <xref linkend="opt-networking.networkmanager.enable"/> = true; </programlisting> - some desktop managers (e.g., GNOME) enable NetworkManager automatically for you. + some desktop managers (e.g., GNOME) enable NetworkManager automatically for + you. </para> <para> - All users that should have permission to change network settings must belong to the <code>networkmanager</code> group: + All users that should have permission to change network settings must belong + to the <code>networkmanager</code> group: <programlisting> <link linkend="opt-users.users._name__.extraGroups">users.users.alice.extraGroups</link> = [ "networkmanager" ]; </programlisting> </para> <para> - NetworkManager is controlled using either <command>nmcli</command> or <command>nmtui</command> (curses-based terminal user interface). See their manual pages for details on their usage. Some desktop environments (GNOME, KDE) have their own configuration tools for NetworkManager. On XFCE, there is no configuration tool for NetworkManager by default: by adding <code>networkmanagerapplet</code> to the list of system packages, the graphical applet will be installed and will launch automatically when XFCE is starting (and will show in the status tray). + NetworkManager is controlled using either <command>nmcli</command> or + <command>nmtui</command> (curses-based terminal user interface). See their + manual pages for details on their usage. Some desktop environments (GNOME, + KDE) have their own configuration tools for NetworkManager. On XFCE, there is + no configuration tool for NetworkManager by default: by adding + <code>networkmanagerapplet</code> to the list of system packages, the + graphical applet will be installed and will launch automatically when XFCE is + starting (and will show in the status tray). </para> <note> <para> - <code>networking.networkmanager</code> and <code>networking.wireless</code> (WPA Supplicant) cannot be enabled at the same time: you can still connect to the wireless networks using NetworkManager. + <code>networking.networkmanager</code> and <code>networking.wireless</code> + (WPA Supplicant) cannot be enabled at the same time: you can still connect + to the wireless networks using NetworkManager. </para> </note> </section> |