From 5c41301a3ced0ae1c2f3104fbaae6c3b2dec1d3e Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 8 Aug 2016 18:23:06 +0200
Subject: Restructure to new file naming convention.

---
 README.md    |  15 +++++++++
 USE.md       | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/intro.md |  17 ----------
 doc/setup.md | 101 -----------------------------------------------------------
 doc/use.md   |  30 ------------------
 5 files changed, 116 insertions(+), 148 deletions(-)
 create mode 100644 README.md
 create mode 100644 USE.md
 delete mode 100644 doc/intro.md
 delete mode 100644 doc/setup.md
 delete mode 100644 doc/use.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..2e377f6
--- /dev/null
+++ b/README.md
@@ -0,0 +1,15 @@
+# Mail handling
+
+Each user [[account]] is an email account -
+with one ore more email [[addresses]] attached.
+
+Emails are accessed either via webmail at [[!template id=webmailurl]],
+or (recommended) using a real email program.
+
+
+## Use
+
+ * [[Guide|USE]] to setting up and using a real email program
+ * Dealing with disk [[quota]]
+ * Subscribing to and and using [[mailinglists]]
+ * [[Problem]] reporting
diff --git a/USE.md b/USE.md
new file mode 100644
index 0000000..62014be
--- /dev/null
+++ b/USE.md
@@ -0,0 +1,101 @@
+# Setting up your personal email 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.
+same location no matter if you have more addresses attached).
+
+
+## Webmail setup
+
+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,
+each with different strengths and weaknesses.
+
+The topmost of the webmail applications, IMP, is recommended, due to its most
+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
+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]]
+ 2. Pick the topmost webmail application, IMP
+ 3. Login using your personal username and password
+
+
+## Recommended setup of local email program
+
+If you have a computer of your own, it is recommended to use a "real" email
+application in favor of webmail. It works faster and is more stable. It is also
+puts less burden on the server.
+
+ 1. Download [Mozilla Thunderbird](http://www.mozilla.com/thunderbird)
+
+    (!) Other email programs work too, but Mozilla Thunderbird is considered
+    most reliable, while still both userfriendly and
+    [free](http://en.wikipedia.org/wiki/Free_software).
+
+ 2. Create an "imap" account
+
+    (!) The alternative, pop3 (suggested by default in many applications), is
+    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
+    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):
+    1. Enable "SSL"
+    2. Change port number from the standard 25 to 465 (Mozilla Thunderbird does
+       this automatically)
+    3. Enable authentication, using same username and password as for your
+       incoming mail
+
+    /!\ Avoid "TLS" (also called "secure *passwords*") - it does not work
+    together with SSL.
+
+Many email applications help you setting up your account using a "wizard".
+Unfortunately security setup is often left out from such routines.  
+If you are guided by a wizard, you therefore afterwards need to manually check
+that the configuration produced match the above instructions.
+
+/!\ Some applications stash away security options (SSL, password etc.) below 
+"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
+id=realm]] (see external reference to riseup.net at the bottom of this page).
+Mozilla Thunderbird need no special handling.
+
+
+## Special quirks with Apple Mail
+
+The default setting for some versions of Apple Mail is to leave a copy of all
+your emails on the server, even when deleted in the application.
+
+If you use Apple Mail, you need to avoid filling up your
+[[allowed disk space|quota/intro]] by changing that behaviour:
+
+ 1. Open "Mail"
+ 2. Go to Preferences > Accounts > Advanced
+ 3. Check "remove copy from server after retrieving a message"
+
+
+## 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
+"mail.riseup.net" is mentioned.
+
+ * [Setting up email applications](http://help.riseup.net/mail/mail-clients/)
+ * [Dealing with security certificates](http://help.riseup.net/mail/security/certificates/)
+ * [Avoiding "leave on server" with pop3](http://www.earthnet.net/support/email/email_pop_remove_copy.htm)
diff --git a/doc/intro.md b/doc/intro.md
deleted file mode 100644
index e409e67..0000000
--- a/doc/intro.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Overview of email documentation
-
-Each user [[account]] is an email account - with one ore more email
-[[addresses]] attached.
-
-
-## Setup
-
- * Short [[mail/intro]] to start using email
- * [[Configuration|mail/setup]] more detailed
-
-
-## Use
-
- * Dealing with disk [[quota]]
- * Subscribing to and and using [[mailinglists]]
- * [[Problem]] reporting
diff --git a/doc/setup.md b/doc/setup.md
deleted file mode 100644
index 62014be..0000000
--- a/doc/setup.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Setting up your personal email 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.
-same location no matter if you have more addresses attached).
-
-
-## Webmail setup
-
-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,
-each with different strengths and weaknesses.
-
-The topmost of the webmail applications, IMP, is recommended, due to its most
-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
-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]]
- 2. Pick the topmost webmail application, IMP
- 3. Login using your personal username and password
-
-
-## Recommended setup of local email program
-
-If you have a computer of your own, it is recommended to use a "real" email
-application in favor of webmail. It works faster and is more stable. It is also
-puts less burden on the server.
-
- 1. Download [Mozilla Thunderbird](http://www.mozilla.com/thunderbird)
-
-    (!) Other email programs work too, but Mozilla Thunderbird is considered
-    most reliable, while still both userfriendly and
-    [free](http://en.wikipedia.org/wiki/Free_software).
-
- 2. Create an "imap" account
-
-    (!) The alternative, pop3 (suggested by default in many applications), is
-    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
-    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):
-    1. Enable "SSL"
-    2. Change port number from the standard 25 to 465 (Mozilla Thunderbird does
-       this automatically)
-    3. Enable authentication, using same username and password as for your
-       incoming mail
-
-    /!\ Avoid "TLS" (also called "secure *passwords*") - it does not work
-    together with SSL.
-
-Many email applications help you setting up your account using a "wizard".
-Unfortunately security setup is often left out from such routines.  
-If you are guided by a wizard, you therefore afterwards need to manually check
-that the configuration produced match the above instructions.
-
-/!\ Some applications stash away security options (SSL, password etc.) below 
-"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
-id=realm]] (see external reference to riseup.net at the bottom of this page).
-Mozilla Thunderbird need no special handling.
-
-
-## Special quirks with Apple Mail
-
-The default setting for some versions of Apple Mail is to leave a copy of all
-your emails on the server, even when deleted in the application.
-
-If you use Apple Mail, you need to avoid filling up your
-[[allowed disk space|quota/intro]] by changing that behaviour:
-
- 1. Open "Mail"
- 2. Go to Preferences > Accounts > Advanced
- 3. Check "remove copy from server after retrieving a message"
-
-
-## 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
-"mail.riseup.net" is mentioned.
-
- * [Setting up email applications](http://help.riseup.net/mail/mail-clients/)
- * [Dealing with security certificates](http://help.riseup.net/mail/security/certificates/)
- * [Avoiding "leave on server" with pop3](http://www.earthnet.net/support/email/email_pop_remove_copy.htm)
diff --git a/doc/use.md b/doc/use.md
deleted file mode 100644
index e541867..0000000
--- a/doc/use.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Email introduction
-
-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.
-
-All incoming emails are stored in your account inbox, no matter what email
-address was addressed.
-
-
-## Webmail
-
-Webmail is at [[!template id=webmailurl]]
-
-This is ready to use as is - no additional setup required to get started.
-
-
-## Local email application
-
-"Real" email applications require some configuration to work.
-
-Here's a short summary of the needed setup:
-
- * 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
-   regular port 25).
- * You MUST use password **authentication** for all email services (also smtp).
-- 
cgit v1.2.3