[MERGE] forward port branch saas-12 up to b1b700a

doc/reference/orm.rst

@@ -130,6 +130,10 @@ preserve order.
 * ``record in set`` returns whether ``record`` (which must be a 1-element
   recordset) is present in ``set``. ``record not in set`` is the inverse
   operation
+* ``set1 <= set2`` and ``set1 < set2`` return whether ``set1`` is a subset
+  of ``set2`` (resp. strict)
+* ``set1 >= set2`` and ``set1 > set2`` return whether ``set1`` is a superset
+  of ``set2`` (resp. strict)
 * ``set1 | set2`` returns the union of the two recordsets, a new recordset
   containing all records present in either source
 * ``set1 & set2`` returns the intersection of two recordsets, a new recordset

doc/reference/upgrade_api.rst

@@ -341,7 +341,7 @@ The ``request_sftp_access`` method returns a JSON dictionary containing the foll
         SSH_KEYS=/path/to/your/authorized_keys
         KEY="Aw7pItGVKFuZ_FOR3U8VFQ=="
         REQUEST_ID="10534"
-        URL_PARAMS="key=${KEY}&request=${REQUEST}"
+        URL_PARAMS="key=${KEY}&request=${REQUEST_ID}"
 
         curl -sS "${REQUEST_SFTP_ACCESS_URL}?${URL_PARAMS}" -F ssh_keys=@${SSH_KEYS} > request_sftp_result.json