Send sms before email, and mention that password is generated from

initial command.

1 files changed, 9 insertions, 8 deletions

diff --git a/doc/admin.md b/doc/admin.md
index a8cbf33..e731a38 100644
--- a/doc/admin.md
+++ b/doc/admin.md
@@ -7,7 +7,7 @@
  1. Pick a username:
   * Start with the initials of the user
   * Include also second letter of either first name or surname
-  *  If necessary, add third letter of first name or surname (or a trailing number)
+  * If necessary, add third letter of first name or surname (or a trailing number)
   * The result should be practical (short and related to the name of the user) but must not be a nickname or initals: A username is comparable to the shape of a key - the user may get confused in every day use if it looks like a toy or jewelery!
  2. Create the account:
 
@@ -16,12 +16,7 @@
   * Full name: Full name (Capital and small letters allowed, as is space and special characters, but no comma!)
   * Cellphone: Cellphone number including country code but without other spaces. Like this: +45 40843136
   * Addresshint: local part of email address, followed by @-sign, and optionally followed by mailgroup. Like these: jonas@ js@pool_of_maildomains
- 3. Compose an email based on [[introemail]] skeleton:
-  * If an ouside working email address has been provided, then use that as recipient. Alternatively use the contact person of the new user (teacher, boss etc.) as recipient.
-  * Add \<username>@homebase.dk as Cc:
-  * Add hostmaster@homebase.dk as Bcc:
-  * Add teknik@lists.homebase.dk as Reply-To:
- 4. Send a cellphone text message to the new user with the following text:
+ 3. Send a cellphone text message to the new user with the following text and the password spit out from the command above:
 
 		Here is your new password. It MUST be changed within 14 days - read http://wiki.homebase.dk/BrugerKonto and check your mail. The code is: <adgangskode>
 
@@ -29,7 +24,13 @@
 
 		Her er din nye adgangskode. Den SKAL ændres inden 14 dage - læs websiden http://wiki.homebase.dk/BrugerKonto og check din mail. Koden er: <adgangskode>
 
-TODO: Make this routine semi-automatic: sending out sms should happen automatically.
+ 4. Compose an email based on [[introemail]] skeleton:
+  * If an ouside working email address has been provided, then use that as recipient. Alternatively use the contact person of the new user (teacher, boss etc.) as recipient.
+  * Add \<username>@homebase.dk as Cc:
+  * Add hostmaster@homebase.dk as Bcc:
+  * Add teknik@lists.homebase.dk as Reply-To:
+
+TODO: Automate more: sending out sms and email should happen automatically.
 
 ### Attach groups to account