Merge branch 'master' into staging

Author: Charlie Cook

_includes/training_dates.html

@@ -1,17 +1,12 @@
 <table class="training-dates">
   <tr>
-    <td class="date">30th&nbsp;Sept&nbsp;2014</td>
+    <td class="date">3rd&nbsp;November&nbsp;2015</td>
     <td class="location">Leeds</td>
-    <td class="register"><p class="booking-link"><a href="http://www.ntileeds.co.uk/training/ios-iphone-and-ipad-apps-development" onClick="trackOutboundLink(this, 'LeedsSept2014', 'http://www.ntileeds.co.uk/training/ios-iphone-and-ipad-apps-development'); return false;">MORE INFO</a></p></td>
+    <td class="register"><p class="booking-link"><a href="http://www.ntileeds.co.uk/training/ios-iphone-&amp;-ipad-apps-development" onClick="trackOutboundLink(this, 'LeedsNov2015', 'http://www.ntileeds.co.uk/training/ios-iphone-&amp;-ipad-apps-development'); return false;">MORE INFO</a></p></td>
   </tr>
   <tr>
-    <td class="date">11th&nbsp;Nov&nbsp;2014</td>
+    <td class="date">15th&nbsp;December&nbsp;2015</td>
     <td class="location">Leeds</td>
-    <td class="register"><p class="booking-link"><a href="http://www.ntileeds.co.uk/training/ios-iphone-and-ipad-apps-development" onClick="trackOutboundLink(this, 'LeedsNov2014', 'http://www.ntileeds.co.uk/training/ios-iphone-and-ipad-apps-development'); return false;">MORE INFO</a></p></td>
-  </tr>
-  <tr>
-    <td class="date">20th&nbsp;Jan&nbsp;2015</td>
-    <td class="location">Leeds</td>
-    <td class="register"><p class="booking-link"><a href="http://www.ntileeds.co.uk/training/ios-iphone-and-ipad-apps-development" onClick="trackOutboundLink(this, 'LeedsJan2015', 'http://www.ntileeds.co.uk/training/ios-iphone-and-ipad-apps-development'); return false;">MORE INFO</a></p></td>
+    <td class="register"><p class="booking-link"><a href="http://www.ntileeds.co.uk/training/ios-iphone-&amp;-ipad-apps-development" onClick="trackOutboundLink(this, 'LeedsDec2015', 'http://www.ntileeds.co.uk/training/ios-iphone-&amp;-ipad-apps-development'); return false;">MORE INFO</a></p></td>
   </tr>
 </table>

_posts/2013-09-23-ios-training-courses-updated-for-ios7-and-xcode5.md

@@ -7,7 +7,7 @@ excerpt: Last week, Apple released iOS 7 and a brand new version of their develo
 
 Last week, Apple publicly released iOS 7 as well as a brand new version of their development tools, Xcode 5.
 
