Add and use mailhost and webmailurl templates throughout the site.

2 files changed, 9 insertions, 9 deletions

diff --git a/mail/intro.mdwn b/mail/intro.mdwn
index 9659e53..6192b82 100644
--- a/mail/intro.mdwn
+++ b/mail/intro.mdwn
@@ -10,7 +10,7 @@ address was addressed.
 
 ## Webmail
 
-(contact your technicians for the location of webmail at this system)
+Webmail is at [[template id=webmailurl]]
 
 This is ready to use as is - no additional setup required to get started.
 
@@ -21,8 +21,8 @@ This is ready to use as is - no additional setup required to get started.
 
 Here's a short summary of the needed setup:
 
- * Email server is the same for both incoming and outgoing services (contact
-   your technicians for the hostname).
+ * Email server is **[[template id=mailhost]]**, for both incoming and outgoing
+   services.
  * Incoming email is reachable through **pop3** and **imap**. Imap is
    recommended for most cases.
  * Outgoing email is accepted through secure smtp on port **465** (not the
diff --git a/mail/setup.mdwn b/mail/setup.mdwn
index 385c38f..cf5d3b1 100644
--- a/mail/setup.mdwn
+++ b/mail/setup.mdwn
@@ -12,8 +12,8 @@ same location no matter if you have more addresses attached).
 Webmail is probably the simplest way to reach your emails. Somewhat like
 HoTMaiL but without advertisements.
 
-One common website (contact your technicians for its location) offers several
-webmail applications, each with different strengths and weaknesses.
+The website [[template id=webmailurl]] offers several webmail applications,
+each with different strengths and weaknesses.
 
 The topmost of the webmail application, IMP, is recommended, due to its most
 complete functionality. It provides access to changing your account
@@ -26,7 +26,7 @@ order.
 
 Entering webmail, step by step:
 
- 1. Go to the webmail website (contact your technicians for its location)
+ 1. Go to [[template id=webmailurl]]
  2. Pick the topmost webmail application, IMP.
  3. Login using your personal username and password
 
@@ -49,8 +49,8 @@ puts less burden on the server.
     less flexible - e.g. does not work well concurrently with webmail access to
     your emails.
 
- 3. Use your provided username, and the hostname provided by your technicians,
-    as both incoming and outgoing server.
+ 3. Use your provided username and **[[template id=mailhost]]** as both
+    incoming and outgoing server.
  4. Enable encryption for incoming mail (imap or pop3):
     * Enable "SSL" (also called "secure connection")
  5. Enable encryption for outgoing mail (smtp):
@@ -93,7 +93,7 @@ If you use Apple Mail, you need to avoid filling up your
 ## External links
 
 The help texts at riseup.net is generally good, as their system works much like
-this. Just remember to use the mailserver hostname of this system whenever
+this. Just remember to use **[[template id=mailhost]]** whenever
 "mail.riseup.net" is mentioned.
 
  * [Setting up email applications](http://help.riseup.net/mail/mail-clients/)