Merge 48bbc53045 into cbff6790c3

changelogs/server_server/newsfragments/2191.clarification

@@ -1 +0,0 @@
-Clarify what the `minimum_valid_until_ts` field means when it is set in key queries.

data/api/server-server/keys_query.yaml

@@ -34,10 +34,10 @@ paths:
         - in: query
           name: minimum_valid_until_ts
           description: |-
-            A millisecond POSIX timestamp. The returned keys SHOULD be valid
+            A millisecond POSIX timestamp in milliseconds indicating when the returned
-            until at least this timestamp.
+            certificates will need to be valid until to be useful to the requesting server.
 
-            If not supplied, the notary server MUST use the current time.
+            If not supplied, the current time as determined by the notary server is used.
           required: false
           example: 1234567890
           schema:
@@ -98,11 +98,12 @@ paths:
                           type: integer
                           format: int64
                           description: |-
-                            A millisecond POSIX timestamp. The returned keys
+                            A millisecond POSIX timestamp in milliseconds indicating when
-                            SHOULD be valid until at least this timestamp.
+                            the returned certificates will need to be valid until to be
+                            useful to the requesting server.
 
-                            If not supplied, the notary server MUST use the
+                            If not supplied, the current time as determined by the notary
-                            current time.
+                            server is used.
                           example: 1234567890
               required:
                 - server_keys