factored in places page into info page

diff --git a/minidebconf_vie2016/index.mdwn b/minidebconf_vie2016/index.mdwn
index 67fa8ce6d632d1b08651473f173ed49e4e1c0a0a..4146c3d0ec2cb97e68b071a192fbe8be8c68fd3f 100644 (file)
--- a/minidebconf_vie2016/index.mdwn
+++ b/minidebconf_vie2016/index.mdwn
@@ -44,14 +44,21 @@ Travel
 
 The recommended way of getting around in Vienna is
 [public transportation](http://www.wienerlinien.at/eportal3/ep/programView.do/programId/66797)
-(the station Höchstädtplatz is right next to the venue, and Dresdnerstraße is
-just a few minutes by foot); bike and walking work well too, cars have
-[limited parking in the 20th district until Friday](https://www.wien.gv.at/english/transportation/parking/shortterm.htm).
+(the station Höchstädtplatz is right next to the venue, and
+[U6 Dresdnerstraße is just a few minutes by foot](http://map.project-osrm.org/?z=17&center=48.238398%2C16.380358&loc=48.237258%2C16.380283&loc=48.239352%2C16.377343&hl=en&alt=0),
+and one stop from the train station Handelskai); bike and walking work well
+too, cars have [limited parking in the 20th district until Friday](https://www.wien.gv.at/english/transportation/parking/shortterm.htm).
 
 You can get to Vienna by plane (VIE is connected to the local public transport
-network, station Flughafen Wien Bahnhof, line S-2 / S-7) or train. When arriving by car, be
-aware that there is toll on all Austrian highways; 10 day tickets can be
-obtained at petrol stations at the borders.
+network, station Flughafen Wien Bahnhof, line S-2 / S-7, switch to U6 at
+Handelskai) or train. When arriving by car, be aware that there is toll on all
+Austrian highways; 10 day tickets can be obtained at petrol stations at the
+borders.
+
+* Timetables/Contact:
+   - [Train](http://fahrplan.oebb.at/bin/query.exe/en?)
+   - [Vienna Public Transport](http://m.qando.at/wl_qando_mobileweb/routeSelect)
+   - [Taxi](https://www.wien.info/en/travel-info/to-and-around/taxi)
 
 Accomodation
 ------------
@@ -81,6 +88,13 @@ phone (<a href="tel:+43-1-330-36-36">+43 1 330 36 36</a>) or fax
 from the conference location by U6 (1 station to Handelskai) or
 [a 20 minutes walk](http://map.project-osrm.org/?z=17&center=48.238584,16.381549&loc=48.240354,16.386407&loc=48.239300,16.376808&hl=en&alt=0).
 
+Places nearby
+-------------
+
+* [Shop](http://map.project-osrm.org/?z=18&center=48.238464%2C16.377917&loc=48.239330%2C16.377300&loc=48.237962%2C16.378689&hl=en&alt=0)
+* Drugstore [Basic](http://map.project-osrm.org/?z=18&center=48.238921%2C16.378121&loc=48.239330%2C16.377300&loc=48.238623%2C16.376930&hl=en&alt=0) / [Health](http://map.project-osrm.org/?z=18&center=48.239736%2C16.377091&loc=48.239330%2C16.377300&loc=48.239288%2C16.376608&hl=en&alt=0)
+* Eat/Drink: Noodle King, Tchibo, Tauber, Bauernschmakerl, ...
+
 In the evening
 --------------
 

diff --git a/minidebconf_vie2016/planning/places.mdwn b/minidebconf_vie2016/planning/places.mdwn
deleted file mode 100644 (file)
index e202ec5..0000000
--- a/minidebconf_vie2016/planning/places.mdwn
+++ /dev/null
@@ -1,31 +0,0 @@
-Hotels
-======
-
-* Harry's Hotel: 
-  [a 20 minutes walk](http://map.project-osrm.org/?z=17&center=48.238584,16.381549&loc=48.240354,16.386407&loc=48.239300,16.376808&hl=en&alt=0) or via U6 to Handelskai
-
-
-Transport
-=========
-
-* U6: 
-  [walk](http://map.project-osrm.org/?z=17&center=48.238398%2C16.380358&loc=48.237258%2C16.380283&loc=48.239352%2C16.377343&hl=en&alt=0)
-
-* Train:
-  via U6, Dresdner Straße - Handelskai, 1 Station in direction Floridsdorf.
-
-* Airport:
-  via U6, Train, S7 Handelskai - Flughafen Wien, or via [Router](http://m.qando.at/wl_qando_mobileweb/routeSelect) from Dresdnerstraße or Hochstädtplatz to Airport Vienna
-
-* Timetables/Contact: 
-   - [Train](http://fahrplan.oebb.at/bin/query.exe/en?)
-   - [Vienna Public Transport](http://m.qando.at/wl_qando_mobileweb/routeSelect)
-   - [Taxi](https://www.wien.info/en/travel-info/to-and-around/taxi)
-
-
-Nearby
-======
-
-* [Shop](http://map.project-osrm.org/?z=18&center=48.238464%2C16.377917&loc=48.239330%2C16.377300&loc=48.237962%2C16.378689&hl=en&alt=0)
-* Drugstore [Basic](http://map.project-osrm.org/?z=18&center=48.238921%2C16.378121&loc=48.239330%2C16.377300&loc=48.238623%2C16.376930&hl=en&alt=0) / [Health](http://map.project-osrm.org/?z=18&center=48.239736%2C16.377091&loc=48.239330%2C16.377300&loc=48.239288%2C16.376608&hl=en&alt=0)
-* Eat/Drink: Noodle King, Tchibo, Tauber, Bauernschmakerl, ...