Merge branch 'master' into staging-next

Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
parent e7cccdbb13 ed54a5b51d
commit cdf426488b
247 changed files with 3153 additions and 2159 deletions
@@ -81,6 +81,10 @@ in
        default = "";
        description = ''
          Defines the mapping from system users to database users.
+
+          The general form is:
+
+          map-name system-username database-username
        '';
      };