From cc07d921dc748e4e6e9cc4675d1c822f392a9321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Schweizer?= <oe6jue@oevsv.at>
Date: Mon, 5 Mar 2018 21:07:41 +0100
Subject: GV

---
 content/en/contact.html~ | 42 ++++++++++++++++++++++++++++++++++++++++++
 content/en/news.html     |  4 ++++
 content/en/news.html~    |  4 ++++
 3 files changed, 50 insertions(+)
 create mode 100644 content/en/contact.html~

(limited to 'content/en')

diff --git a/content/en/contact.html~ b/content/en/contact.html~
new file mode 100644
index 0000000..4d05ee4
--- /dev/null
+++ b/content/en/contact.html~
@@ -0,0 +1,42 @@
+<h1>Contact</h1>
+
+<p>
+If you want to know more about Funkfeuer Graz, there are several choices to get in touch.
+</p>
+
+<h2>Mailing List</h2>
+<p>
+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>
+<p>
+On the first and third monday each month we <a href="https://wiki.ffgraz.net/Treffen">meet</a> each other to share our know-how and to catch up with every interested person or node operator over a drink. The time and place will be announced on the homepage. Usually the meetings will be held in <a href="https://www.realraum.at">realraum</a>, Jakoministraße 16.
+</p>
+
+<h2>І want an IP address:</h2>
+<p>
+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="https://manman.ffgraz.net/person/register">IP assignment system</a> and mark your location on the <a href="https://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 for node operators (persons who are willing to operate their router 24/7).
+</p>
+<p>
+Important: For more information visit our <a href="https://wiki.ffgraz.net">wiki</a>.
+</p>
+
+<h1>Legal Notice</h1>
+<p>
+Responsible for the content of this website, regarding the duty to inform following the § 5 sec. 1 E-Commerce law:
+<br /><br />
+Funkfeuer Graz - Verein zur Förderung freier Netze<br />
+Wielandgasse 19/2<br />
+8010 Graz
+<br /><br />
+ZVR Zahl: 810132312
+<br /><br />
+<a href="https://wiki.graz.funkfeuer.at/Verein?action=AttachFile&amp;do=get&amp;target=Statuten_Graz_2006_10_18_ohne_Dach.pdf">Statuten</a>
+</p>
diff --git a/content/en/news.html b/content/en/news.html
index f4639f9..0a5410d 100644
--- a/content/en/news.html
+++ b/content/en/news.html
@@ -1,3 +1,7 @@
+<h1>General Assembly<br /><span class="date">added on 5th Feb 2018</span></h1>
+<p>
+Calling of General Assembly for Monday, 19th Mar 2018 at 8pm!
+</p>
 <h1>General Assembly<br /><span class="date">added on 11th Feb 2017</span></h1>
 <p>
 Calling of General Assembly for Friday, 17th Feb 2017 at 8pm!
diff --git a/content/en/news.html~ b/content/en/news.html~
index ec3b1fd..f4639f9 100644
--- a/content/en/news.html~
+++ b/content/en/news.html~
@@ -1,3 +1,7 @@
+<h1>General Assembly<br /><span class="date">added on 11th Feb 2017</span></h1>
+<p>
+Calling of General Assembly for Friday, 17th Feb 2017 at 8pm!
+</p>
 <h1>General Assembly<br /><span class="date">added on 16th Feb 2016</span></h1>
 <p>
 Calling of General Assembly for Monday, 29th Feb 2016 at 8pm!
-- 
cgit v1.2.1