From 6534d8573252bc8f9b64744961ea7ed844a59e39 Mon Sep 17 00:00:00 2001
From: Max Henkel <henkel@gmx.at>
Date: Mon, 7 May 2012 07:46:55 +0000
Subject: mailinglist -> mailing list ;-)

---
 content/en/contact.html       |  6 +++---
 content/en/mailinglisten.html | 10 +++++-----
 content/en/services.html      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'content')

diff --git a/content/en/contact.html b/content/en/contact.html
index 9a49264..f492943 100644
--- a/content/en/contact.html
+++ b/content/en/contact.html
@@ -4,9 +4,9 @@
 If you want to know more about Funkfeuer Graz, there are several choices to get in touch.
 </p>
 
-<h2>Mailinglist</h2>
+<h2>Mailing List</h2>
 <p>
-Subscribe to our <a href="mailinglisten.html">mailinglist</a> to stay up-to-date about all the stuff happening at Funkfeuer Graz. You can also ask questions there.
+Subscribe to our <a href="mailinglisten.html">mailing list</a> to stay up-to-date about all the stuff happening at Funkfeuer Graz. You can also ask questions there.
 </p>
 
 <h2>Face-to-face</h2>
@@ -19,7 +19,7 @@ On the first and third monday each month we <a href="http://wiki.ffgraz.net/Tref
 For testing purposes IPs in the range <em>10.12.23.xx</em> (netmask <em>255.255.0.0</em>) can be used. Please don't use these IPs permanently. Severe problems can arise if two routers in the network are using the same address. Thus please use it only for short tests (max. some hours). This should be sufficient for checking the availability and performance at your location. For a long-term use please sign up for your own address.
 </p>
 <p>
-If you want to get your own IP-address please register at the <a href="http://manman.ffgraz.net/person/register">IP assignment system</a> and mark your location on the <a href="http://karte.ffgraz.net/">map</a>. Then send an e-mail with a small description of your plannings (router on roof, balcony or window) and if you were able to contact another node to the <a href="mailinglisten.html">mailinglist</a>. It helps us if you include the link to your location (e.g. https://manman.graz.funkfeuer.at/location/show/12). You can find the link in the address bar of your browser after clicking on your location in the map.
+If you want to get your own IP-address please register at the <a href="http://manman.ffgraz.net/person/register">IP assignment system</a> and mark your location on the <a href="http://karte.ffgraz.net/">map</a>. Then send an e-mail with a small description of your plannings (router on roof, balcony or window) and if you were able to contact another node to the <a href="mailinglisten.html">mailing list</a>. It helps us if you include the link to your location (e.g. https://manman.graz.funkfeuer.at/location/show/12). You can find the link in the address bar of your browser after clicking on your location in the map.
 </p>
 <p>
 IP addresses with internet access will be assigned vor node operators (persons who are willing to operate their router 24/7).
diff --git a/content/en/mailinglisten.html b/content/en/mailinglisten.html
index 3d67122..0d239b9 100644
--- a/content/en/mailinglisten.html
+++ b/content/en/mailinglisten.html
@@ -1,18 +1,18 @@
-<h1>Mailinglists</h1>
+<h1>Mailing Lists</h1>
 
-<h2><a href="http://lists.funkfeuer.at/mailman/listinfo/graz">Graz mailinglist</a></h2>
+<h2><a href="http://lists.funkfeuer.at/mailman/listinfo/graz">Graz Mailing List</a></h2>
 <p>
 This <a href="http://lists.funkfeuer.at/mailman/listinfo/graz">mailing list</a> is the entry point for all newcomers. It's the place to ask questions about Funkfeuer and how to do the first node. Additionally important information like planned maintenance and events will be announced here.
 </p>
 
-<h2><a href="https://mailman.wirdorange.org/listinfo/tech">Tech Mailingliste</a></h2>
+<h2><a href="https://mailman.wirdorange.org/listinfo/tech">Tech Mailing List</a></h2>
 <p>
 To discuss mainly technical aspects of the network this <a href="https://mailman.wirdorange.org/listinfo/tech">mailing list</a> is the place to go.
  <br />
 If you don't know where to subscribe, try the Tech and Graz mailing list.
 </p>
 
-<h2><a href="https://mailman.wirdorange.org/listinfo/core">Core Mailingliste</a></h2>
+<h2><a href="https://mailman.wirdorange.org/listinfo/core">Core Mailing List</a></h2>
 <p>
-Like in every community some topics are discussed first among a smaller group of people. If you are part of the community for some time and you are interested about internal discussions you should definitely subscribe here <a href="https://mailman.wirdorange.org/listinfo/core">Liste</a>. (has to be approved by the list admin) 
+Like in every community some topics are discussed first among a smaller group of people. If you are part of the community for some time and you are interested about internal discussions you should definitely subscribe <a href="https://mailman.wirdorange.org/listinfo/core">here</a>. (has to be approved by the list admin) 
 </p>
diff --git a/content/en/services.html b/content/en/services.html
index 6603cd8..92e3441 100644
--- a/content/en/services.html
+++ b/content/en/services.html
@@ -34,5 +34,5 @@ An outgoing e-mail Relay/SMTP server <em>smtp.graz.funkfeuer.at</em>.
 
 <p>
 More services can be found in our <a href="http://wiki.graz.funkfeuer.at/Services">wiki</a>.<br />
-If an additional service comes to your mind subscribe to our <a href="mailinglisten.html">Mailingliste</a> and let us know.
+If an additional service comes to your mind subscribe to our <a href="mailinglisten.html">mailing list</a> and let us know.
 </p>
-- 
cgit v1.2.1