[guadec-web] Formatted some markdown and adjustments to content



commit ee3dc8203bb77efc3eb8cba3748b50322be800bf
Author: Oliver Gutierrez <ogutsua gmail com>
Date:   Thu May 31 19:26:48 2018 +0100

    Formatted some markdown and adjustments to content

 content/pages/about-the-city.md | 10 ++++----
 content/pages/accommodation.md  | 11 ++++-----
 content/pages/travel.md         | 54 ++++++++++++++++++++++++++++-------------
 3 files changed, 47 insertions(+), 28 deletions(-)
---
diff --git a/content/pages/about-the-city.md b/content/pages/about-the-city.md
index 76ecede..c5158b2 100644
--- a/content/pages/about-the-city.md
+++ b/content/pages/about-the-city.md
@@ -2,10 +2,10 @@ Title: About Almería
 Date: 20180525
 
 
-![](https://upload.wikimedia.org/wikipedia/commons/thumb/c/c6/TabernasDesert.jpg/800px-TabernasDesert.jpg){:width="100%"}
+![Tabernas 
desert](https://upload.wikimedia.org/wikipedia/commons/thumb/c/c6/TabernasDesert.jpg/800px-TabernasDesert.jpg){:width="100%"}
 
 
-![](https://upload.wikimedia.org/wikipedia/commons/thumb/8/82/Puerta_Purchena._Almer%C3%ADa.jpg/320px-Puerta_Purchena._Almer%C3%ADa.jpg){:width="300px"
 align="right"}
+![Puerta 
Puchena](https://upload.wikimedia.org/wikipedia/commons/thumb/8/82/Puerta_Purchena._Almer%C3%ADa.jpg/320px-Puerta_Purchena._Almer%C3%ADa.jpg){:width="300px"
 align="right"}
 
 
 [Almería](https://en.wikipedia.org/wiki/Almer%C3%ADa) is a sunny, lovely city on the Southeast coast of 
Spain. Looking over the Mediterranean sea, the city was founded in 955 by Abd-ar-Rahman III, who ordered the 
construction of the famous [Alcazaba (the Citadel)](https://en.wikipedia.org/wiki/Alcazaba_of_Almer%C3%ADa), 
one of the largest moorish castles in Europe. The modern city has grown over the hills that surround the 
Alcazaba, staying true to its visual and architectural tradition.
@@ -14,7 +14,7 @@ Date: 20180525
 Almería is also the administrative capital of the homonymous province and part of the [Autonomous Community 
of Andalusia](https://en.wikipedia.org/wiki/Andalusia). The region is famous for its prolific production of 
vegetables, having [over 100000 acres of greenhouses in the Poniente 
province](https://en.wikipedia.org/wiki/Poniente_Almeriense#/media/File:Plastic_sea,_Almer%C3%ADa_Spain.jpg). 
Almería also hosts scientific research facilities like the [Calar Alto Astronomy 
Observatory](http://www.caha.es/), the [Almería Solar 
Platform](https://en.wikipedia.org/wiki/Plataforma_Solar_de_Almer%C3%ADa) and the [Experimental Station of 
Arid Zones](http://www.eeza.csic.es/en/).
 
 
-![](https://upload.wikimedia.org/wikipedia/commons/thumb/a/ab/Museo_de_La_Guitarra._Almeria.jpg/320px-Museo_de_La_Guitarra._Almeria.jpg){:width="300px"
 align="right"}
+![Guitar 
Museum](https://upload.wikimedia.org/wikipedia/commons/thumb/a/ab/Museo_de_La_Guitarra._Almeria.jpg/320px-Museo_de_La_Guitarra._Almeria.jpg){:width="300px"
 align="right"}
 
 
 The city has about 195000 inhabitants who are welcoming to visitors and always happy to enjoy the city's 
excellent weather with a vibrant day and night life. Some famous almerians are Nicolás Salmerón y Alonso, the 
third president of the first Spanish Republic; musicians such as [Antonio de 
Torres](https://en.wikipedia.org/wiki/Antonio_de_Torres_Jurado), considered the father of the modern Spanish 
guitar; José Padilla, best known as “Maestro Padilla”, Manolo Escobar; and more recently José Fernández 
Torres “Tomatito” -one of the best flamenco guitarists in the world-; and David Bisbal, the famous pop singer.
@@ -23,7 +23,7 @@ The city has about 195000 inhabitants who are welcoming to visitors and always h
 Almería is also famous for its [popularity with the filmmaking 
industry](https://www.turismodealmeria.org/wp-content/uploads/2016/04/land-of-film.pdf). A good number of 
world famous films have been shot in the incomparable and varied landscapes and towns of the province. Since 
the sixties, Almería has attracted an enormous amount of films, commercial video and videoclips. Recent films 
like Exodus and TV series like Game of Thrones or Penny Dreadful have filmed here.
 
 
-![](https://upload.wikimedia.org/wikipedia/commons/thumb/8/81/Calle_Almedina._Casco_antiguo_Almer%C3%ADa.jpg/309px-Calle_Almedina._Casco_antiguo_Almer%C3%ADa.jpg){:width="300px"
 align="right"}
+![Almedina Street, Almería historical 
center](https://upload.wikimedia.org/wikipedia/commons/thumb/8/81/Calle_Almedina._Casco_antiguo_Almer%C3%ADa.jpg/309px-Calle_Almedina._Casco_antiguo_Almer%C3%ADa.jpg){:width="300px"
 align="right"}
 
 
 [Aldous Huxley visited Almería in 1929](http://www.almediam.org/PDF/Huxley.pdf). He was so taken by Almería 
that he wrote a sonnet about it:
@@ -52,4 +52,4 @@ And if you believe being at the South of Spain can be very hot... well, maybe it
 
 Give yourself an opportunity to fall in love with Almería :)
 
-![](https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Almer%C3%ADa%2C_Spain_-_panoramio_-_antocon.jpg/800px-Almer%C3%ADa%2C_Spain_-_panoramio_-_antocon.jpg){:width="100%"}
+![Almería](https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Almer%C3%ADa%2C_Spain_-_panoramio_-_antocon.jpg/800px-Almer%C3%ADa%2C_Spain_-_panoramio_-_antocon.jpg){:width="100%"}
diff --git a/content/pages/accommodation.md b/content/pages/accommodation.md
index 74b75ef..fa306cd 100644
--- a/content/pages/accommodation.md
+++ b/content/pages/accommodation.md
@@ -4,7 +4,7 @@ Authors: rugoma
 
 ## Civitas dormitory
 
-![Civitas 
building](http://www.residenciacivitas.com/wp-content/uploads/2017/04/PORTADA-INAUGURACI%C3%93N-CIVITAS.jpg){:width="300px"
  align="right"}
+![Civitas 
building](http://www.residenciacivitas.com/wp-content/uploads/2017/04/PORTADA-INAUGURACI%C3%93N-CIVITAS.jpg){:width="300px"
 align="right"}
 
 
 The main option and our recommended accommodation for this year is [Residencia 
Civitas](http://www.residenciacivitas.com/en/) (view the [promotional 
video](http://www.youtube.com/watch?v=v0PAAprhc_U)).
@@ -18,7 +18,7 @@ If you are looking for someone to share a room with, you can [list yourself or g
 GUADEC attendes have a special price for Civitas dormitory, here are shown the prices.
 
 ### Single room
-![Single room on 
Civitas](http://www.residenciacivitas.com/wp-content/uploads/2015/09/Instalaciones-habitacion-civitas-01.jpg){:width="200px"
  align="right"}
+![Single room on 
Civitas](http://www.residenciacivitas.com/wp-content/uploads/2015/09/Instalaciones-habitacion-civitas-01.jpg){:width="200px"
 align="right"}
 
 - 32.75 € per night, breakfast included
 - 42.10 € per night, breakfast and evening dinner included
@@ -31,7 +31,7 @@ GUADEC attendes have a special price for Civitas dormitory, here are shown the p
 - 46.75 € per night, breakfast included
 - 56.10 € per night, breakfast and evening dinner included
 
-![Twin room on 
Civitas](http://www.residenciacivitas.com/wp-content/uploads/2015/09/Instalaciones-habitacion-civitas-05.jpg){:width="200px"
  align="right"}
+![Twin room on 
Civitas](http://www.residenciacivitas.com/wp-content/uploads/2015/09/Instalaciones-habitacion-civitas-05.jpg){:width="200px"
 align="right"}
 
 When making your reservation, remember that there is dinner available at some of the planned evening events.
 
@@ -90,7 +90,7 @@ Calle Fernán Caballero, 1, Almería (Spain).
 #### By bus
 
 1. The bus stop at the airport is the number 188 (you can check the [wait 
time](http://m.surbus.com/tiempo-espera/parada/188)).
-1. You need [to take Line 30](http://www.surbus.com/inicio.aspx?cat=0&id=30) (1,05 €). 
+1. You need [to take Line 30](http://www.surbus.com/inicio.aspx?cat=0&id=30) (1,05 €).
 1. Line 30 connects the city, the airport and the suburbs of Retamar (end of line). Since the bus stop is 
the same in both directions asks bus driver it's going back to the city. If not, you can choose either get 
the bus and pay again at end of line or wait till the bus take the route back from the suburbs.
 1. Get off at "Estación Intermodal", bus stop #292 (you can [check the wait 
time](http://m.surbus.com/tiempo-espera/parada/292)). This is just [outside the bus and train 
station](https://commons.wikimedia.org/wiki/Category:Almer%C3%ADa_train_station#/media/File:Antigua_estaci%C3%B3n_de_ferrocarril_de_Almer%C3%ADa.JPG).
 1. Walk 5 minutes to Civitas (check the [OpenStreetMap 
route](http://www.openstreetmap.org/directions?engine=mapzen_foot&route=36.83520%2C-2.45601%3B36.83752%2C-2.44828#map=17/36.83641/-2.45216)).
@@ -107,7 +107,7 @@ If you have a problem to choose the correct destination use the alternative «Nu
 
 ### From CIVITAS to GUADEC
 
-<img 
src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/02/L30_surbus_Gregorio_Mara%C3%B1%C3%B3n.JPG/320px-L30_surbus_Gregorio_Mara%C3%B1%C3%B3n.JPG";
 align="right" width="200px" />
+![Surbus Gregorio 
Mara](https://upload.wikimedia.org/wikipedia/commons/thumb/0/02/L30_surbus_Gregorio_Mara%C3%B1%C3%B3n.JPG/320px-L30_surbus_Gregorio_Mara%C3%B1%C3%B3n.JPG){:align="right"
 width="200px"}
 
 For the core days the conference will setup a direct bus from CIVITAS to the campus. We'll announce the 
precise time a few days before the conference.
 
@@ -115,4 +115,3 @@ The bus will make stops at:
 
 - at [CIVITAS residence](https://goo.gl/maps/ZG5H9jTbAmL2);
 - at [the intermodal station](https://goo.gl/maps/pJn6U7swo8C2) (the bus/train central station).
-
diff --git a/content/pages/travel.md b/content/pages/travel.md
index b767d58..599b57c 100644
--- a/content/pages/travel.md
+++ b/content/pages/travel.md
@@ -5,9 +5,8 @@ Date: 20180321
 
 ### Almería Airport (LEI)
 
+![Almería 
Airport](https://upload.wikimedia.org/wikipedia/commons/thumb/9/9e/Aeropuerto_de_Almer%C3%ADa.jpeg/320px-Aeropuerto_de_Almer%C3%ADa.jpeg){:align="right"
 width="200"}
 
-
-<img 
src="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9e/Aeropuerto_de_Almer%C3%ADa.jpeg/320px-Aeropuerto_de_Almer%C3%ADa.jpeg";
 align="right" width="200" />
 [Almería Airport](http://www.aena.es/en/almeria-airport/index.html) has frequent connections to Madrid 
(Iberia) and almost daily
 ones to Barcelona (Vueling). It also has flights to other European airports
 such as London–Gatwick, Amsterdam, Brussels, etc.
@@ -21,10 +20,11 @@ Some considerations: in Summer season there are several direct connections to se
 Once you are at the airport you can go to the city:
 
 By bus:
-<img 
src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/02/L30_surbus_Gregorio_Mara%C3%B1%C3%B3n.JPG/320px-L30_surbus_Gregorio_Mara%C3%B1%C3%B3n.JPG";
 align="right" width="200" />
+
+![Surbus Gregorio 
Mara](https://upload.wikimedia.org/wikipedia/commons/thumb/0/02/L30_surbus_Gregorio_Mara%C3%B1%C3%B3n.JPG/320px-L30_surbus_Gregorio_Mara%C3%B1%C3%B3n.JPG){:align="right"
 width="200"}
 
 1. The bus stop at the airport is the #188 (you can check the [wait 
time](http://m.surbus.com/tiempo-espera/parada/188)).
-1. You need [to take Line 30](http://www.surbus.com/inicio.aspx?cat=0&id=30) (1,05 €). 
+1. You need [to take Line 30](http://www.surbus.com/inicio.aspx?cat=0&id=30) (1,05 €).
 1. Line 30 connects the city, the airport and the suburbs of Retamar (end of line). Since the bus stop is 
the same in both directions asks bus driver it's going back to the city. If not, you can choose either get 
the bus and pay again at end of line or wait till the bus take the route back from the suburbs.
 1. Get off at "Estación Intermodal", bus stop #292 (you can [check the wait 
time](http://m.surbus.com/tiempo-espera/parada/292)). This is just [outside the bus and train 
station](https://commons.wikimedia.org/wiki/Category:Almer%C3%ADa_train_station#/media/File:Antigua_estaci%C3%B3n_de_ferrocarril_de_Almer%C3%ADa.JPG).
 
@@ -39,6 +39,7 @@ price:
   * Estimated price for city center: 20€
   * Estimated price for University: 15€
 
+
 ### Málaga Airport (AGP)
 
 [Málaga airport](http://www.aena.es/en/malaga-airport/index.html) is the fourth busiest in Spain and thus 
has flights to most of
@@ -49,7 +50,9 @@ You can check [destinations](http://www.aena.es/en/malaga-airport/airport-destin
 
 From Málaga Airport to Almería:
 
-* Direct bus: there's two daily direct buses operated by ALSA, a non stop one that takes around 3h and one 
with two stops that takes 3.5 hours.  <img 
src="https://c2.staticflickr.com/2/1490/25493293073_147e9afa81.jpg"; align="right" width="200px" />
+![Málaga Bus](https://c2.staticflickr.com/2/1490/25493293073_147e9afa81.jpg){:align="right" width="200px"}
+
+* Direct bus: there's two daily direct buses operated by ALSA, a non stop one that takes around 3h and one 
with two stops that takes 3.5 hours.  
     * Price: Around 20€ one way
     * Málaga Airport - Almería: 14:15 and 15:30
     * Almería - Málaga Airport: 9:30 and 15:30
@@ -58,13 +61,15 @@ From Málaga Airport to Almería:
 * By bus through Málaga:  there's a bus service available that links Málaga Airport with Málaga, and it 
stops both at the main bus station and train station of Málaga.
   There are a few others daily ALSA buses from Málaga to Almería, taking between 3 and 5 hours depending on 
the intermediate stops. You can buy your tickets at the [ALSA website](https://www.alsa.es/).
 
-* <img src="https://c2.staticflickr.com/4/3203/2329053361_bb54009765_n.jpg"; align="right" 
width="200px">Car-pooling: there are several people that offer car pool rides between different points of 
Málaga (some including the airport) to Almería. [BlaBlaCar](https://www.blablacar.es/) is one of the 
companies that offers such a service.
+![Car-pooling](https://c2.staticflickr.com/4/3203/2329053361_bb54009765_n.jpg){:align="right" width="200px"}
+
+* Car-pooling: there are several people that offer car pool rides between different points of Málaga (some 
including the airport) to Almería. [BlaBlaCar](https://www.blablacar.es/) is one of the companies that offers 
such a service.
 
 * By taxi: this may sound crazy, but there are several companies offering transfer between the Málaga 
Airport and Almería ([185€](http://malagaradiotaxi.es/tarifas.html), 
[220€](http://www.taxis-malaga.net/precios.php)) so if you pool with 4 people, it is not that expensive and 
travel time is around 2 hours.
 
 ### By road
 
-<img src="https://upload.wikimedia.org/wikipedia/commons/1/15/Mapa_A-7.png"; align="right" width="300" />
+![A-7 Road](https://upload.wikimedia.org/wikipedia/commons/1/15/Mapa_A-7.png){:align="right" width="200"}
 
 Almería has a good land communication with all the Mediterranean coast by the [A-7 
highway](https://en.wikipedia.org/wiki/Autov%C3%ADa_A-7), which join up to France frontier in La Jonquera 
and, on the other side, ends at Algeciras.
 
@@ -72,13 +77,13 @@ With Spanish interior zones, Almería is connected by the [A-92](https://en.wiki
 
 ### By train
 
-<img 
src="https://upload.wikimedia.org/wikipedia/commons/thumb/b/bc/Antigua_estaci%C3%B3n_de_ferrocarril_de_Almer%C3%ADa.JPG/640px-Antigua_estaci%C3%B3n_de_ferrocarril_de_Almer%C3%ADa.JPG";
 width="200px" align="right" />
+![Almería Old Train 
Station](https://upload.wikimedia.org/wikipedia/commons/thumb/b/bc/Antigua_estaci%C3%B3n_de_ferrocarril_de_Almer%C3%ADa.JPG/640px-Antigua_estaci%C3%B3n_de_ferrocarril_de_Almer%C3%ADa.JPG){:width="200px"
 align="right"}
+
 There are some lines that connect Almería with Madrid and other cities, such as Granada, Seville, Linares 
and Antequera. The most important alternative could be from Madrid. More information in the [Renfe rail 
transport company](http://www.renfe.com/EN/viajeros/index.html) website.
 
 
 ### By ship
 
-
 There are [some ship lines](http://www.apalmeria.com/index.php?option=com_content&id=95) that connect 
Almería with  Africa: Melilla, Oran (Algeria) and Nador (Morocco) with daily or regular ships and affordable 
prices. The passangers terminal is in the seaside of the city, less than 1 km from downtown.
 
 
@@ -88,16 +93,32 @@ You'll find the city of Almería covered with 4G/3G connectivity. If you have do
 
 If you own a cell phone line adquired inside the [European Economic 
Area](https://en.wikipedia.org/wiki/European_Economic_Area) then you'll enjoy [free 
roaming](https://en.wikipedia.org/wiki/European_Union_roaming_regulations#Territorial_extent).
 
-### Electric plug
+### Electric plugs
 
 Probably you'll need some electricity, we guess. You can learn about details of the [electric plug system in 
Spain](https://en.wikipedia.org/wiki/Mains_electricity_by_country#Table_of_mains_voltages,_frequencies,_and_plugs).
 In sort: 230 V and 50 Hz.
 
-
- Plug types:  
-       
-[Type 
C](https://en.wikipedia.org/wiki/AC_power_plugs_and_sockets#CEE_7/16_Alternative_II_%22Europlug%22_(Type_C))  
| [Type 
F](https://en.wikipedia.org/wiki/AC_power_plugs_and_sockets#CEE_7/3_socket_and_CEE_7/4_plug_(German_%22Schuko%22;_Type_F))
-::|::
-<img 
src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/63/Euro-Flachstecker_2.jpg/330px-Euro-Flachstecker_2.jpg";
 width="200px" /> |  <img 
src="https://upload.wikimedia.org/wikipedia/commons/thumb/e/ef/Schuko_plug_and_socket.png/330px-Schuko_plug_and_socket.png";
 width="200px" />
+Plug types:
+
+<div class="text-center">
+    <table>
+        <thead>
+            <th scope="col"><a 
href="https://en.wikipedia.org/wiki/AC_power_plugs_and_sockets#CEE_7/16_Alternative_II_%22Europlug%22_(Type_C)"
 target="_blank">Type C</a></th>
+            <th scope="col"><a 
href="https://en.wikipedia.org/wiki/AC_power_plugs_and_sockets#CEE_7/3_socket_and_CEE_7/4_plug_(German_%22Schuko%22;_Type_F)"
 target="_blank">Type F</a></th>
+        </thead>
+        <tbody>
+            <td>
+                <a 
href="https://en.wikipedia.org/wiki/AC_power_plugs_and_sockets#CEE_7/16_Alternative_II_%22Europlug%22_(Type_C)"
 target="_blank">
+                    <img 
src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/63/Euro-Flachstecker_2.jpg/330px-Euro-Flachstecker_2.jpg";
 width="200px">
+                </a>
+            </td>
+            <td>
+                <a 
href="https://en.wikipedia.org/wiki/AC_power_plugs_and_sockets#CEE_7/3_socket_and_CEE_7/4_plug_(German_%22Schuko%22;_Type_F)"
 target="_blank">
+                    <img 
src="https://upload.wikimedia.org/wikipedia/commons/thumb/e/ef/Schuko_plug_and_socket.png/330px-Schuko_plug_and_socket.png";
 width="200px">
+                </a>
+            </td>
+        </tbody>
+    </table>
+</div>
 
 ### Visas
 Check the dedicated page about how to [get a visa to visit Spain](/pages/getting-an-spanish-visa.html).
@@ -110,4 +131,3 @@ The probability of rain those days is almost zero. You can check the weather pre
 
 
 Bring swimsuit ;-)
- 
\ No newline at end of file


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]