From dd10d5c31a38e8221bfeaa10ae13041111a1ff54 Mon Sep 17 00:00:00 2001 From: Lucas Werkmeister Date: Wed, 18 Dec 2019 18:39:38 +0100 Subject: [PATCH 1/2] Update emergency info document MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I checked that everything’s still up to date; sources: * DECT numbers and orga email: https://events.ccc.de/congress/2019/wiki/index.php/Static:Safety_and_Security * Police: https://www.polizei.sachsen.de/de/16342.htm * Frauennotruf: http://www.frauennotruf-leipzig.de/ * Fire department: https://www.leipzig.de/buergerservice-und-verwaltung/sicherheit-und-ordnung/feuerwehr/ * Ambulance: https://www.leipzig.de/buergerservice-und-verwaltung/sicherheit-und-ordnung/feuerwehr/rettungsdienst/ --- ...mergency Info.md => 36C3 Emergency Info.md | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) rename 35C3 Emergency Info.md => 36C3 Emergency Info.md (64%) diff --git a/35C3 Emergency Info.md b/36C3 Emergency Info.md similarity index 64% rename from 35C3 Emergency Info.md rename to 36C3 Emergency Info.md index 491eb5a..d1a133c 100644 --- a/35C3 Emergency Info.md +++ b/36C3 Emergency Info.md @@ -1,4 +1,4 @@ -# Emergency Information for [35c3][0]: +# Emergency Information for [36c3][0]: ## English @@ -6,14 +6,14 @@ If you're in an emergency shout HELP! If you need help, call for help, there are many, many friendly people around to help you. -* 35c3 Medical Emergency or in case of fire: Call local DECT 112 ([CERT](https://cert.ccc.de), medical professionals) -* 35c3 Security: Call local DECT 110 -* 35c3 Awareness: Call local DECT 113 +* 36c3 Medical Emergency or in case of fire: Call local DECT 112 ([CERT](https://cert.ccc.de), medical professionals) +* 36c3 Security: Call local DECT 110 +* 36c3 Awareness: Call local DECT 113 * local law enforcement in Leipzig: 110 or +49 341 - 59350 * local sexual assault hotline for women in Leipzig: +49 341 - 4798179 [Frauennotruf](http://www.frauennotruf-leipzig.de/) -* Leipzig fire department: +49 341 1230 (BETTER USE 112 ON YOUR non-35c3 PHONE) -* Leipzig ambulance: +49 341 1230 (BETTER USE 112 ON YOUR non-35c3 PHONE) -* 35c3 organizers: [35c3-orga@cccv.de](mailto:35c3-orga@cccv.de) +* Leipzig fire department: +49 341 1230 (BETTER USE 112 ON YOUR non-36c3 PHONE) +* Leipzig ambulance: +49 341 1230 (BETTER USE 112 ON YOUR non-36c3 PHONE) +* 36c3 organizers: [36c3-orga@cccv.de](mailto:36c3-orga@cccv.de) ## Deutsch @@ -21,13 +21,13 @@ Wenn du dich in einer Notlage befindest schrei HILFE! Wenn du Hilfe benötigst, frage nach Hilfe. Es sind viele, viele freundliche Menschen da, die dir sicherlich helfen werden. -* 35c3 medizinischer Notfall oder Feuer: Im lokalen DECT-Netz 112 ([CERT](https://cert.ccc.de), Menschen vom Fach) -* 35c3 Security: Im lokalen DECT-Netz 110 -* 35c3 Awareness: Im lokalen DECT-Netz 113 +* 36c3 medizinischer Notfall oder Feuer: Im lokalen DECT-Netz 112 ([CERT](https://cert.ccc.de), Menschen vom Fach) +* 36c3 Security: Im lokalen DECT-Netz 110 +* 36c3 Awareness: Im lokalen DECT-Netz 113 * Polizei in Leipzig: 110 oder +49 341 - 59350 * Frauennotruf in Leipzig (bei sexuellen Übergriffen oder sexueller Gewalt): +49 341 - 4798179 [Frauennotruf](http://www.frauennotruf-leipzig.de/) * Feuerwehr Leipzig: +49 341 1230 (BESSER: 112 im öffentlichen Telefonnetz) * Rettungsdienst Leipzig: +49 341 1230 (BESSER: 112 im öffentlichen Telefonnetz) -* 35c3 Orga: [35c3-orga@cccv.de](mailto:35c3-orga@cccv.de) +* 36c3 Orga: [36c3-orga@cccv.de](mailto:36c3-orga@cccv.de) -[0]:http://events.ccc.de/category/35c3/ "35c3 Event Blog" +[0]: https://events.ccc.de/category/36c3/ "36c3 Event Blog" From 9e22cc0401573554598185af3965dfba380789c8 Mon Sep 17 00:00:00 2001 From: Martin Schuster Date: Thu, 19 Dec 2019 15:28:06 +0100 Subject: [PATCH 2/2] Update URLs for 36C3 --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 527dfe5..040bc24 100644 --- a/README.md +++ b/README.md @@ -695,7 +695,7 @@ These people have contributed to improve this list for everyone (in no particula -[1]:https://events.ccc.de/congress/2018/wiki/Static:How_To_Survive +[1]:https://events.ccc.de/congress/2019/wiki/Static:Information_Security [2]:https://www.eventphone.de/ [3]:https://help.ccc.de/ [4]:http://r0ket.de/ @@ -707,15 +707,15 @@ These people have contributed to improve this list for everyone (in no particula [9]:https://github.com/sshuttle/sshuttle [10]:https://www.blau.de/ [11]:https://en.wikipedia.org/wiki/Sim_card#Formats "SIM card formats" -[12]:https://events.ccc.de/congress/2018/wiki/ -[13]:https://events.ccc.de/congress/2018/wiki/Static:Projects -[14]:https://events.ccc.de/congress/2018/wiki/Static:Assemblies +[12]:https://events.ccc.de/congress/2019/wiki/ +[13]:https://events.ccc.de/congress/2019/wiki/Static:Projects +[14]:https://events.ccc.de/congress/2019/wiki/Static:Assemblies [15]:https://bettercrypto.org/ "Better Crypto" [16]:https://openvpn.net/ "OpenVPN" [17]:http://code.kryo.se/iodine/ "iodine" [18]:http://openssh.org/ "OpenSSH" [19]:https://www.torproject.org/ "Tor Project" -[20]:https://events.ccc.de/congress/2018/Fahrplan/ "35C3 Fahrplan aka conference schedule" +[20]:https://fahrplan.events.ccc.de/congress/2019/Fahrplan/ "36C3 Fahrplan aka conference schedule" [21]:https://www.organspende-info.de [22]:https://play.google.com/store/apps/details?id=com.googlecode.droidwall.free [24]:https://wifipineapple.com/ "WiFi Pineapple"