Merge master into staging-next

2020-01-12 09:47:19 +01:00
parent 1a654573b0 e5672143d8
commit 960f062825
66 changed files with 1806 additions and 754 deletions
@@ -302,7 +302,7 @@ lib.attrsets.attrValues { a = 1; b = 2; c = 3; }
 <section xml:id="function-library-lib.attrsets.catAttrs">
  <title><function>lib.attrsets.catAttrs</function></title>

-  <subtitle><literal>catAttrs :: String -> AttrSet -> [Any]</literal>
+  <subtitle><literal>catAttrs :: String -> [AttrSet] -> [Any]</literal>
  </subtitle>

  <xi:include href="./locations.xml" xpointer="lib.attrsets.catAttrs" />