about summary refs log tree commit diff
path: root/nixos/modules/services/networking
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-09-06 22:46:05 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-09-06 22:46:05 +0200
commit66bc7fc1b3e7a85a2cfde9bb121498a181d411a4 (patch)
treefa53c32dfef1265496170172a28a3c71bb32a655 /nixos/modules/services/networking
parentf9237f315264a0ccb8b50ff4fa6ff456239e4dc1 (diff)
parentcfe51be04f8b7c36fe9f71ca5835bd683ede087f (diff)
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services/networking')
-rw-r--r--nixos/modules/services/networking/murmur.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index 7ac4d0c6419d9..082953d2f6ab7 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -234,7 +234,7 @@ in
       extraConfig = mkOption {
         type = types.lines;
         default = "";
-        description = "Extra configuration to put into mumur.ini.";
+        description = "Extra configuration to put into murmur.ini.";
       };
     };
   };