rename installing/exim4 to installing/email

because it's no longer just about exim but also postfix.
This commit includes updating links in the docs to the new page.

6 files changed, 10 insertions, 11 deletions

diff --git a/_layouts/page.html b/_layouts/page.html
index c82d159fb..6f060d252 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -22,7 +22,7 @@ layout: default
               <li><a href="{{ site.baseurl }}installing/ami">Alaveteli AMI for EC2</a></li>
               <li><a href="{{ site.baseurl }}installing/manual_install">Installing by hand</a></li>
               <li><a href="{{ site.baseurl }}installing/macos">MacOS X</a></li>
-              <li><a href="{{ site.baseurl }}installing/exim4">MTA (email)</a></li>
+              <li><a href="{{ site.baseurl }}installing/email">MTA (email)</a></li>
             </ul>
           </li>
           <li><a href="{{ site.baseurl }}customising/">Customising</a>
diff --git a/glossary.md b/glossary.md
index 32952be1e..4be211c38 100644
--- a/glossary.md
+++ b/glossary.md
@@ -192,8 +192,8 @@ Definitions
       <p>More information:</p>
       <ul>
         <li>
-			    see these instructions for <a href="{{ site.baseurl }}installing/exim4">configuring exim4</a>,
-          a common MTA
+			    see these instructions for <a href="{{ site.baseurl }}installing/email">configuring your MTA</a>
+          (examples are for exim4 and postfix, two of the most common)
         </li>
       </ul>
     </div>
diff --git a/installing/exim4.md b/installing/email.md
index bad893c8e..bad893c8e 100644
--- a/installing/exim4.md
+++ b/installing/email.md
diff --git a/installing/index.md b/installing/index.md
index c77e30ded..32ed821ea 100644
--- a/installing/index.md
+++ b/installing/index.md
@@ -23,6 +23,6 @@ If you're setting up a development server on MacOS X, we've also got [MacOS inst
 
 Alaveteli needs to be able to send and receive email, so you need to setup your MTA (Mail Transfer Agent) appropriately.
 
-* [Installing the MTA]({{ site.baseurl }}installing/exim4)
+* [Installing the MTA]({{ site.baseurl }}installing/email)
 
 
diff --git a/installing/manual_install.md b/installing/manual_install.md
index 03626a26e..6d17bd8e9 100644
--- a/installing/manual_install.md
+++ b/installing/manual_install.md
@@ -206,7 +206,7 @@ to the test config in `database.yml` (as seen in `database.yml-example`)
 
 You will need to set up an email server (MTA) to send and receive emails. Full
 configuration for an MTA is beyond the scope of this document -- see this
-[example config for Exim4]({{ site.baseurl }}installing/exim4).
+[example config for Exim4]({{ site.baseurl }}installing/email).
 
 Note that in development mode mail is handled by mailcatcher by default so
 that you can see the mails in a browser - see http://mailcatcher.me/ for more
@@ -243,7 +243,7 @@ When you set up your MTA, if there is some error inside Rails, the
 email is returned with an exit code 75, which for Exim at least means the MTA
 will try again later. Additionally, a stacktrace is emailed to `CONTACT_EMAIL`.
 
-See [this example]({{ site.baseurl }}exim4) for a possible configuration for Exim (>=1.9).
+See [this example]({{ site.baseurl }}installing/email/) for a possible configuration for Exim (>=1.9).
 
 A well-configured installation of this code will have had Exim make
 a backup copy of the email in a separate mailbox, just in case.
@@ -493,7 +493,7 @@ things that can be automated for deployment.
     First, you need to check that your MTA is delivering relevant
     incoming emails to the `script/mailin` command.  There are various
     ways of setting your MTA up to do this; we have documented
-    [one way of doing it]({{ site.baseurl }}installing/exim4/#troubleshooting-exim) 
+    [one way of doing it]({{ site.baseurl }}installing/email/#troubleshooting-exim) 
     in Exim, including a command you can use to check that the email
     routing is set up correctly.
 
diff --git a/running/server.md b/running/server.md
index 95f69b63d..703372cd4 100644
--- a/running/server.md
+++ b/running/server.md
@@ -65,11 +65,10 @@ achieved with rewrite rules that redirect URLs beginning with `/admin`.
 
 ## Email configuration
 
-See the application-specific 
-[email configuration for exim]({{ site.baseurl }}installing/exim4) for
+See the [configuration for exim or postfix]({{ site.baseurl }}installing/email/) for
 setting up your Mail Transfer Agent (MTA). It is possible to use other MTAs &mdash;
-if you use a different one, the documentation for exim should provide you with 
-enough information to get started. If you do use a different one, please add to the
+if you use a different one, the documentation there should provide you with 
+enough information to get started. If this applies to you, please add to the
 documentation!
 
 On a live server, you should also consider the following, to increase the