diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-13 23:04:18 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-13 23:04:18 +0200 |
commit | 2fec9c6e297e02718db6be53d645524f0052a7bc (patch) | |
tree | 93e73a98dfaa40b290a6e15cf7f61054e5dc59e0 /nixos/modules/tasks | |
parent | e9961bf9a9f7410c2891c7e86c21ed6388c70d78 (diff) | |
parent | ba816ee08721d0c2f5f7e6652091bed085ac7687 (diff) | |
download | nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.gz nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.bz2 nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.lz nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.xz nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.zst nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.zip |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/development/tools/build-managers/conan/default.nix
Diffstat (limited to 'nixos/modules/tasks')
-rw-r--r-- | nixos/modules/tasks/network-interfaces.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 9c781f2b23ce..4039e4e51632 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -142,7 +142,7 @@ let default = { }; example = { mtu = "1492"; window = "524288"; }; description = '' - Other route options. See the symbol <literal>OPTION</literal> + Other route options. See the symbol <literal>OPTIONS</literal> in the <literal>ip-route(8)</literal> manual page for the details. ''; }; @@ -191,7 +191,7 @@ let preferTempAddress = mkOption { type = types.bool; default = cfg.enableIPv6; - defaultText = literalExample "config.networking.enableIpv6"; + defaultText = literalExample "config.networking.enableIPv6"; description = '' When using SLAAC prefer a temporary (IPv6) address over the EUI-64 address for originating connections. This is used to reduce tracking. |