From 766c46de7127e4616e2e17c3be6f4b55141d4a2c Mon Sep 17 00:00:00 2001
From: teor <teor2345@gmail.com>
Date: Wed, 18 Jul 2018 08:54:11 +1000
Subject: [PATCH] Split email aliases into new personal, new group, and
 existing group

---
 tsa/doc/accounts.creole | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/tsa/doc/accounts.creole b/tsa/doc/accounts.creole
index 1e386fa1..9910b9f6 100644
--- a/tsa/doc/accounts.creole
+++ b/tsa/doc/accounts.creole
@@ -127,16 +127,33 @@ $ getent group
 
 See also: the {{{"Host specific passwords"}}} section below
 
-== <a id="aliases">Getting added to an existing email alias</a> ==
+== <a id="aliases">Changing email aliases</a> ==
+
+Create a ticket specifying the alias, the new address to add, and a
+brief motivation for the change.
+
+For specifics, see the "The sponsor will create a ticket" section above:
+
+=== <a id="new-aliases">Adding a new email alias</a> ===
+
+==== Personal Email Aliases ====
+
+Tor Project Inc can request new email aliases for staff.
+
+An existing Core Contributor can request new email aliases for new Core
+Contributors.
+
+==== Group Email Aliases ====
+
+Tor Project Inc and Core Contributors can request group email aliases for new
+functions or projects.
+
+=== <a id="existing-aliases">Getting added to an existing email alias</a> ===
 
 Similar to being added to an LDAP group, the right way to get added
 to an existing email alias is by getting somebody who is already on
 that alias to file a ticket asking for you to be added.
 
-For specifics, see the "The sponsor will create a ticket" section above:
-create a ticket specifying the alias, the new address to add, and a
-brief motivation for the change.
-
 == <a id="password-reset">Changing/Resetting your passwords</a> ==
 
 === LDAP ===
-- 
GitLab