From 2ca880e7ce5afb56cf55dac86a9a25fe5edb418a Mon Sep 17 00:00:00 2001 From: MacLemon Date: Fri, 23 Dec 2016 11:32:01 +0100 Subject: [PATCH 1/6] Fixed small lighters section with current flight regulation info and accepted ID documents when travelling with Deusche Bahn. --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 14de10f..2b90302 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Stuff that you're not allowed to bring on a plane or otherwise need to send via - Handcuffs -### Items *only* allowed in hand luggage, but *not* checked in luggage +### Items *only* allowed to be carried *on your body*, but *neither* in checked in luggage nor hand-lagguage. - Small lighters @@ -80,7 +80,7 @@ This applies to the Congress Center as well as your hotel windows. ### Documents -- Train/plane tickets (including verification documents for self-printed DB tickets, like your credit card or Personalausweis[49].) +- Train/plane tickets (including verification documents for self-printed DB tickets. Check the List of accepted documents! [Was ist als Identifizierungskarte zugelassen?][41].) - Congress tickets (printed or digital. iOS passbook/wallet, PDF) - Passport or other kind of photo ID (Personalausweis) - Driver's license (even an international one) @@ -646,7 +646,7 @@ These people have contributed to improve this list for everyone (in no particula [26]:https://play.google.com/store/apps/details?id=nerd.tuxmobil.fahrplan.congress [27]:https://github.com/tuxmobil/CampFahrplan [28]:https://itunes.apple.com/us/app/30c3-fahrplan-30c3-event-organizer/id764609606?mt=8 -[29]: http://en.wikipedia.org/wiki/Knife_legislation#Germany +[29]:http://en.wikipedia.org/wiki/Knife_legislation#Germany [30]:https://rad1o.badge.events.ccc.de/ "Rad1o Badge, CCCamp 2015" [31]:https://www.eventphone.de/wiki/index.php/DECT_Phone_Compatibility_List "Eventphone DECT handset compatibility list" [32]:https://www.youtube.com/watch?v=J0MUEqzWve8 "YouTube: B.O.O.K." @@ -658,6 +658,7 @@ These people have contributed to improve this list for everyone (in no particula [38]:https://cert.ccc.de/ "C3 CERT" [39]:https://events.ccc.de/congress/2016/wiki/Assembly:Coffeenerds "Coffeenerds at 33c3" [40]:http://britishbusinessenergy.co.uk/plug-socket/ "World Electrical Plug & Socket Map" +[41]:https://www.bahn.de/hilfe/view/pk/de/ticketbuchung/identifizierungskarte.shtml "Deutsche Bahn: Was ist als Identifizierungskarte zugelassen?" [100]:https://twitter.com/Astarioth [101]:https://twitter.com/N4mes From e281247a65d666e83acde5545801ec9ff55ee3a2 Mon Sep 17 00:00:00 2001 From: MacLemon Date: Fri, 23 Dec 2016 12:11:19 +0100 Subject: [PATCH 2/6] Eeek, a typo. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b90302..255859e 100644 --- a/README.md +++ b/README.md @@ -563,7 +563,7 @@ If you need help with buying a SIM card, ask a local for assistance. They're fri ## Staying up-to-date -Most events publich a lot of information about events as they happen. There are many ways to stay in the loop during the event or in between by subscribing to RSS feeds, Twitter accounts, mailing lists and even newsletters [sic]. +Most events publish a lot of information about events as they happen. There are many ways to stay in the loop during the event or in between by subscribing to RSS feeds, Twitter accounts, mailing lists and even newsletters [sic]. For a list of CCC related news sources you may be interested in following, see CCCongress.md in this repository. From 67e6dbbfbc43905f7ccc3566c73aeb8dafa70042 Mon Sep 17 00:00:00 2001 From: jomo Date: Fri, 23 Dec 2016 16:43:18 +0100 Subject: [PATCH 3/6] Stickers! how was this not in here yet? --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 255859e..9846cb5 100644 --- a/README.md +++ b/README.md @@ -457,6 +457,7 @@ Check out the [USB-C cable matrix][36] on what a certain manufacturer's cable ac - A pillow (and sleeping bag/camping mat if you intend to sleep at the gym or in heaven) - Velcro straps to mount things to other things or people to things - Your favourite tea/coffee for [Coffeenerds][39] +- All the stickers to trade and give away! @@ -615,6 +616,7 @@ These people have contributed to improve this list for everyone (in no particula - [@trollkopp][137] - [@dot__not][138] - [@Katti][139] +- [jomo][140] ## Links @@ -700,3 +702,4 @@ These people have contributed to improve this list for everyone (in no particula [137]:https://twitter.com/trollkopp [138]:https://twitter.com/dot__not [139]:https://twitter.com/Katti +[140]:https://twitter.com/0xjomo From 1694e3465526d891aca81e4df85dba350399e70e Mon Sep 17 00:00:00 2001 From: MacLemon Date: Sun, 25 Dec 2016 11:16:32 +0100 Subject: [PATCH 4/6] Added Flip Flops for shared showers --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 255859e..2f31686 100644 --- a/README.md +++ b/README.md @@ -126,6 +126,7 @@ Event and location related emergency information is in a seperate document for t - Tooth brush (plus charger if it is an electrical one) - Toothpaste - Shower gel +- Flip Flops for shared showers - Shampoo (to avoid bad hair days) - Conditioner - Tampons From 013730c0e12bc30eb213e05408f3871e31fa88c0 Mon Sep 17 00:00:00 2001 From: sandzwerg Date: Sun, 25 Dec 2016 15:26:37 +0100 Subject: [PATCH 5/6] Added Awareness Team to Emergency Info For the 33c3 the Awareness Team is again available under DECT 113 --- 33C3 Emergency Info.md | 1 + 1 file changed, 1 insertion(+) diff --git a/33C3 Emergency Info.md b/33C3 Emergency Info.md index 72c93b8..c0954aa 100644 --- a/33C3 Emergency Info.md +++ b/33C3 Emergency Info.md @@ -6,6 +6,7 @@ If you need help, just call for help, there are many, many friendly people aroun * 33c3 Medical Emergency or in case of fire: Call local DECT 112 (CERT) * 33c3 Security: Call local DECT 110 +* 33c3 Awareness: Call local DECT 113 * 33c3 organizers: 33c3-orga@cccv.de * local law enforcement in Hamburg: 110 or +49 40 4286 - 51410 * local sexual assault hotline in Hamburg: +49 40 - 255566 (http://www.frauennotruf-hamburg.de) From b9f8cc08e38bd1cf3838594c6c69bbaf35b66044 Mon Sep 17 00:00:00 2001 From: Jan Date: Sun, 25 Dec 2016 16:28:14 +0100 Subject: [PATCH 6/6] Added link for the power-saving feature --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2f31686..4bae422 100644 --- a/README.md +++ b/README.md @@ -257,7 +257,7 @@ For travelling abroad there is a handy [World Electrical Plug & Socket Map][40] - Smart Watches - Charging cable or docking station required to charge - A portable battery pack (aka powerbank) so you can charge on the go. (And the necessary cable to recharge that battery pack overnight. A USB-A to micro USB cable in most cases, maybe already a USB-C cable as well.) -- A spare plastic card to fool the power-saving system in your hotel room, while you're not there. (So your gear can charge and the LEDs keep blinking.) +- A spare plastic card to [fool the power-saving system][140] in your hotel room, while you're not there. (So your gear can charge and the LEDs keep blinking.) #### Laptop and Devices @@ -268,7 +268,7 @@ For travelling abroad there is a handy [World Electrical Plug & Socket Map][40] - For devices with private information be sure to encrypt them! (VeraCrypt, GPG, FileVault, EncFS, Bitlocker, gbde, geli, dm-crypt, LUKS, eCryptFS) - Make a GPT Label or Volume label with your online nickname or handle because people can't read your owner.txt file on encrypted devices. You may also create multiple partitions (plaintext and encrypted ones). - make note of the filesystem used so you know if they will work on the system of the person you want to exchange data with. (FAT32 is a safe bet to work everywhere, for larger files ExFAT should also work on most platforms.) - - Mac: NTFS can be read, but not written to without 3rd party software. FAT, ExFAT, HFS+(J), HFSX are fine for current OS X versions, ZFS, Ext2/Ext3/Ext4 and NTFS r/w support need 3rd party software. APFS support is experimental in macOS 10.12 Sierra and available from the command line only. + - Mac: NTFS can be read, but not written to without 3rd party software. FAT, ExFAT, HFS+(J), HFSX are fine for current OS X versions, ZFS, Ext2[/Ext3/Ext4 and NTFS r/w support need 3rd party software. APFS support is experimental in macOS 10.12 Sierra and available from the command line only. - USB/Thunderbolt/USB-C to Ethernet RJ45 adapter, if your device needs one (for example thin notebooks) - Mass storage devices (bring some empty ones to fill with data and/or bring your own data and share it!) - Tablet computer, iPad, Android tablet, Microsoft surface @@ -701,3 +701,4 @@ These people have contributed to improve this list for everyone (in no particula [137]:https://twitter.com/trollkopp [138]:https://twitter.com/dot__not [139]:https://twitter.com/Katti +[140]:http://travel.stackexchange.com/questions/55409/what-is-the-hotel-room-card-slot-inside-the-room-for