diff options
| author | Domen Kožar <domen@dev.si> | 2014-11-27 12:09:17 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-11-27 12:10:20 +0100 |
| commit | 91bdca38a0867b31eb595e1aa1045cac4e137887 (patch) | |
| tree | 77d070f6446ced48dc789f7ff9912f823fe26a6e /nixos/doc | |
| parent | 53d0b4c539f062f98ab46fe353e65eba0a047bfd (diff) | |
| download | nixlib-91bdca38a0867b31eb595e1aa1045cac4e137887.tar nixlib-91bdca38a0867b31eb595e1aa1045cac4e137887.tar.gz nixlib-91bdca38a0867b31eb595e1aa1045cac4e137887.tar.bz2 nixlib-91bdca38a0867b31eb595e1aa1045cac4e137887.tar.lz nixlib-91bdca38a0867b31eb595e1aa1045cac4e137887.tar.xz nixlib-91bdca38a0867b31eb595e1aa1045cac4e137887.tar.zst nixlib-91bdca38a0867b31eb595e1aa1045cac4e137887.zip | |
NetworkManager.service -> network-manager.service
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/configuration/network-manager.xml | 2 | ||||
| -rw-r--r-- | nixos/doc/manual/installation/installing.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml index e65060021b40..ceac40b7a1f6 100644 --- a/nixos/doc/manual/configuration/network-manager.xml +++ b/nixos/doc/manual/configuration/network-manager.xml @@ -13,7 +13,7 @@ use NetworkManager. You can enable NetworkManager by setting: services.networkmanager.enable = true; </programlisting> -Some desktop managers (e.g., GNOME) enable NetworkManager +some desktop managers (e.g., GNOME) enable NetworkManager automatically for you.</para> <para>All users that should have permission to change network settings diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index dd1acba2168e..c21759bc9261 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -25,14 +25,14 @@ run <command>start display-manager</command> to start KDE.</para></listitem> <listitem><para>The boot process should have brought up networking (check - <command>ifconfig</command>). Networking is necessary for the + <command>ip a</command>). Networking is necessary for the installer, since it will download lots of stuff (such as source tarballs or Nixpkgs channel binaries). It’s best if you have a DHCP server on your network. Otherwise configure networking manually using <command>ifconfig</command>.</para> <para>To manually configure the network on the graphical installer, - first disable NetworkManager with - <command>stop NetworkManager</command>.</para></listitem> + first disable network-manager with + <command>systemctl stop network-manager</command>.</para></listitem> <listitem><para>The NixOS installer doesn’t do any partitioning or formatting yet, so you need to that yourself. Use the following |