summary refs log tree commit diff
path: root/nixos/doc/manual/configuration/ipv4-config.xml
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-09-19 19:17:30 +0200
committerEelco Dolstra <edolstra@gmail.com>2019-09-19 19:17:30 +0200
commitb0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30 (patch)
treeee6367837650bb97dc5117d518217b11294900fe /nixos/doc/manual/configuration/ipv4-config.xml
parentdb3d31b903da12bc471e91d811d231dfe5b662ef (diff)
downloadnixpkgs-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/ipv4-config.xml')
-rw-r--r--nixos/doc/manual/configuration/ipv4-config.xml15
1 files changed, 11 insertions, 4 deletions
diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml
index 3ebde2193cb..71ddf41491b 100644
--- a/nixos/doc/manual/configuration/ipv4-config.xml
+++ b/nixos/doc/manual/configuration/ipv4-config.xml
@@ -6,14 +6,17 @@
  <title>IPv4 Configuration</title>
 
  <para>
-  By default, NixOS uses DHCP (specifically, <command>dhcpcd</command>) to automatically configure network interfaces. However, you can configure an interface manually as follows:
+  By default, NixOS uses DHCP (specifically, <command>dhcpcd</command>) to
+  automatically configure network interfaces. However, you can configure an
+  interface manually as follows:
 <programlisting>
 <link linkend="opt-networking.interfaces._name__.ipv4.addresses">networking.interfaces.eth0.ipv4.addresses</link> = [ {
   address = "192.168.1.2";
   prefixLength = 24;
 } ];
 </programlisting>
-  Typically you’ll also want to set a default gateway and set of name servers:
+  Typically you’ll also want to set a default gateway and set of name
+  servers:
 <programlisting>
 <xref linkend="opt-networking.defaultGateway"/> = "192.168.1.1";
 <xref linkend="opt-networking.nameservers"/> = [ "8.8.8.8" ];
@@ -22,7 +25,10 @@
 
  <note>
   <para>
-   Statically configured interfaces are set up by the systemd service <replaceable>interface-name</replaceable><literal>-cfg.service</literal>. The default gateway and name server configuration is performed by <literal>network-setup.service</literal>.
+   Statically configured interfaces are set up by the systemd service
+   <replaceable>interface-name</replaceable><literal>-cfg.service</literal>.
+   The default gateway and name server configuration is performed by
+   <literal>network-setup.service</literal>.
   </para>
  </note>
 
@@ -31,6 +37,7 @@
 <programlisting>
 <xref linkend="opt-networking.hostName"/> = "cartman";
 </programlisting>
-  The default host name is <literal>nixos</literal>. Set it to the empty string (<literal>""</literal>) to allow the DHCP server to provide the host name.
+  The default host name is <literal>nixos</literal>. Set it to the empty string
+  (<literal>""</literal>) to allow the DHCP server to provide the host name.
  </para>
 </section>