Double-indent commands within list item. Escape angle brackets.

1 files changed, 8 insertions, 9 deletions

diff --git a/doc/admin.md b/doc/admin.md
index 1b2a2f7..8669216 100644
--- a/doc/admin.md
+++ b/doc/admin.md
@@ -14,7 +14,7 @@
   * 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:
 
-	(user=<username>; gpw && adduser $user && chage -M30 -W14 $user)
+		(user=\<username>; gpw && adduser $user && chage -M30 -W14 $user)
 
   * 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
@@ -23,11 +23,11 @@
   * Other: leave this blank for now (do not unclude email hints yet!)
  4. Compose an email based on the 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 \<username>@users.kaospilot.no as Cc:.
   * Add tech@lists.kaospilot.no as Reply-To:.
  5. Send a cellphone text message to the new user with the following text:
 
-	Du har fået ny adgangskode. Den skal ændres inden 14 dage - se websiden https://wiki.kaospilot.no/BrugerKonto og check din mail. Koden er: <adgangskode>
+		Du har fået ny adgangskode. Den skal ændres inden 14 dage - se websiden https://wiki.kaospilot.no/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.
 
@@ -35,7 +35,7 @@ FIXME: Gør denne rutine semi-automatisk: Valg af adgangskode og udsendelse af s
 
  1. Attach the account to relevant organisational groups:
 
-	(user=<username>; for group in <group1> [<group2> ...]; do adduser $user $group; done)
+		(user=\<username>; for group in \<group1> [\<group2> ...]; do adduser $user $group; done)
 
 ### Add/replace additional email addresses to account
 
@@ -45,14 +45,14 @@ FIXME: Gør denne rutine semi-automatisk: Valg af adgangskode og udsendelse af s
 
 When a user has changed password into something personal, the password lifespan is extended to 1 year:
 
-	(user=<username>; chage -M360 -W30 $user)
+	(user=\<username>; chage -M360 -W30 $user)
 
 
 TODO: The above command should ideally never ever be invoked manyally, but automatically through PAM
 
 ## Reset password
 
-	(user=<username>; gpw && finger $user && passwd $user && chage -M30 -W14 $user)
+	(user=\<username>; gpw && finger $user && passwd $user && chage -M30 -W14 $user)
 
 == Varsel om udløb af adgangskode ==
 
@@ -63,6 +63,5 @@ TODO: The above command should ideally never ever be invoked manyally, but autom
 TODO: Omskriv som automatisk syslog-ng plugin eller cron script tilknyttet en sms gateway.
 
 === Udløbstid for konti med varighed under 100 dage ===
-{{{
-(group=<gruppe>; echo $group:; for user in `members $group`; do chage -l $user|egrep -q '^Maximum:[[:blank:]]*[0-9]{2}$' && printf $user'\t' && chage -l $user|egrep '^Password Expires:'; done)
-}}}
+
+	(group=\<gruppe>; echo $group:; for user in `members $group`; do chage -l $user|egrep -q '^Maximum:[[:blank:]]*[0-9]{2}$' && printf $user'\t' && chage -l $user|egrep '^Password Expires:'; done)