Merge branch 'master' into staging

2017-07-03 09:48:58 +02:00
parent 343ad1697d 0b1c8793fc
commit d1a89ae9d7
124 changed files with 4698 additions and 3339 deletions
@@ -241,7 +241,7 @@ in
      description = ''
        The encrypted disk that should be opened before the root
        filesystem is mounted. Both LVM-over-LUKS and LUKS-over-LVM
-        setups are sypported. The unencrypted devices can be accessed as
+        setups are supported. The unencrypted devices can be accessed as
        <filename>/dev/mapper/<replaceable>name</replaceable></filename>.
      '';