Merge branch 'master' into contact-procedure-update

1 files changed, 52 insertions, 36 deletions

diff --git a/website/english.mdwn b/website/english.mdwn
index 2e11b64..c124676 100644
--- a/website/english.mdwn
+++ b/website/english.mdwn
@@ -1,4 +1,5 @@
-# Fripost – The Free Email Association
+Fripost - The Free Email Association
+====================================
 
 Technology has never been neutral. The ownership structure of technology
 companies and their endeavour for profit ensures that usage of their services
@@ -18,7 +19,8 @@ network of servers.
 
 [[!toc levels=2]]
 
-## Join Now
+Join Now
+--------
 
 We are happy do declare that the membership fee has been decreased. Since the
 yearly meeting in Mars 2012 we lowered the entrance fee from 300 to 200
@@ -33,21 +35,21 @@ You become a member by sending 200 SEK to the association
  * By cash payment at one of the association's meetings
  * PayPal
 
-200 SEK – A small price for freedom
+200 SEK - A small price for freedom
 
 Paying the membership fee corresponds to the smallest effort members commit to
 in the association, but we expect members to take larger part in the work of
 Fripost. That means, for example, to sometime show up at the association's
 activities, or take part in the
-[[mailing lists|https://lists.fripost.org/cgi-bin/mailman/listinfo]]
-or at [[Fripost's wiki|https://wiki.fripost.org]].
+[mailing lists](https://lists.fripost.org/cgi-bin/mailman/listinfo)
+or at [Fripost's wiki](https://wiki.fripost.org).
 
 Donations are also appreciated. Fripost suggests that one can join and at
 the same time contribute with 300 SEK. To do so, pay 500 SEK to one of the bank accounts
 or use the special PayPal button.
 
- * Plusgiro – 477884-1
- * Bankgiro – 311-5060
+ * Plusgiro - 477884-1
+ * Bankgiro - 311-5060
 
 For international bank transfer details write to
 [[info@fripost.org|mailto:info@fripost.org]]. It is also possible to
@@ -74,11 +76,14 @@ information, requests for domains and aliases, together with some
 reference to the bank transfer. Alternatively you can wait for Fripost
 to take contact.
 
-More details (in Swedish) are found at the
-[[membership page|medlemskap]] and in the
-[[frequently answered questions page|https://wiki.fripost.org/faq]].
+More details (in Swedish) are found at
+the [membership page](/medlemskap) and in
+the
+[frequently answered questions page](https://wiki.fripost.org/faq).
 
-## The deal
+
+The deal
+--------
 
 A membership means:
 
@@ -86,10 +91,14 @@ A membership means:
 - The possibility to associate your own domain(s) to our mail servers
 - Unlimited number of aliases on the associated domain.
 
-## Contact, mailing lists and IRC
+Contact
+-------
+
+To contact us, send an email to
+[info@fripost.org](mailto:info@fripost.org).
 
-Otherwise, don't hesitate to contact us, send an email to
-[[info@fripost.org|mailto:info@fripost.org]]
+Mailing lists
+-------------
 
 Internally, we use the mailing lists to communicate. If you are a
 member but not yet on the list, contact us so we can add you.
@@ -99,15 +108,16 @@ association. Members are not added by default, so you have to
 explicitly state that you what to be added to the list. The members
 list is open for all members and participation is strictly voluntary.
   
-If you use [[IRC|https://en.wikipedia.org/wiki/Internet_Relay_Chat]],
-you may want to join
-[[#fripost|https://webchat.freenode.net/?channels=#fripost]] at
-[[freenode.net|https://www.freenode.net/]].
+IRC
+---
 
-More information (again in Swedish) is found at the
-[[contact page|kontakt]]
+If you use [IRC](https://en.wikipedia.org/wiki/Internet_Relay_Chat),
+you may want to join
+[#fripost](https://webchat.oftc.net/?channels=#fripost) at
+[OFTC](https://www.oftc.net/).
 
-# Fripost – Free Mailing
+Fripost - Free Mailing
+======================
 
 Free your mailing!
 
@@ -118,7 +128,8 @@ the increasingly privatised web we encounter today. A few strong parties control
 major segments of important infrastructure that millions of users depend on
 every day.
 
-## Software as a Service
+Software as a Service
+---------------------
 
 A concept introduced in the spirit of centralisation is Software as a Service
 (SaaS). SaaS means that users perform their computer work on or through a
@@ -126,7 +137,8 @@ network server on the Internet or a local network. Examples of SaaS are Amazon
 Cloud and Google Docs. One of the main problems with SaaS is that the users has
 no control over their data.
 
-## Privacy and Surveillance
+Privacy and Surveillance
+------------------------
 
 With large clientele comes a lot of power. Large transnational operators, such
 as Google, are profiting from efficient use of privacy invading
@@ -135,7 +147,8 @@ probably not asked for: advertisement, semantic analysis of email contents, and
 spying. One part of Google's marketing strategy is to sell the collected
 information to third party.
 
-## The Free Email Association
+The Free Email Association
+--------------------------
 
 Fripost was founded in order to take back a small, but important, part of our
 Internet life, namely the email communication infrastructure. We gather around
@@ -154,7 +167,8 @@ All work within the association is voluntary. The association is administrated
 by a democratically elected board, and the server administrators are chosen on
 democratic grounds.
 
-## What's the Difference?
+What's the Difference?
+----------------------
 
 With mail services on today's market, users have no power over their mailing,
 and must follow suit the provider's all whims. In that sense, those services can
@@ -168,7 +182,8 @@ bring yet another part of their computer usage under their own control.
 
 User freedom is possible!
 
-## Participate
+Participate
+-----------
 
 The membership fee, 200 SEK, is a small price for freedom. 
 
@@ -176,10 +191,10 @@ Fripost is based on voluntary work. There are always things to do for those who
 want to get involved. As said before, paying the membership fee corresponds to
 the smallest effort members take in the association, but we expect members to
 take larger part in the work of Fripost: sometime show up at the association's
-activities, or be active on the association's [[wiki|https://wiki.fripost.org]],
-[[email lists|https://lists.fripost.org/cgi-bin/mailman/listinfo]], and
-chat channel [[#fripost|https://webchat.freenode.net/?channels=#fripost]] on
-[[freenode|https://www.freenode.net/]].
+activities, or be active on the association's [wiki](https://wiki.fripost.org),
+[email lists](https://lists.fripost.org/cgi-bin/mailman/listinfo), and
+chat channel [#fripost](https://webchat.oftc.net/?channels=#fripost) at
+[OFTC](https://www.oftc.net/).
 
 Many of Fripost's members also participate by just configuring their email
 clients and free their mailing.
@@ -187,7 +202,8 @@ clients and free their mailing.
 Members are as active in the association as they like, and all members have the same
 possibilities to take part in the association's democratic process. 
 
-## More Information
+More Information
+----------------
 
 Fripost's official language is Swedish. however, many members, also in
 the administrators team, are non Swedish speakers. Therefore by-laws
@@ -199,19 +215,19 @@ get started.
 
 More sources of information:
 
- * [[Abstract of a talk|https://fscons.org/2010/infrastructure/distributed-email-system.html]],
+ * [Abstract of a talk](https://fscons.org/2010/infrastructure/distributed-email-system.html),
    given by Gustav Eek and Stefan Kangas at FSCONS, November 2010
- * [[Fripost's wiki|https://wiki.fripost.org]] contains ideas,
+ * [Fripost's wiki](https://wiki.fripost.org) contains ideas,
    instructions, and minutes
- * [[The Git repositories|https://git.fripost.org]]
+ * [The Git repositories](https://git.fripost.org)
 
-For further questions see [[contact page|kontakt]] for how to get in
+For further questions see [contact page](/kontakt) for how to get in
 contact with Fripost.
 
 Fripost started as a project within Göteborg Fellowship of FSFE, but
 is now an independent association.
 
 A version of this text is available as a
-[[leaflet|https://fripost.org/material/leaflet.pdf]], which you can
+[leaflet](https://fripost.org/material/leaflet.pdf), which you can
 print and use to spread the word.