Merge branch 'master' into staging-next

1 files changed, 12 insertions, 12 deletions

diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix
index 976163d4d0b20..2a7f1d45c2d86 100644
--- a/nixos/modules/services/editors/infinoted.nix
+++ b/nixos/modules/services/editors/infinoted.nix
@@ -6,14 +6,14 @@ let
   cfg = config.services.infinoted;
 in {
   options.services.infinoted = {
-    enable = mkEnableOption (lib.mdDoc "infinoted");
+    enable = mkEnableOption "infinoted";
 
     package = mkPackageOption pkgs "libinfinity" { };
 
     keyFile = mkOption {
       type = types.nullOr types.path;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Private key to use for TLS
       '';
     };
@@ -21,7 +21,7 @@ in {
     certificateFile = mkOption {
       type = types.nullOr types.path;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Server certificate to use for TLS
       '';
     };
@@ -29,7 +29,7 @@ in {
     certificateChain = mkOption {
       type = types.nullOr types.path;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Chain of CA-certificates to which our `certificateFile` is relative.
         Optional for TLS.
       '';
@@ -38,7 +38,7 @@ in {
     securityPolicy = mkOption {
       type = types.enum ["no-tls" "allow-tls" "require-tls"];
       default = "require-tls";
-      description = lib.mdDoc ''
+      description = ''
         How strictly to enforce clients connection with TLS.
       '';
     };
@@ -46,7 +46,7 @@ in {
     port = mkOption {
       type = types.port;
       default = 6523;
-      description = lib.mdDoc ''
+      description = ''
         Port to listen on
       '';
     };
@@ -54,7 +54,7 @@ in {
     rootDirectory = mkOption {
       type = types.path;
       default = "/var/lib/infinoted/documents/";
-      description = lib.mdDoc ''
+      description = ''
         Root of the directory structure to serve
       '';
     };
@@ -62,7 +62,7 @@ in {
     plugins = mkOption {
       type = types.listOf types.str;
       default = [ "note-text" "note-chat" "logging" "autosave" ];
-      description = lib.mdDoc ''
+      description = ''
         Plugins to enable
       '';
     };
@@ -70,7 +70,7 @@ in {
     passwordFile = mkOption {
       type = types.nullOr types.path;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         File to read server-wide password from
       '';
     };
@@ -81,7 +81,7 @@ in {
         [autosave]
         interval=10
       '';
-      description = lib.mdDoc ''
+      description = ''
         Additional configuration to append to infinoted.conf
       '';
     };
@@ -89,7 +89,7 @@ in {
     user = mkOption {
       type = types.str;
       default = "infinoted";
-      description = lib.mdDoc ''
+      description = ''
         What to call the dedicated user under which infinoted is run
       '';
     };
@@ -97,7 +97,7 @@ in {
     group = mkOption {
       type = types.str;
       default = "infinoted";
-      description = lib.mdDoc ''
+      description = ''
         What to call the primary group of the dedicated user under which infinoted is run
       '';
     };