Merge branch '16974-remote-clusters-and-activate-users-doc-take2'

closes #16974

Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico@curii.com>

diff --cc doc/admin/federation.html.textile.liquid
index c2e0e4442ca33042f4af1c905c54dd6d180956a3,bf799dcd56e1f89e8f50dfa73a338a1833c1b564..7e149c3602d13bfde28a5f19303221b6b2a41a0c
--- 1/doc/admin/federation.html.textile.liquid
--- 2/doc/admin/federation.html.textile.liquid
+++ b/doc/admin/federation.html.textile.liquid
@@@ -36,8 -36,10 +36,10 @@@ Clusters
  
  Similar settings should be added to @clsr2@ & @clsr3@ hosts, so that all clusters in the federation can talk to each other.
  
 -The @ActivateUsers@ setting indicates whether users from a given cluster are automatically activated or they require manual activation.  User activation is covered in more detail in the "user activation section":{{site.baseurl}}/admin/activation.html.  In the current example, users from @clsr2@ would be automatically, activated, but users from @clsr3@ would require an admin to activate the account.
 +The @ActivateUsers@ setting indicates whether users from a given cluster are automatically activated or they require manual activation.  User activation is covered in more detail in the "user activation section":{{site.baseurl}}/admin/user-management.html.  In the current example, users from @clsr2@ would be automatically, activated, but users from @clsr3@ would require an admin to activate the account.
  
+ Note: The @Proxy:@ variable is intended for future use, and should always be set to @true@.
+ 
  h2(#LoginCluster). User management
  
  A federation of clusters can be configured to use a separate user database per cluster, or delegate a central cluster to manage the database.