3 files changed, 16 insertions, 22 deletions
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 4ed859c2e7ea..3c0c51e6ec8a 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -215,11 +215,8 @@ in
 
   ###### implementation
 
-  # !!! Maybe if `enable' is false, the firewall should still be built
-  # but not started by default.  However, currently nixos-rebuild
-  # doesn't deal with such Upstart jobs properly (it starts them if
-  # they are changed, regardless of whether the start condition
-  # holds).
+  # FIXME: Maybe if `enable' is false, the firewall should still be
+  # built but not started by default?
   config = mkIf cfg.enable {
 
     networking.firewall.trustedInterfaces = [ "lo" ];
diff --git a/nixos/modules/services/networking/gogoclient.nix b/nixos/modules/services/networking/gogoclient.nix
index 07c35e3cb3d6..3b92eb8b06bd 100644
--- a/nixos/modules/services/networking/gogoclient.nix
+++ b/nixos/modules/services/networking/gogoclient.nix
@@ -15,38 +15,35 @@ in
         default = false;
         type =  types.bool;
         description = ''
-          Enable the gogoclient ipv6 tunnel.
+          Enable the gogoCLIENT IPv6 tunnel.
         '';
       };
       autorun = mkOption {
         default = true;
-        description = "
-          Switch to false to create upstart-job and configuration,
-          but not run it automatically
-        ";
+        description = ''
+          Whether to automatically start the tunnel.
+        '';
       };
 
       username = mkOption {
         default = "";
-        description = "
+        description = ''
           Your Gateway6 login name, if any.
-        ";
+        '';
       };
 
       password = mkOption {
         default = "";
         type = types.string;
-        description = "
-          Path to a file (as a string), containing your gogonet password, if any.
-        ";
+        description = ''
+          Path to a file (as a string), containing your gogoNET password, if any.
+        '';
       };
 
       server = mkOption {
         default = "anonymous.freenet6.net";
         example = "broker.freenet6.net";
-        description = "
-          Used Gateway6 server.
-        ";
+        description = "The Gateway6 server to be used.";
       };
     };
   };
diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index 400cb74f7d9f..292d45f43475 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -107,10 +107,10 @@ in
       '';
 
       description = ''
-        Each attribute of this option defines an Upstart job to run an
-        OpenVPN instance.  These can be OpenVPN servers or clients.
-        The name of each Upstart job is
-        <literal>openvpn-</literal><replaceable>name</replaceable>,
+        Each attribute of this option defines a systemd service that
+        runs an OpenVPN instance.  These can be OpenVPN servers or
+        clients.  The name of each systemd service is
+        <literal>openvpn-<replaceable>name</replaceable>.service</literal>,
         where <replaceable>name</replaceable> is the corresponding
         attribute name.
       '';