diff options
| author | lethalman <lucabru@src.gnome.org> | 2015-02-24 18:32:24 +0100 |
|---|---|---|
| committer | lethalman <lucabru@src.gnome.org> | 2015-02-24 18:32:24 +0100 |
| commit | 2fdad12a8dab67d79c81b830f8769ce1227ec5ce (patch) | |
| tree | 5476d341141dd0784fe8b1e1d9bd530d65d56437 /nixos | |
| parent | 3d3db3550f9de663288b6dadbd819d4610426a59 (diff) | |
| parent | 25e29b38702a43854d5731b1f2d44e3c782d76c4 (diff) | |
Merge pull request #6552 from nslqqq/master
Correct NetworkManager documentation
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/configuration/network-manager.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml index ceac40b7a1f66..b7e47b8729f32 100644 --- a/nixos/doc/manual/configuration/network-manager.xml +++ b/nixos/doc/manual/configuration/network-manager.xml @@ -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> |