Merge pull request #16 from RobFog/master

Proofreading and a lot of typo fixing thanks to RobFog.

README.md

@@ -14,49 +14,48 @@ You'll also find a list of all the nice humans who have contributed to this list
 
 
 ### Manners
-- Be excellent to each other
+- Be excellent to each other.
 - If you spot somebody not being excellent to someone else, remind them to be excellent and have them apologi(s|z)e to the insulted part(y|ies), but only if the insulted wish to be apologi(s|z)ed to. Sometimes the insulted party will just want to move on and not have any further contact with someone who was coarse to them.
 - If you don't want to be called $swearword, don't behave like one.
-- Help each other out
+- Help each other out.
-- Read the “[Anti Harrassment Policy][3]” and live by it :-)
+- Read the “[Anti Harrassment Policy][3]” and live by it. :-)
 - Ask if it is ok to take a picture BEFORE taking the picture.
 
 
 
 ## Things to do before traveling
 - Charge ALL the batteries!
-- Make backups
+- Make backups.
-- Bonus points for even testing restore
+- bonus points for even testing restore
-- Update all the software on your devices
+- Update all the software on your devices.
-- You DID make backups of all your devices, didn't you? That includes portable Computers, Servers, mobile phones, tablets, navigation devices, wristwatches and all your other $gadgets.
+- You DID make backups of all your devices, didn't you? That includes portable computers, servers, mobile phones, tablets, navigation devices, wrist watches and all your other $gadgets.
 - Send a pull request to this list for all the things I did not think of.
-- Feed the guineapigs
+- Feed the guinea pigs.
-- Water your plants
+- Water your plants.
-- (optional) Create account in the [congress wiki][12], [add your projects][13] and [find your assembly][14]
+- (optional) Create account in the [congress wiki][12], [add your projects][13] and [find your assembly][14].
 
 
  
 ## Things to pack
 
 ### Documents
-- Train/plane tickets (including verification documents for self-printed DB tickets, like your credit card or Personalausweis)
+- train/plane tickets (including verification documents for self-printed DB tickets, like your credit card or Personalausweis)
-- Congress tickets (printed or in iOS passbook)
+- congress tickets (printed or in iOS passbook)
-- Passport or other kind of photo ID (Personalausweis)
+- passport or other kind of photo ID (Personalausweis)
-- Driver's license (even an international one)
+- driver's license (even an international one)
-- Hotel booking
+- hotel booking
-- Ham radio license (CEPT license)
+- ham radio license (CEPT license)
 - [Hackerspace passport][5]
