Merge branch '15167-unlogged-attrs-api-docs'

Closes #15167

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --combined lib/config/config.default.yml
index c767f76132e8b10e168a36035c693576f0fae728,5689ba1a0924982b740b366001f89eac41481718..e41f7508b5582ed223eb325b0f0ecdacba1a45a5
--- 1/lib/config/config.default.yml
--- 2/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@@ -70,7 -70,7 +70,7 @@@ Clusters
          # All parameters here are passed to the PG client library in a connection string;
          # see https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-PARAMKEYWORDS
          Host: ""
 -        Port: 0
 +        Port: ""
          User: ""
          Password: ""
          DBName: ""
@@@ -109,10 -109,6 +109,10 @@@
        # update on the permission view in the future, if not already scheduled.
        AsyncPermissionsUpdateInterval: 20
  
 +      # Maximum number of concurrent outgoing requests to make while
 +      # serving a single incoming multi-cluster (federated) request.
 +      MaxRequestAmplification: 4
 +
        # RailsSessionSecretToken is a string of alphanumeric characters
        # used by Rails to sign session tokens. IMPORTANT: This is a
        # site secret. It should be at least 50 characters.
@@@ -162,7 -158,7 +162,7 @@@
        # Arvados object is created, modified, or deleted.)
        #
        # Currently, websocket event notifications rely on audit logs, so
-       # this should not be set lower than 600 (5 minutes).
+       # this should not be set lower than 300 (5 minutes).
        MaxAge: 1209600
  
        # Maximum number of log rows to delete in a single SQL transaction.