Skip to content

Commit

Permalink
spelling review and minor mistakes
Browse files Browse the repository at this point in the history
  • Loading branch information
mjslane committed Apr 14, 2017
1 parent 97313bf commit 9f37c02
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
8 changes: 4 additions & 4 deletions content/events/2017-edinburgh/location.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ type = "event"

### Event Location

Devopsdays Edinburgh 2017 will be held at <a href="http://www.dynamicearth.co.uk" target="_blank">Dynamic Earth</a> which is fully accessible with lifts to all areas that will be used for the conference. Dynamic Earth is located in the shadow of the extinct volcano Arthur's Seat in the historic area of Holyrood. Holyrood is also home to the Scottish Parliament and the Queen's Edinburgh residence, the Palace of Holyroodhouse. It is a central location at the bottom of the Royal Mile which is the road that joins Holyrood to Edinburgh Castle a mile away. There are plenty of hotels, pubs, cafes, restaurants and tourist attractions nearby.
Devopsdays Edinburgh 2017 will be held at <a href="http://www.dynamicearth.co.uk" target="_blank">Dynamic Earth</a> which is fully accessible with lifts to all areas that will be used for the conference. Dynamic Earth is located in the shadow of the extinct volcano Arthur's Seat, in the historic area of Holyrood. Holyrood is also home to the Scottish Parliament and the Queen's Edinburgh residence, the Palace of Holyroodhouse. It is a central location at the bottom of the Royal Mile which is the road that joins Holyrood to Edinburgh Castle a mile away. There are plenty of hotels, pubs, cafes, restaurants and tourist attractions nearby.

<div style="width: 550px; padding-bottom: 5px; margin: 0 auto;">
{{< event_map >}}
</div>

### Getting To Edinburgh

Edinburgh is served by Edinburgh Airport which has tram and bus services into the city centre and both cost £5 for a single journey. Both the tram and 100 bus service stop on Princes Street which is Edinburgh's main shopping street and runs paralell to the Royal Mile (You can see the castle which alongside Arthurs Seat forms a great reference point for navigating the city). The 35 service takes a long time but is the cheapest option. Taxis cost around £25 between the city centre and the airport. Uber is also available.
Edinburgh is served by Edinburgh Airport which has tram and bus services into the city centre and both cost £5 for a single journey. Both the tram and 100 bus service stop on Princes Street, which is Edinburgh's main shopping street and runs paralell to the Royal Mile (you can see the castle which alongside Arthurs Seat forms a great reference point for navigating the city). The 35 service takes a long time but is the cheapest option. Taxis cost around £25 between the city centre and the airport.

Also on Princes Street is Edinburgh's Waverly Train Station which connects to all major British cities including Glasgow which is served by Prestick and Glasgow Airports (We don't recomend Prestwick as it is a long journey to Edinburgh).
Also on Princes Street is Edinburgh's Waverly Train Station which connects to all major British cities including Glasgow, which is served by Prestick and Glasgow Airports (we don't recomend Prestwick as it is a rather long journey to Edinburgh).

### Local Transport

Edinburgh has a very good bus service with a simple fare structure. Single journeys are currently £1.60 or unlimited travel for one day is £4.00. Between midnight and 4.30 am a night fare service is in place with single fares set at £3.00 or Day and Night tickets are available after 6pm for unlimited travel for £3.50. Holyrood is served by the number 35 and 6 services and there are several other services that stop within walking distance.

Edinburgh is also served by several taxi companies and the distinctive black cabs are a common sight on the roads. Many accept credit and debit cards but it is worth asking before starting your journey.
Edinburgh is also served by several taxi companies and the distinctive black cabs are a common sight on the roads. Many accept credit and debit cards, but it is worth asking before starting your journey.
20 changes: 10 additions & 10 deletions content/events/2017-edinburgh/propose.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ type = "event"
<b>We are devoted to inclusivity and welcome talk proposals from anyone who wishes to tender, regardless of race, gender or experience.</b> All proposals will be anonymised before review. Our anonymity process will involve stripping any identifiable information from proposals including name, gender, geography and company.
<br>
<br>
The people involved in anonymising the proposals will not be involved in their selection. Once the proposals have been anonymised, a team of reviewers will individually rate and catrgorise all proposals before coming together to discuss each category. Our team of reviewers will be gender balanced and will consist of a mix of nationalities. A draft conference program will follow and submitters will be notified via email before the program is finalised and announced.
The people involved in anonymising the proposals will not be involved in their selection. Once the proposals have been anonymised, a team of reviewers will individually rate and categorise all proposals before coming together to discuss each category. Our team of reviewers will be gender balanced and will consist of a mix of nationalities. A draft conference program will follow and submitters will be notified via email before the program is finalised and announced.

