diff options
author | Graham Christensen <graham@grahamc.com> | 2018-05-01 19:57:09 -0400 |
---|---|---|
committer | Graham Christensen <graham@grahamc.com> | 2018-05-01 19:57:09 -0400 |
commit | eca5c99bf8a115ffd9513f91decc064a5bb3ff6d (patch) | |
tree | 7b49bc123be12ca5344428c6975e4487e69d55e3 /nixos/doc/manual/configuration/network-manager.xml | |
parent | 77161de4546697f9bf2da6d081eeba4c399b3313 (diff) | |
download | nixpkgs-eca5c99bf8a115ffd9513f91decc064a5bb3ff6d.tar nixpkgs-eca5c99bf8a115ffd9513f91decc064a5bb3ff6d.tar.gz nixpkgs-eca5c99bf8a115ffd9513f91decc064a5bb3ff6d.tar.bz2 nixpkgs-eca5c99bf8a115ffd9513f91decc064a5bb3ff6d.tar.lz nixpkgs-eca5c99bf8a115ffd9513f91decc064a5bb3ff6d.tar.xz nixpkgs-eca5c99bf8a115ffd9513f91decc064a5bb3ff6d.tar.zst nixpkgs-eca5c99bf8a115ffd9513f91decc064a5bb3ff6d.zip |
nixos docs: format =)
Diffstat (limited to 'nixos/doc/manual/configuration/network-manager.xml')
-rw-r--r-- | nixos/doc/manual/configuration/network-manager.xml | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml index bbbee3a52ed..e217a99148b 100644 --- a/nixos/doc/manual/configuration/network-manager.xml +++ b/nixos/doc/manual/configuration/network-manager.xml @@ -3,39 +3,42 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-networkmanager"> + <title>NetworkManager</title> -<title>NetworkManager</title> - -<para>To facilitate network configuration, some desktop environments -use NetworkManager. You can enable NetworkManager by setting: - + <para> + 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. + </para> -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: - + <para> + 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.extraUsers.youruser.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).</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.</para></note> - + </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). + </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. + </para> + </note> </section> |