-- An [Organ donor card][21] (We really hope you won't need them, but just in the case: you might safe a life!)
+- an [organ donor card][21] (We really hope you won't need them, but just in the case: you might save a life!)
-- Your health insurance card
+- your health insurance card
 
 
 ### Payment stuff
-- Some cash (€uros)
+- some cash (€uros)
-- CreditCard
+- credit card
-- Coins (€uros, for automated vending machines, like public transport tickets)
+- coins (€uros, for automated vending machines, like public transport tickets)
 - Bitcoin wallet (the encrypted fashion with a good passphrase)
-- Emergency numbers for your bank so you can lock your credit card/debit card/Bankomatkarte in case it gets lost/stolen/left behind.
+- emergency numbers for your bank so you can lock your credit card/debit card/Bankomatkarte in case it gets lost/stolen/left behind.
-
 
 
 ### Emergency information
@@ -71,31 +70,30 @@ If you need help, just call for help, there are many, many people around to help
 - 30C3 Medical Emergency or in case of fire: Call local DECT 112 (CERT)
 - 30C3 Security: Call local DECT 110
 - 30C3 organizers: 30c3-orga@cccv.de
-- Local law enforcement in Hamburg: 110 or +49 40 4286 - 51410
+- 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)
+- local sexual assault hotline in Hamburg: +49 40 - 255566 (http://www.frauennotruf-hamburg.de)
-- Hamburg Fire Department: +49 40 42851-0 (BETTER USE 112 ON YOUR non-30C3 PHONE)
+- Hamburg fire department: +49 40 42851-0 (BETTER USE 112 ON YOUR non-30C3 PHONE)
-- Hamburg Ambulance: +49 40 228022  (BETTER USE 112 ON YOUR non-30C3 PHONE)
+- Hamburg ambulance: +49 40 228022  (BETTER USE 112 ON YOUR non-30C3 PHONE)
-
 
 
 ### Personal hygiene
-- Tooth brush (plus charger if it is an electrical one)
+- tooth brush (plus charger if it is an electrical one)
-- Toothpaste
+- toothpaste
-- Shower gel
+- shower gel
-- Shampoo (To avoid bad hair days)
+- shampoo (to avoid bad hair days)
-- Conditioner
+- conditioner
-- Tampons
+- tampons
-- Sanitary Towels
+- sanitary towels
-- Condoms, Dental Dams and other protective gear (Make sure the condoms are not beyond their usage date! (Yes, it really happens …))
+- condoms, dental dams and other protective gear (Make sure the condoms are not beyond their usage date! (Yes, it really happens…))
-- Lubricant (water based to be compatible with condoms)
+- lubricant (water based to be compatible with condoms)
-- Disinfectants
+- disinfectants
-- Soap
+- soap
 - deodorant, antiperspirant
-- Hairbrush/comb (to avoid bad hair days)
+- hairbrush/comb (to avoid bad hair days)
 - hair-band (Zopfringerl) to tame your mane
 - handkerchiefs
-- Towel. Never hitchhike the Galaxy without one.
+- towel. Never hitchhike the Galaxy without one.
-- Contact lenses
+- contact lenses
 	- cleaning fluid
 	- contact lens container
 	- replacement contact lenses
@@ -108,27 +106,27 @@ If you need help, just call for help, there are many, many people around to help
 
 
 ### Cosmetics
-- Make up
+- make up
-- Nail polish
+- nail polish
-- Nail scissors
+- nail scissors
-- Nail file
+- nail file
-- Razor (with spare blades)
+- razor (with spare blades)
-- Lipstick/Lipgloss
+- lipstick/lipgloss
-- Lipbalm
+- lipbalm
 
 
 ### Medication
 
 #### Generic medication
-- Patches (Pflaster, for your webcam or if a MacBook AirFrisbee hit you)
+- patches (Pflaster, for your webcam or if a MacBook AirFrisbee hit you)
 - Aspirin (If you partied too long …)
-- Thomapyrin (Analgetic)
+- Thomapyrin (analgetic)
-- Parkemed (DE/AT), Ponstel (USA), Ponstel (UK) (Analgetic)
+- Parkemed (DE/AT), Ponstel (USA), Ponstel (UK) (analgetic)
 - Clarityn (or other histamine blocker if you're allergic to something)
-- Neocitran/Theraflu/Paracetamol (Just in case hacker pest strikes)
+- Neocitran/Theraflu/Paracetamol (just in case hacker pest strikes)
-- Contraceptives, prophylactic (contraceptive pill, condoms, etc.)
+- contraceptives, prophylactic (contraceptive pill, condoms, etc.)
-- Caffeine pills (In case you don't like Mate and nobody knows if you can actually drink the coffee served there.)
+- caffeine pills (In case you don't like Mate and nobody knows if you can actually drink the coffee served there.)
-- Something for your stomach (if you've got a nervous digestive system when under stress, while flying or generally traveling)
+- something for your stomach (if you've got a nervous digestive system when under stress, while flying or generally traveling)
 - camomile tea relives hyperacidity very well 
 - Bepanthen
 
@@ -136,69 +134,70 @@ If you need help, just call for help, there are many, many people around to help
 #### Personal medication
 Your personal medication does not belong on the public interwebs for your privacy. This is just a reminder to pack it. Please do not include your personal medications in pull requests. :-)
 
+
 ### Schedule
 - Have a look at the [Fahrplan][20] and maybe make a preselection of talks you really "have to", "want to" or "would be nice to" see
-- be sure to schedule a period of time to get your T-Shirt or pullover(when preordered in the first two days)!
+- Be sure to schedule a period of time to get your T-Shirt or pullover(when preordered in the first two days)!
-- have a sense of how the trains are going from the station near by, enter Dammtor here: http://geofox.de/jsf/stationSchedule.seam direct connections to the airport, enter Dammtor at start and Airport
+- Have a sense of how the trains are going from the station near by, enter Dammtor here: http://geofox.de/jsf/stationSchedule.seam direct connections to the airport, enter Dammtor at start and Airport
 
 
 ### Clothing
-- At least ONE clean shirt for each day you stay, plus two for traveling to and from congress. (nerdy print is always welcome)
+- at least ONE clean shirt for each day you stay, plus two for traveling to and from congress (nerdy print is always welcome)
-- At least ONE set of clean underwear for each day you stay, plus two for traveling to and from congress. (Doesn't necessarily need to be in matching pairs, but that is up to you.)
+- at least ONE set of clean underwear for each day you stay, plus two for traveling to and from congress (Doesn't necessarily need to be in matching pairs, but that is up to you.)
-- At least ONE pair of clean socks/stockings/tights/overknees for each day you stay, plus two for traveling to and from congress.
+- at least ONE pair of clean socks/stockings/tights/overknees for each day you stay, plus two for traveling to and from congress
-- Enough pants/skirts/trousers/dresses/etc. so you can wear clean clothes every day you attend congress. (Even if somebody accidentally (or intentionally) spills a beverage all over you!)
+- enough pants/skirts/trousers/dresses/etc. so you can wear clean clothes every day you attend congress (even if somebody accidentally (or intentionally) spills a beverage all over you!)
-- Sewing set (needle, thread, spare button for your trousers/skirts/shirts/blouses/etc.)
+- sewing set (needle, thread, spare button for your trousers/skirts/shirts/blouses/etc.)
-- Long sleeve shirts
+- long sleeve shirts
-- Hoodies, Pullovers
+- hoodies, pullovers
-- Jacket (wind proof, at least somewhat water resistant)
+- jacket (wind proof, at least somewhat water resistant)
-- Cap, wool cap
+- cap, wool cap
-- Umbrella
+- umbrella
-- Comfortable shoes (You'll make a lot of distance-units during your stay)
+- comfortable shoes (You'll make a lot of distance-units during your stay)
-- Bag to separate laundry from clean clothes in your luggage
+- bag to separate laundry from clean clothes in your luggage
-- Gloves
+- gloves
-- Scarf
+- scarf
-- Swim suit, Bikini, trunks (In case your hotel has a pool)
+- swim suit, bikini, trunks (in case your hotel has a pool)
 
 
 ### Gear
-- Laptop (with a working battery)
+- laptop (with a working battery)
-- Charger for Laptop 
+- charger for laptop
-	- Mac: Small Duck-head and long ([Schuko Plug][6]) cord
+	- Mac: small Duck-head and long ([Schuko Plug][6]) cord
 	- Mac: MagSafe to MagSafe 2 Adapter
-	- Mac: There are also cords that you can plug directly into the MagSafe charger (when removing the duck head) that end in a [Euro Plug][8]. These cables are also often used on electric shavers.
+	- Mac: There are also cords that you can plug directly into the MagSafe charger (when removing the duck head) that end in a [Euro Plug][8]. These cables are also often used on electric shavers
-- Plug adaptor from your country of origin to [Schuko Plug][6]
+- plug adaptor from your country of origin to [Schuko Plug][6]
 - 3* or 5* multi-plug power extension (230V≈ @50Hz) with [Schuko Plug][6] (and optional switch, hotel rooms usually suffer from severe lack of outlets)
-- Simple extension cord (230V @50Hz, [Schuko Plug][6], the power outlet in your hotel room may be far away from your bedside) 
+- simple extension cord (230V @50Hz, [Schuko Plug][6], the power outlet in your hotel room may be far away from your bedside)
-- USB Sticks
+- USB flash drives
 	- Put an OWNER.txt file on them with information on how to contact you in case one gets lost accidentally. (Twitter, phone (for example DECT, 30C3 GSM extensions), email, name of the assembly you're well known at, owl, raven)
 	- For devices with private information be sure to encrypt them! (TrueCrypt, GPG, FileVault, EncFS, Bitlocker, gbde, geli, dm-crypt, LUKS, eCryptFS)
 	- 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.)
-	- Mac: NTFS, ZFS, Ext can be read, but not written to without 3rd party software. FAT, ExFAT, HFS+(J), HFSX are fine for current OS X versions.
+	- Mac: NTFS, ZFS, Ext can be read, but not written to without 3rd party software. FAT, ExFAT, HFS+(J), HFSX are fine for current OS X versions
-- Ethernet cords (Cat5e) of multiple lengths. Maybe have a spare to tether a friend.
+- Ethernet cords (Cat5e) of multiple lengths (Maybe have a spare to tether a friend)
 	- USB/Thunderbolt to Ethernet adapter, if your device needs one (for example thin notebooks)
 - Cat5 o'nine tails
-- Torch (Have spare batteries or rechargeables and a matching charger that works with 230V≈ @50Hz)
+- torch (Have spare batteries or rechargeables and a matching charger that works with 230V≈ @50Hz)
 - LED throwies
-- Phones
+- phones
-	- Mobile Phone (GSM) One each
+	- mobile phone (GSM) one each
-		- For your day-to-day SIM card
+		- for your day-to-day SIM card
-		- For an optional SIM card of the country you travel to
+		- for an optional SIM card of the country you travel to
-		- For a local GSM network at the venue
+		- for a local GSM network at the venue,
-	- DECT phone (for the local wireless phone network)
+	- DECT phone (for the local wireless phone network),
-	- Be sure to register your extension number at [Eventphone][2]
+	- Be sure to register your extension number at [Eventphone][2].
-- DVB-T dongle, there might be local DVB-T transmitter for the streams
+- DVB-T dongle, there might be local DVB-T transmitter for the streams,
-- Chargers for all those phones, or at least matching wires if you can charge over USB.
+- chargers for all those phones, or at least matching wires if you can charge over USB.
 	- iPhone, iPhone 3G, iPhone 3GS, iPhone 4, iPhone 4S, iPad, iPad 2, iPad 3 (The new iPad)
 		- USB-30 Pin dock connector (one each)
 	- iPhone 5 (or newer), iPad 4, iPad mini
 		- USB-Lightning (one each)
-	- Most Android phones
+	- most Android phones
 		- USB-micro USB cable
 - SIM cards (your usual one, local german SIM, CCC SIM)
 - Apple certified SIM eject tool (aka bent paperclip) to swap SIM cards
-- A portable battery pack so you can charge on the go. (And the necessary cable to recharge that battery pack overnight.)
+- a portable battery pack so you can charge on the go. (And the necessary cable to recharge that battery pack overnight.)
-- WiFi Router/Firewall (to connect to the hotel Wifi/Network)
+- WiFi router/firewall (to connect to the hotel Wifi/network)
-- Photo camera
+- photo camera
 	- batteries
 	- charger
 	- memory cards (CF, SD, SDHC, xD, memory stick, etc.)
@@ -215,29 +214,28 @@ Your personal medication does not belong on the public interwebs for your privac
 - tesla coils
 - micro USB cable
 - Firewire (400, 800) cable
-- Antenna wire for WiFi or ham radio equipment
+- antenna wire for WiFi or ham radio equipment
 - 3.5mm jack splitter (so you can watch a movie together on the train)
-- Headphones (so you don't have to talk to other carbon units while traveling)
+- headphones (so you don't have to talk to other carbon units while traveling)
 - [r0cket][4], fully charged (needs a micro USB cable for charging/programming)
-- Monitor adapters (VGA, DVI, mini Displayport) (Especially for the Mac users. ;-) You may need them for your presentation or lightningtalk.
+- monitor adapters (VGA, DVI, mini Displayport; especially for the Mac users. ;-) ), you may need them for your presentation or lightning talk.
-- Remote control for your presentation / lightning talk
+- remote control for your presentation / lightning talk (also check the batteries in the remote)
-	- Also check the batteries in the remote
+- tablet computer, iPad, Android tablet, Microsoft surface
-- Tablet computer, iPad, Android tablet, Microsoft surface
 - Kindle
-- An actual book (for those offline blackout moments)
+- an actual book (for those offline blackout moments)
-- Ham radio equipment, portable
+- ham radio equipment, portable
 - Infrared, Bluetooth or radio remote (for presentations)
-- All your devices!!1 (Raspberry Pi, Arduino, FreedomBox, DreamPlug, …)
+- all your devices!!1 (Raspberry Pi, Arduino, FreedomBox, DreamPlug, …)
 	- + cables + SD-cards (+ GPIO equipment)
 	- + extra WiFi antenna (USB) and/or extra Ethernet cord
 
 
-### Other geari
+### Other gear
-- Pocket knife (As required by german law: Blade must not exceed 12cm, must not be able to be opened with one hand.)
+- pocket knife (As required by german law: Blade must not exceed 12cm, must not be able to be opened with one hand.)
     - Swiss knife
     - Victorinox cybertool
     - Leatherman
-- Screw drivers, pit set
+- screw drivers, pit set
 - soldering iron
 - any other tools you may need (even if unlikely)
 - analog notebook (dead tree style)
@@ -248,7 +246,8 @@ Your personal medication does not belong on the public interwebs for your privac
 - cable ties
 - duct tape or gaffer tape
 - knitting needles and yarn (for guerrilla knitting/yarn bombing)
-- A blanket
+- a blanket
+
 
 
 ## Securing your devices
@@ -285,21 +284,22 @@ Have at least one trusted, working and tested VPN endpoint available for tunneli
 - [iodine][17] (DNS tunnel for those pesky for-pay captive portal WiFi networks)
 - [Tor/Vidalia][19]
 
-Also have those tunnels configured on ALL the devices you intend to use, and have it tested. That includes your Laptops, phones, tablets, servers, fridge, etc.
+Also have those tunnels configured on ALL the devices you intend to use, and have it tested. That includes your laptops, phones, tablets, servers, fridge, etc.
+
 
 ### Phones
 It is not recommended to connect your smartphone to the congress wifi, if you still can't resist, here are a few things to consider:
 
-- make sure that it's **not a 802.11b** device, as it would slow down the complete wifi network.
+- Make sure that it's **not a 802.11b** device, as it would slow down the complete wifi network.
-- disable all synchronization services, as they might be using plaintext
+- Disable all synchronization services, as they might be using plaintext.
-- disable all auto-discovery services (network music players, remote control apps, etc …)
+- Disable all auto-discovery services (network music players, remote control apps, etc …).
-- make sure there are no known exploits for your device (not that unknown-to-you exploits wouldn't be a possible risk as well…)
+- Make sure there are no known exploits for your device (not that unknown-to-you exploits wouldn't be a possible risk as well…).
-- Turn off push notifications
+- Turn off push notifications.
-- update your apps, especially your browser
+- Update your apps, especially your browser.
-- use a VPN tunnel if possible
+- Use a VPN tunnel if possible.
-- use a Firewall and only allow the (few) services you trust.
+- Use a Firewall and only allow the (few) services you trust.
 	- [DroidWall][20] for Android (root required)
-- If you don't have a VPN tunnel available, you can use [OnionBrowser][7] to surf via tor (which may be it's own kind of risk)
+- If you don't have a VPN tunnel available, you can use [OnionBrowser][7] to surf via tor (which may be it's own kind of risk).
 - Set your GSM network selection to **manual** or you might end up connected to a rogue GMS network by somebody.
 
 **If you are unsure** that there might still be some services running and transmitting plaintext data, **do not connect**.
@@ -311,8 +311,9 @@ If you need help with buying a SIM card, ask a local for assistance. They're fri
 - [Blau.de][10]
 
 
+
 ## Thanks for being awesome
-These people have contributed to improve this list for everyone. In no particular order.
+These people have contributed to improve this list for everyone (in no particular order):
 
 - [@Astarioth][100]
 - [@N4mes][101]