summary refs log tree commit diff
path: root/nixos/doc/manual/configuration/ipv4-config.xml
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2014-08-31 09:46:16 -0700
committerWilliam A. Kennington III <william@wkennington.com>2014-08-31 09:46:16 -0700
commit3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb (patch)
tree39f7a63253ae764835780f6305cf8bc5d8b109bc /nixos/doc/manual/configuration/ipv4-config.xml
parent45c4e4d04adb79e21819d124b0156ac81ea3f760 (diff)
downloadnixpkgs-3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb.tar
nixpkgs-3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb.tar.gz
nixpkgs-3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb.tar.bz2
nixpkgs-3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb.tar.lz
nixpkgs-3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb.tar.xz
nixpkgs-3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb.tar.zst
nixpkgs-3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb.zip
Revert "Revert "Merge pull request #3182 from wkennington/master.ipv6""
This reverts commit ea8910652fcecbcd4f21aa1c66b1a0a239408b04.
Diffstat (limited to 'nixos/doc/manual/configuration/ipv4-config.xml')
-rw-r--r--nixos/doc/manual/configuration/ipv4-config.xml5
1 files changed, 1 insertions, 4 deletions
diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml
index e2c51518349..053501b1736 100644
--- a/nixos/doc/manual/configuration/ipv4-config.xml
+++ b/nixos/doc/manual/configuration/ipv4-config.xml
@@ -12,12 +12,9 @@ interfaces.  However, you can configure an interface manually as
 follows:
 
 <programlisting>
-networking.interfaces.eth0 = { ipAddress = "192.168.1.2"; prefixLength = 24; };
+networking.interfaces.eth0.ip4 = [ { address = "192.168.1.2"; prefixLength = 24; } ];
 </programlisting>
 
-(The network prefix can also be specified using the option
-<literal>subnetMask</literal>,
-e.g. <literal>"255.255.255.0"</literal>, but this is deprecated.)
 Typically you’ll also want to set a default gateway and set of name
 servers: