summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/intro.mdwn6
-rw-r--r--mail/setup.mdwn14
2 files changed, 10 insertions, 10 deletions
diff --git a/mail/intro.mdwn b/mail/intro.mdwn
index 6192b82..7112695 100644
--- a/mail/intro.mdwn
+++ b/mail/intro.mdwn
@@ -1,6 +1,6 @@
# Email introduction
-Your account at [[template id=realm]] has at least one email address attached.
+Your account at [[!template id=realm]] has at least one email address attached.
Additional addresses can be added on request. Some may already be added.
@@ -10,7 +10,7 @@ address was addressed.
## Webmail
-Webmail is at [[template id=webmailurl]]
+Webmail is at [[!template id=webmailurl]]
This is ready to use as is - no additional setup required to get started.
@@ -21,7 +21,7 @@ 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 **[[template id=mailhost]]**, for both incoming and outgoing
+ * 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.
diff --git a/mail/setup.mdwn b/mail/setup.mdwn
index 6c4f363..1b70ba4 100644
--- a/mail/setup.mdwn
+++ b/mail/setup.mdwn
@@ -1,6 +1,6 @@
# Setting up your personal email account
-As a user at [[template id=realm]] you have been given a single [[account]].
+As a user at [[!template id=realm]] you have been given a single [[account]].
Tied to this account is an email address (or possibly more than one).
All incoming emails are delivered to the inbox of your personal account (ie.
@@ -12,7 +12,7 @@ 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.
-The website [[template id=webmailurl]] offers several webmail applications,
+The website [[!template id=webmailurl]] offers several webmail applications,
each with different strengths and weaknesses.
The topmost of the webmail applications, IMP, is recommended, due to its most
@@ -20,13 +20,13 @@ complete functionality. It provides access to changing your account
[[password]].
Same website also lists some alternative websites also offering webmail access
-to accounts at [[template id=realm]]. Save those addresses on your own
+to accounts at [[!template id=realm]]. Save those addresses on your own
computer, for the case of the primary webmail service one day being out of
order.
Entering webmail, step by step:
- 1. Go to [[template id=webmailurl]]
+ 1. Go to [[!template id=webmailurl]]
2. Pick the topmost webmail application, IMP
3. Login using your personal username and password
@@ -49,7 +49,7 @@ 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 **[[template id=mailhost]]** as both
+ 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")
@@ -72,7 +72,7 @@ that the configuration produced match the above instructions.
"advanced settings" or similar.
Your email application might complain that it does not trust the mail server.
-You then need to accept the "security certificate" used at [[template
+You then need to accept the "security certificate" used at [[!template
id=realm]] (see external reference to riseup.net at the bottom of this page).
Mozilla Thunderbird need no special handling.
@@ -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 **[[template id=mailhost]]** 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/)