<hr>
<h3>Session Formats</h3>
Devopsdays Edinburgh is a single track, two day event. The format will include main track presentations, <a href="/pages/ignite-talks-format">Ignite talks</a>, and <a href="pages/open-space-format">Open Spaces sessions</a>, i.e.
Devopsdays Edinburgh is a single track, two-day event. The format will include main track presentations, <a href="/pages/ignite-talks-format">Ignite talks</a>, and <a href="pages/open-space-format">Open Spaces sessions</a>, i.e.
<ol>
<li><strong><em>A 30-minute talk or panel</em></strong> presented during the conference, usually in the mornings. These are 30 minute slots that will have the full attention of all attendees. We welcome all submissions.</li>
<li><strong><em>An Ignite talk</em></strong> presented during the <a href="/pages/ignite-talks-format">Ignite sessions</a> (scheduling varies). These are 5 minutes slots with slides changing every 15 seconds (20 slides total), also presented to all attendees in main conference room. We welcome all submissions.</li>
<li><strong><em>Open Space</em></strong>: The <a href="/pages/open-space-format">Open Space</a> breakout sessions allow you to propose, lead or participate in open group discussions. It is not necessary to propose topics ahead of time, topics can be suggested in person at the conference.</li>
<li><strong><em>A 30-minute talk or panel</em></strong> presented during the conference, usually in the mornings. These are 30 minute slots that will have the full attention of all attendees. We welcome all submissions.</li>
<li><strong><em>An Ignite talk</em></strong> presented during the <a href="/pages/ignite-talks-format">Ignite sessions</a> (scheduling varies). These are 5 minutes slots with slides changing every 15 seconds (20 slides total), also presented to all attendees in main conference room. We welcome all submissions.</li>
<li><strong><em>Open Space</em></strong>: The <a href="/pages/open-space-format">Open Space</a> breakout sessions allow you to propose, lead or participate in open group discussions. It is not necessary to propose topics ahead of time, topics can be suggested in person at the conference.</li>
</ol>
If you would like to <strong>demo</strong> a product or service at devopsdays then we encourage you to <a href="../sponsor">sponsor the event</a> and setup demos at your deciated sponsors booth/table where you will be able to engage directly with fellow engineers.
If you would like to <strong>demo</strong> a product or service at devopsdays then we encourage you to <a href="../sponsor">sponsor the event</a> and setup demos at your dedicated sponsors booth/table, where you will be able to engage directly with fellow engineers.
<hr/>

<h3>How to submit a proposal</h3>
Expand All @@ -31,7 +31,7 @@ To propose a talk or ignite, please fill out the <b><a href="https://goo.gl/form
<ul>
<li>It's always great to be specific; the more you can fill us in the better, but please do keep it concise (e.g. 20 or so lines should be enough).</li>
<li>Detail is awesome, but not as important as explaining why your proposal would be interesting to conference attendees.</li>
<li>Multiple proposals from the same person are most definitely welcome, please just perform multiple submissions (i.e. one per proposal) as that would help us out massively in the selection process.</li>
<li>Multiple proposals from the same person are most definitely welcome - please just perform multiple submissions (i.e. one per proposal) as that would help us out massively in the selection process.</li>
</ul>

<hr/>
Expand All @@ -40,14 +40,14 @@ Choosing talks is part art and part science; here are some factors we consider w
<ul>
<li><strong>Broad appeal:</strong> How will your talk play out in a room of people with a variety of skills and backgrounds?</li>
<li><strong>Under-represented voices:</strong> We want to hear all voices and strongly encourage diversity in all forms; you are the only one who can tell your story.</li>
<li><strong>Original content:</strong> We will lean towards original talks, those that have not already been presented at other (especially local) events, and those not available as online recordedings.</li>
<li><strong>No vendor pitches:</strong> We value our vendors and sponsors, however we will not accept a talk that appears to be a sales pitch. If you would like to demo your product or service, please consider sponsoring the event instead. This will provide a more direct level of engagement with attendees.</li>
<li><strong>Original content:</strong> We will lean towards original talks, those that have not already been presented at other (especially local) events and those not available as online recordedings.</li>
<li><strong>No vendor pitches:</strong> We value our vendors and sponsors; however we will not accept a talk that appears to be a sales pitch. If you would like to demo your product or service, please consider sponsoring the event instead. This will provide a more direct level of engagement with attendees.</li>
<li><strong>No third-party submissions:</strong> This is a small community-driven event and want to hear from speakers who are engaging with us directly.</li>
</ul>

<hr/>
<h3>Travel Expenses</h3>
Speakers at Devopsdays Edinburgh will receive a free ticket for the 2 day conference. We also feel you should not incur out-of-pocket travel expenses in order to participate, so if your employer is unable to cover your travel expenses then we may be able to help.
Speakers at Devopsdays Edinburgh will receive a free ticket for the 2 day conference. We also feel you should not incur out-of-pocket travel expenses in order to participate, so if your employer is unable to cover your travel expenses then we may be able to help.