-[![Download 2013 A Year in Review Slide PDF](http://shinydev.s3.amazonaws.com/blog-files/xcode-5-and-ios-7.png)](/iphone-training/)
+[![Xcode 5](http://shinydev.s3.amazonaws.com/blog-files/xcode-5-and-ios-7.png)](/iphone-training/)
 
 We have been working with both of these for a number of months and we are excited to finally be able to announce that **all of our [training courses](/iphone-training/) have been fully updated for both iOS 7 and Xcode 5**. All of the slides, lab notes and sample code have been updated to be compatible with the new tools included in Xcode 5.
 

_posts/2014-10-10-ios-training-courses-updated-for-ios8-and-xcode6.md

@@ -0,0 +1,14 @@
+---
+layout: post
+title: iOS Training Courses Fully Updated for iOS 8 and Xcode 6
+author: Dave Verwer
+excerpt: Last month, Apple released iOS 8 and a brand new version of their development tools, Xcode 6. I am very pleased to announce that all of our training courses are now fully updated with materials that incorpororate iOS 8 as well as Xcode 6.
+---
+
+Last month, Apple publicly released iOS 8 as well as a brand new version of their development tools, Xcode 6.
+
+[![Xcode 6](http://shinydev.s3.amazonaws.com/blog-files/xcode-6-and-ios-8.png)](/iphone-training/)
+
+We have been working with both of these for a number of months and are excited to announce that **all of our [training courses](/iphone-training/) have been fully updated for both iOS 8 and Xcode 6**. All of the slides, lab notes and sample code have been updated to be compatible with the new tools included in the Xcode 6 release.
+
+Xcode 6 is available [from Apple for free](http://developer.apple.com/xcode/). You should [book on an iOS development training course](/iphone-training/) and get yourself up to speed.

assets/images/macbook-xcode6.png

@@ -12,7 +12,7 @@ <h2>iPhone OS Consultancy.</h2>
     <p class="excerpt">With several years experience developing and marketing iPhone, iTouch and Mac applications we can help you throughout the process.</p>
     <p class="fancy-link"><a href="/contact/">Enquire about Consultancy services</a></p>
   </div>
-  <img src="/assets/images/ipad.png" width="561" height="360" class="display-img" />
+  <img src="/assets/images/half-ipad-ios7.png" width="470" height="340" class="display-img" />
 </div>
 
 </div>
@@ -54,5 +54,5 @@ <h3>Testimonials</h3>
         <p class="author">Tim Hastings, Technical Architect. CTI Group</p></blockquote>
       </div>
     </div>
-    <br style="clear:both" />    
+    <br style="clear:both" />
   </div>

consultancy.html

@@ -11,7 +11,7 @@ <h2>In-House iOS Training.</h2>
     <p class="excerpt">We can tailor an iPhone and iPad developer training course to your organisation&rsquo;s specific needs.</p>
     <p class="excerpt">Our bespoke training courses provide a cost effective way to bring your whole team up to speed, allowing them all to contribute to your development project from day one.</p>
   </div>
-  <img src="/assets/images/macbook-xcode5.png" width="561" height="360" class="display-img" alt="iOS developer training courses fully updated for iOS 7 and Xcode 5">
+  <img src="/assets/images/macbook-xcode6.png" width="541" height="340" class="display-img" alt="iOS developer training courses fully updated for iOS 8 and Xcode 6">
 </div>
 
 </div>
@@ -20,7 +20,7 @@ <h2>In-House iOS Training.</h2>
   <div class="container content-lower">
     <div class="section section-double">
       <h3>Design your iOS Developer Training Course</h3>
-      <p>All of our training materials (slides, tutorial documents and sample code) have been fully updated for <strong>Xcode 5 and iOS 7</strong>.</p>
+      <p>All of our training materials (slides, tutorial documents and sample code) have been fully updated for <strong>Xcode 6 and iOS 8</strong>.</p>
       <p><strong>Day 1</strong> is primarily focused on Objective-C and covers everything needed to start building iOS applications. The day covers basic Objective-C syntax and constructs, use of the Xcode IDE as a development tool, the Foundation framework, building Objective-C classes, properties and methods, debugging using Xcode and GDB, and a thorough explanation of memory management including full details of automatic reference counting (ARC).</p>
       <p><strong>Day 2</strong> teaches the basics of iOS application development and then covers the details of views and view hierarchy, storyboarding, Interface Builder, view controllers and architecture techniques to ensure a scalable app, table views, navigation and navigation controllers.</p>
       <p>Once the basic concepts have been covered, <strong>Day 3 and Day 4</strong> can be tailored to your specific needs. Previous courses have included in-depth coverage of topics such as:</p>
@@ -40,7 +40,7 @@ <h3>Design your iOS Developer Training Course</h3>
       <p class="fancy-link"><a href="/in-house-iphone-training-enquiry/">Make an in-house training enquiry</a></p>
     </div>
     <div class="section">
-      <h3>About the Trainers</h3>
+      <h3>About the Trainer</h3>
       <h4>Dave Verwer</h4>
       {% include daveverwer-bio.html %}
       {% include prerequisites.html %}

in-house-training.html

@@ -19,7 +19,7 @@ <h2>The iPhone &amp; iPad Experts.</h2>
       <h3><a href="/training/">iPhone OS Training</a></h3>
       <p>We can kick start your iOS development plans and teach you how to turn your app idea into a reality! Our intensive iOS training courses will quickly bring you or your team up to speed designing and building apps.</p>
       <p>We provide a range of <a href="/iphone-training/">scheduled courses</a> throughout the UK, or we can provide <a href="/in-house-iphone-training/">in-house training</a> specifically tailored to your organisation&rsquo;s requirements.</p>
-      <p>All of our courses are <a href="/blog/ios-training-courses-updated-for-ios7-and-xcode5/">fully updated for iOS 7 &amp; Xcode 5</a>.</p>
+      <p>All of our courses are <a href="/blog/ios-training-courses-updated-for-ios8-and-xcode6/">fully updated for iOS 8 &amp; Xcode 6</a>.</p>
       <p class="fancy-link"><a href="/training/">Learn more about iOS Training</a></p>
 
       <h3><a href="/our-apps/">Our Apps</a></h3>

index.html

@@ -10,7 +10,7 @@ <h2>iOS Developer Training.</h2>
     <p class="excerpt">Our publicly scheduled iPhone and iPad developer training courses provide everything you need to get up and running with Objective-C and the iOS SDK.</p>
     <p class="excerpt">The course provides a comprehensive grounding in iOS development and you will come away with the ability to build apps and a thorough understanding of the key concepts and techniques.</p>
   </div>
-  <img src="/assets/images/macbook-xcode5.png" width="561" height="360" class="display-img" alt="iOS developer training courses are fully updated for iOS 7 and Xcode 5">
+  <img src="/assets/images/macbook-xcode6.png" width="541" height="340" class="display-img" alt="iOS developer training courses are fully updated for iOS 8 and Xcode 6">
 </div>
 
 </div>
@@ -57,7 +57,7 @@ <h3 style="margin-bottom: 0">Course Feedback</h3>
   <div class="container content-lower">
     <div class="section section-double">
       <h3>Detailed Course Breakdown</h3>
-      <p>All of our training materials (slides, tutorial documents and sample code) have been fully updated for <strong>Xcode 5 and iOS 7</strong>.</p>
+      <p>All of our training materials (slides, tutorial documents and sample code) have been fully updated for <strong>Xcode 6 and iOS 8</strong>.</p>
       <p><strong>Day 1</strong> is primarily focused on Objective-C and covers everything needed to start building iOS applications. The day covers basic Objective-C syntax and constructs, use of the Xcode IDE as a development tool, the Foundation framework, building Objective-C classes, properties and methods, debugging using Xcode and GDB, and a thorough explanation of memory management including full details of automatic reference counting (ARC).</p>
       <p><strong>Day 2</strong> teaches the basics of iOS application development and then covers the details of views and view hierarchy, storyboarding, Interface Builder, view controllers and architecture techniques to ensure a scalable app, table views, navigation and navigation controllers.</p>
       <p><strong>Day 3</strong> covers custom table cells, resources and image handling, animation, touch, some more advanced Objective-C, threading, multi-tasking as well as detailed information on polishing your app so that it looks, and more importantly performs the very best that it can using the Instruments profiling tool which is included with Xcode. Finally an in depth look at the development and deployment process, iTunes connect, the App Store and review process.</p>
@@ -66,7 +66,7 @@ <h3>Everything you need to learn!</h3>
       <p>We will provide for you a state of the art Mac pre-loaded with the latest developer tools. Lunches and refreshments are also included! All you need to bring is your brain!</p>
     </div>
     <div class="section">
-      <h3>About the Trainers</h3>
+      <h3>About the Trainer</h3>
       <h4>Dave Verwer</h3>
       {% include daveverwer-bio.html %}
       {% include prerequisites.html %}

public-training.html

@@ -10,7 +10,7 @@ <h2>iOS Developer Training.</h2>
     <p class="excerpt">Our iOS training courses will give your project the kick start it needs and provide you with the knowledge to design, build and release your iPhone or iPad app.</p>
     <p class="excerpt">Whether you decide to attend one of our intensive 4 day public courses or let us tailor an in-house programme to your specific requirements, it's your choice.</p>
   </div>
-  <img src="/assets/images/macbook-xcode5.png" width="561" height="360" class="display-img" alt="iOS developer training course fully updated for iOS 7 and Xcode 5">
+  <img src="/assets/images/macbook-xcode6.png" width="541" height="340" class="display-img" alt="iOS developer training course fully updated for iOS 7 and Xcode 5">
 </div>
 
 </div>