Merge branch 'master' of coreander:/srv/git/source.redpill.dk/support_content

4 files changed, 16 insertions, 16 deletions

diff --git a/index.mdwn b/index.mdwn
index 1f67a30..b2a8daf 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,6 +1,6 @@
 # ICT documentation
 
-This is ICT documentation for [[!template id=realm]].
+This is ICT documentation for [[!template id=realmdescription]].
 
 If you just got a new [[account]], then please go read the [[intro]].
 
diff --git a/intro.mdwn b/intro.mdwn
index 8a10733..7dc8fca 100644
--- a/intro.mdwn
+++ b/intro.mdwn
@@ -8,33 +8,33 @@ cellphone text message).
 The password you received has only a short lifespan, and **must** be changed
 soon.
 
-
 ## Pick a good password
 
 Invent something impossible to guess, yet easy to remember.
 
- * Avoid personal info. Don't use your mother's birthday or your pet cat.
- * Avoid plain words. Gibberish mixed with mumbo jumbo is much better (robots
-   use dictionaries!).
+[[!template id=note text="""
+ * Avoid personal info, like your mother's birthday or your pet cat.
+ * Use gibberish rather than real words (robots use dictionaries!).
+"""]]
 
 Suggestion: Think of a phrase - e.g. a poem or a song. Pick first letter of
 each word. Add a number. Gibberish in itself, but easy (for you) to
 remember/recreate.
 
-
 ## Save your password in your head only
 
 Your password is strictly personal.
 
+[[!template id=note text="""
  * Do not write it down.
- * Do not **ever** reveal it to anyone. Not a friend, your boss, the police, me
-   or other technicians.
- * Be proud if you forget your password: That means you picked a strong
-   password :-)
-
-If you loose or reveal your password then just report it, and a new one is
-created for you (and texted to you, if your cellphone number is known to the
-system).
+ * Never **ever** reveal it to anyone. Not to a friend, your boss, the police,
+   or to technicians.
+ * Be proud if you forget it: That means you picked a strong password :-)
+"""]]
+
+Don't worry if you loose or reveal your password: just ask the supporters to
+reset your password - and make sure that they have your cellphone number, then
+a new temporary password will be texted to you.
 
 
 ## Change your password
diff --git a/services.mdwn b/services.mdwn
index 711e0e7..fa57940 100644
--- a/services.mdwn
+++ b/services.mdwn
@@ -1,6 +1,6 @@
 # Services
 
-A set of services is offered at [[!template id=realm]].
+A set of services is offered at [[!template id=realmdescription]].
 
  * [[Websites]]
  * [[Mailinglists]]
diff --git a/topbar.mdwn b/topbar.mdwn
index 02b3f88..a78adae 100644
--- a/topbar.mdwn
+++ b/topbar.mdwn
@@ -1,2 +1,2 @@
-* [[Overview]]
+* [[General overview|index]]
 * [[Services]]
\ No newline at end of file