<hr/>
<h3>Code of Conduct</h3>
Expand Down
6 changes: 3 additions & 3 deletions content/events/2017-edinburgh/sponsor.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ type = "event"
Devopsdays is a worldwide series of technical conferences covering topics of software development, IT infrastructure operations, and the intersection between them. We depend on sponsorship, we are not-for-profit, and the organisers are all working people who are active in the Tech community and passionate about getting DevOps right. We do not sell product presentations, nor will we distribute attendee contact lists.
<br>
<br>
Devopsdays is a great opportunity to network and build relationships with highly motivated specialists within the DevOps community; share your lessons learned; promote your brand and recruitment activities; and contribute to important discussions about diversity, burnout, and organisational transformation. All sponsors are encouraged to participate in break-out sessions and generally engage with conference the attendees as peers, heavy marketing typically works against you when trying to make a good impression at devopsdays conferences.
Devopsdays is a great opportunity to network and build relationships with highly motivated specialists within the DevOps community; share your lessons learned; promote your brand and recruitment activities; contribute to important discussions about diversity, burnout, and organisational transformation. All sponsors are encouraged to participate in break-out sessions and generally engage with conference attendees as peers; heavy marketing typically works against you when trying to make a good impression at devopsdays conferences.
<br>
<br>
If you are interested in one of the medal packages below, offering a special sponsorship, or have creative ideas about how you could support the event in another way then please do drop us an email at {{< email_organizers >}}
If you are interested in one of the medal packages below, offering a special sponsorship, or you have creative ideas about how you could support the event in another way then please do drop us an email at {{< email_organizers >}}
<hr/>
<div style="width:590px; margin: 0 auto;">
<table border=1 cellspacing=1 cellpadding=3 style="color:#003CB6" bordercolor="003CB6">
<tr>
<th><i>Sponsorship medal packages</i></th>
<th><center><b>Bronze<br />£500<br />(gbp)</center></b></th>
<th><center><b>Silver<br />£3,000<br />(gbp)</center></b></th>
<th><center><b>005EB8<br />£5,000<br />(gbp)</center></b></th>
<th><center><b>Gold<br />£5,000<br />(gbp)</center></b></th>
</tr>
<tr>
<td>Logo on Devopsdays Edinburgh website, main room signage and email communications</td>
Expand Down
4 changes: 2 additions & 2 deletions content/events/2017-edinburgh/welcome.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ Description = "devopsdays Edinburgh 2017"
{{< event_twitter >}}

<p>
Where better than Edinburgh, capital city of Scotland, to hold a devopsdays conference? Scotland has offered so much innovation in terms of science, engineering, literature, the arts, medicine and more. The language of science and engineering is indebted to Scotland due to lumineries such as James Watt and Lord Kelvin. Modern times are full of Scottish inventions from the television we watch, to the phones we communicate with to the tarmac we drive on. Almost every day of our lives is affected by Scottish inventions and discoveries. Some of the worlds most beloved stories such as as Treasure Island, Peter Pan, Jekyll and Hyde, Harry Potter and Sherlock Holmes have strong links to Scotland. Modern economics was founded by Adam Smith through his seminal work The Wealth of Nations. Medicine would be very different if it wasn't for the Scottish inventions of penicillin, hypodermic syringes, general anaesthetic and much, much more. And let's not forget the whisky! (But please forget the deep fried mars bar, it was a joke ok?)
Where better than Edinburgh, capital city of Scotland, to hold a devopsdays conference? Scotland has offered so much innovation in terms of science, engineering, literature, the arts, medicine and more. The language of science and engineering is indebted to Scotland due to luminaries such as James Watt and Lord Kelvin. Modern times are full of Scottish inventions from the television we watch, to the phones we communicate with to the tarmac we drive on. Almost every day of our lives is affected by Scottish inventions and discoveries. Some of the world's most beloved stories such as Treasure Island, Peter Pan, Jekyll and Hyde, Harry Potter and Sherlock Holmes have strong links to Scotland. Modern economics was founded by Adam Smith through his seminal work The Wealth of Nations. Medicine would be very different if it wasn't for the Scottish inventions of penicillin, hypodermic syringes, general anaesthetic and much, much more. And let's not forget the whisky! (But please forget the deep fried mars bar - it was a joke, ok?)
</p>
<p>
Scotland has a culture of openess and inclusivity and these are very important to the organisers of devopsdays Edinburgh. All attendees and sponsor staff will be required to abide by our {{< event_link page="conduct" text="Code of Conduct" >}}. Devopsdays Edinburgh welcomes everyone who respects other people's health, comfort and safety.
Scotland has a culture of openess and inclusivity. This is very important to the organisers of devopsdays Edinburgh. All attendees and sponsor staff will be required to abide by our {{< event_link page="conduct" text="Code of Conduct" >}}. Devopsdays Edinburgh welcomes everyone who respects other people's health, comfort and safety.
</p>

0 comments on commit 9f37c02

Please sign in to comment.