[ARVADOS] created: 2.1.0-312-gb5c47e5ca

[Git user]

        at  b5c47e5ca546f893caa6189671966d98af6665ab (commit)


commit b5c47e5ca546f893caa6189671966d98af6665ab
Author: Nico Cesar <nico at nicocesar.com>
Date:   Tue Feb 2 11:06:19 2021 -0500

    doc: clarification about proxy flag
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>

diff --git a/doc/admin/federation.html.textile.liquid b/doc/admin/federation.html.textile.liquid
index eddd247e9..bf799dcd5 100644
--- a/doc/admin/federation.html.textile.liquid
+++ b/doc/admin/federation.html.textile.liquid
@@ -38,6 +38,8 @@ Similar settings should be added to @clsr2@ & @clsr3@ hosts, so that all cluster
 
 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.
 
+Note: The @Proxy:@ variable is intended for future use, and should always be set to @true at .
+
 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.

-----------------------------------------------------------------------


hooks/post-receive
--