Merge branch 'main' into avm99963-monorail

Merged commit 4137ed7879acadbf891e8c471108acb874dae886.

GitOrigin-RevId: b6100ffc5b1da355a35f37b13fcaaf746ee8b307
diff --git a/templates/sitewide/unified-settings.ezt b/templates/sitewide/unified-settings.ezt
index 1f2c79c..353232f 100644
--- a/templates/sitewide/unified-settings.ezt
+++ b/templates/sitewide/unified-settings.ezt
@@ -11,7 +11,8 @@
    When [if-any self]I participate[else]this user participates[end]
    in projects, show non-members [if-any self]my[else]this user's[end] email address as
    "[settings_user.obscured_username]...@[settings_user.domain]", instead of
-   showing the full address.
+   showing the full address. <b>NOTE:</b> Site Administrators and some API clients
+   (eg. bots) will still have access to your full email address.
  </label>
 
  <br><br>