Major updates to routines.

3 files changed, 66 insertions, 13 deletions

diff --git a/doc/admin.md b/doc/admin.md
index e3e9123..c3a28ea 100644
--- a/doc/admin.md
+++ b/doc/admin.md
@@ -10,28 +10,27 @@
  2. Pick a username:
   * Start with the initials of the user
   * Include also second letter of either first name or surname
-  * Add a trailing number if necessary (or better: third letter of first name or surname)
+  *  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!
- 3. Generate some random passwords and create the account using a good one (pronaouncable but meaningless) of those codes:
+ 3. Create the account:
 
-		(user=<username>; gpw && adduser $user && chage -M30 -W14 $user)
+		localadduser <username> <fullname> <cellphone> [<otherphone>] <addresshint> [<addresshint>...]
 
   * Full name: Full name (Capital and small letters allowed, as is space and special characters, but no comma!)
-  * Room number: Primary group within the organisation
-  * Work phone: POTS phone number (optional)
-  * Home phone: Cellphone number
-  * Other: leave this blank for now (do not unclude email hints yet!)
- 4. Compose an email based on the introEmail skeleton:
+  * 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
+ 4. Compose an email based on the (intro email)[[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>@users.kaospilot.no as Cc:.
-  * Add tech@lists.kaospilot.no as Reply-To:.
+  * Add \<username>@homebase.dk as Cc:
+  * Add hostmaster@homebase.dk as Bcc:
+  * Add teknik@lists.homebase.dk as Reply-To:
  5. Send a cellphone text message to the new user with the following text:
 
-		Here is your new password. It MUST be changed within 14 days - read https://wiki.kaospilot.no/BrugerKonto and check your mail. The code is: <adgangskode>
+		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>
     Or in danish:
-		Her er din nye adgangskode. Den SKAL ændres inden 14 dage - læs websiden https://wiki.kaospilot.no/BrugerKonto og check din mail. Koden er: <adgangskode>
+		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>
 
-FIXME: Gør denne rutine semi-automatisk: Valg af adgangskode og udsendelse af sms bør ske automatisk.
+FIXME: Make this routine semi-automatic: choice of password and sending out sms should happen automatically.
 
 ### Attach groups to account
 
diff --git a/doc/introemail.md b/doc/introemail.md
new file mode 100644
index 0000000..d400fd5
--- /dev/null
+++ b/doc/introemail.md
@@ -0,0 +1,28 @@
+	Hi XXXXX!
+	
+	A personal account has been added for you at Homebase.
+	
+	Your username is "XXX". Password will be sent through cellphone text message.
+	
+	NB! Password lasts only 14 days - read below how to change it!
+	
+	The account is used for email addresses and other personal services. Currently
+	the following email addresses has been attached:
+	  XXX@homebase.dk
+	  XXXXX@some-other-domain.dk
+
+FIXME: translate the rest...
+	
+	Opsætning ultrakort:
+	  * Din adgangskode er personlig: skriv den ikke ned, og giv den ikke til
+	    din chef eller teknikere! Glemmer du koden så får du blot en ny :-)
+	  * Posthuset er "mail.homebase.dk" og kan nås via web, smtp, imap og pop3.
+	  * Der SKAL benyttes SSL og adgangskode til alle post-services (også smtp).
+	  
+	Mere om opsætning og muligheder med din nye konto - skift af kode,
+	flere email-adresser, tilmelding til mailinglists m.m. - står her:
+	http://wiki.homebase.dk/BrugerKonto
+	
+	
+	Venlig hilsen Jonas Smedegaard
+	Postmester ved homebase.dk
diff --git a/doc/introemaildanish.md b/doc/introemaildanish.md
new file mode 100644
index 0000000..f9c92bd
--- /dev/null
+++ b/doc/introemaildanish.md
@@ -0,0 +1,26 @@
+	Hej XXXXX!
+	
+	Der er nu oprettet en personlig konto til dig ved Homebase.
+	
+	Dit brugernavn er "XXX". Adgangskoden sendes pr. sms til dig.
+	
+	NB! Koden varer kun 14 dage - læs nedenfor hvordan du ændrer den!
+	
+	Kontoen bruges til email-adresser og andre personlige services. Konkret er
+	tilknyttet følgende email-adresser:
+	  XXX@homebase.dk
+	  XXXXX@et-andet-domaene.dk
+	
+	Opsætning ultrakort:
+	  * Din adgangskode er personlig: skriv den ikke ned, og giv den ikke til
+	    din chef eller teknikere! Glemmer du koden så får du blot en ny :-)
+	  * Posthuset er "mail.homebase.dk" og kan nås via web, smtp, imap og pop3.
+	  * Der SKAL benyttes SSL og adgangskode til alle post-services (også smtp).
+	  
+	Mere om opsætning og muligheder med din nye konto - skift af kode,
+	flere email-adresser, tilmelding til mailinglists m.m. - står her:
+	http://wiki.homebase.dk/BrugerKonto
+	
+	
+	Venlig hilsen Jonas Smedegaard
+	Postmester ved homebase.dk