summaryrefslogtreecommitdiff
path: root/content/en
diff options
context:
space:
mode:
authoraj <aj@ffgraz.net>2019-12-07 16:58:29 +0100
committeraj <aj@ffgraz.net>2019-12-07 16:58:29 +0100
commit5f04fa1d043560a777ed6ef0c0085c100e4e6f96 (patch)
tree4a3c09190d8682cbf561af7ffa8834a05a970bed /content/en
parent265def357ad78c5d2c2a99b14bf3990e4d2fbadf (diff)
Update Link Statuten
Diffstat (limited to 'content/en')
-rw-r--r--content/en/contact.html2
-rw-r--r--content/en/contact.html~42
-rw-r--r--content/en/news.html~52
3 files changed, 1 insertions, 95 deletions
diff --git a/content/en/contact.html b/content/en/contact.html
index fecccb5..074bc64 100644
--- a/content/en/contact.html
+++ b/content/en/contact.html
@@ -38,5 +38,5 @@ Brockmanngasse 15<br />
<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>
+<a href="https://wiki.graz.funkfeuer.at/Verein?action=AttachFile&do=get&target=Statuten_2019-01-28.pdf">Statuten</a>
</p>
diff --git a/content/en/contact.html~ b/content/en/contact.html~
deleted file mode 100644
index 4d05ee4..0000000
--- a/content/en/contact.html~
+++ /dev/null
@@ -1,42 +0,0 @@
-<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~
deleted file mode 100644
index f4639f9..0000000
--- a/content/en/news.html~
+++ /dev/null
@@ -1,52 +0,0 @@
-<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!
-</p>
-
-<h1>Dustmap<br /><span class="date">added on 24 May 2013</span></h1>
-<p>
-Funkfeuer Graz supports <a href="http://www.dustmap.org/">Project Dustmap</a>. The project tries to build DIY-sensornodes which can be built by anybody. These nodes will measure fine dust, temperature, humidity, noise and other environmental factors and provide the readings in realtime as open data.
-To help spreading the idea Funkfeuer works on a sensormesh based on <a href="https://en.wikipedia.org/wiki/6LoWPAN">6LoWPan</a> which can be used to connect the nodes to the internet.
-</p>
-
-<h1>no borders<br /><span class="date">added on 11 October 2012</span></h1>
-<p>
-<a href="http://weststmk.funkfeuer.at/">Funkfeuer Weststeiermark</a>, <a href="https://wlan-si.net/">WLAN Slovenia (SLO)</a>, <a href="http://www.nedwireless.hr/">NEDWireless (CRO)</a> and Funkfeuer Graz have reached another milestone. Since the end of September 2012 these networks are connected using own infrastructure. This is the first internatinal link between free networks in Europe. Further information can be found at <a href="https://wlan-si.net/en/blog/2012/10/10/we-are-internationally-wireless/">https://wlan-si.net/en/blog/2012/10/10/we-are-internationally-wireless/</a>.
-</p>
-
-<h1>Confine<br /><span class="date">added on 1 October 2012</span></h1>
-<p>
-Together with <a href="https://wien.funkfeuer.at/">Funkfeuer Vienna</a>, <a href="http://www.awmn.net/">Athens Wireless</a> and <a href="https://guifi.net/">guifi.net</a> we currently are working on a testbed for the future internet. Further information can be found at <a href="https://confine-project.eu/">https://confine-project.eu/</a>.
-</p>
-
-<h1>Against data retention<br /><span class="date">added on 20 April 2011</span></h1>
-<p>
-At the end of april the National Council (scheduled for 28.04.) passed the
-law on data retention. This bill goes far beyond the provisions prescribed by the
-EU Directive 2006/24/EC. Not only for cases of terrorism and serious crime or similar
-it shall be allowed to access the stored information but rather with any offense.
-Many experts are against this draft, but now it is to be passed. It can't be, that
-for every human in Austria without suspicion it will be stored when, where and with
-whom he or she communicated.
-<br /><br />
-<a href="http://gegenvds.at/">Inititative gegen VDS</a>
-</p>
-
-<h1>We grieve for Walter Königshofer<br /><span class="date">added on 3 April 2011</span></h1>
-<p>
-<img alt="Walter Königshofer" src="/images/walter.jpg" />
-Funkfeuer Graz mourns the long-standing supporter of the network Walter Königshofer, who unfortunately passed away on Saturday 04/02/2011. To many of us he is well known as the operator of the most southern location in Mitteregg, but also in many other parts of Funkfeuer Graz Walter has left his mark. We will miss our friend and great supporter.
-<br /><br />
-in mourning<br />
-the Funkfeuer Graz community
-</p>
-
-<h1>Campaign plus 25%<br /><span class="date">added on 9 March 2011</span></h1>
-<p>
-<a href="http://igkultur.weblog.mur.at/category/projekte/plus25/"><img alt="logo plus 25%" src="/images/igk_plus25.png" /></a>
-Funkfeuer Graz supports the campaign <a href="http://igkultur.weblog.mur.at/category/projekte/plus25/">plus 25%</a> of <a href="http://igkultursteiermark.at/">IG Kultur Steiermark</a>
-</p>