From ef4a263a6be7ce291fa193043de5dc7c7f1298a0 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.co.uk>
Date: Fri, 10 Apr 2015 23:20:40 +0100
Subject: [PATCH] Added more talks

---
 .../_talks/2012-09-05-what-is-this-drupal-thing.md  |  5 +++++
 source/_talks/2013-07-10-ldap.md                    | 11 +++++++++++
 source/_talks/2014-03-01-git-flow.md                | 13 +++++++++++++
 .../_talks/2014-07-02-drush-make-drupalbristol.md   | 13 +++++++++++++
 source/_talks/2014-08-19-drupal-association.md      | 12 ++++++++++++
 .../2015-01-18-drupalorg-2015-whats-coming-next.md  | 13 +++++++++++++
 .../2015-02-28-drupalorg-2015-whats-coming-next.md  | 13 +++++++++++++
 source/_talks/2015-04-08-drupal-8.md                |  3 ++-
 8 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 source/_talks/2012-09-05-what-is-this-drupal-thing.md
 create mode 100644 source/_talks/2013-07-10-ldap.md
 create mode 100644 source/_talks/2014-03-01-git-flow.md
 create mode 100644 source/_talks/2014-07-02-drush-make-drupalbristol.md
 create mode 100644 source/_talks/2014-08-19-drupal-association.md
 create mode 100644 source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md
 create mode 100644 source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md

diff --git a/source/_talks/2012-09-05-what-is-this-drupal-thing.md b/source/_talks/2012-09-05-what-is-this-drupal-thing.md
new file mode 100644
index 00000000..ad230fbf
--- /dev/null
+++ b/source/_talks/2012-09-05-what-is-this-drupal-thing.md
@@ -0,0 +1,5 @@
+---
+title: So, what is this Drupal thing?
+location: unified.diff
+---
+An introduction to [Drupal](https://www.drupal.org).
\ No newline at end of file
diff --git a/source/_talks/2013-07-10-ldap.md b/source/_talks/2013-07-10-ldap.md
new file mode 100644
index 00000000..53b7df16
--- /dev/null
+++ b/source/_talks/2013-07-10-ldap.md
@@ -0,0 +1,11 @@
+---
+title: LDAP Integration with Drupal
+location: South Wales Drupal User Group
+tags:
+  - user-group
+  - drupal
+  - ldap
+meta:
+  description: 'Integrating Drupal with LDAP.'
+---
+An overview of the [Drupal LDAP module](https://www.drupal.org/project/ldap) and how I integrated and customised it for a client project.
\ No newline at end of file
diff --git a/source/_talks/2014-03-01-git-flow.md b/source/_talks/2014-03-01-git-flow.md
new file mode 100644
index 00000000..072c4c69
--- /dev/null
+++ b/source/_talks/2014-03-01-git-flow.md
@@ -0,0 +1,13 @@
+---
+title: Introduction to Git Flow
+location: DrupalCamp London 2014
+tags:
+  - conference
+  - drupalcamp
+  - drupalcamp-london
+  - git
+  - git-flow
+meta:
+  description:
+slug: git-flow
+---
diff --git a/source/_talks/2014-07-02-drush-make-drupalbristol.md b/source/_talks/2014-07-02-drush-make-drupalbristol.md
new file mode 100644
index 00000000..a697aabf
--- /dev/null
+++ b/source/_talks/2014-07-02-drush-make-drupalbristol.md
@@ -0,0 +1,13 @@
+---
+title: drush make drupalbristol
+location: Drupal Bristol User Group
+speakerdeck: https://speakerdeck.com/opdavies/drush-make-drupalbristol
+tags:
+  - user-group
+  - drupal
+  - drush
+  - drush-make
+meta:
+  description: 'An introduction to Drush and Drush Make.'
+---
+An introduction to Drush and Drush Make.
\ No newline at end of file
diff --git a/source/_talks/2014-08-19-drupal-association.md b/source/_talks/2014-08-19-drupal-association.md
new file mode 100644
index 00000000..dfe0aefe
--- /dev/null
+++ b/source/_talks/2014-08-19-drupal-association.md
@@ -0,0 +1,12 @@
+---
+title: About the Drupal Association
+location: South Wales Drupal User Group
+date: 2014-08-19
+tags:
+  - user-group
+  - drupal-association
+meta:
+  description: "An impromptu talk about the Drupal Association and I've done there since joining the team."
+slug: drupal-association
+---
+An impromptu talk about the [Drupal Association](https://assoc.drupal.org) and I've done there since joining the team.
\ No newline at end of file
diff --git a/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md b/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md
new file mode 100644
index 00000000..03fb11c9
--- /dev/null
+++ b/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md
@@ -0,0 +1,13 @@
+---
+title: Drupal.org in 2015: What's Coming Next
+location: <a href="http://www.drupalcampbrighton.co.uk/drupalcamp-brighton-2015/">DrupalCamp Brighton 2015</a>
+date: 2015-01-18
+tags:
+  - conference
+  - drupalcamp
+  - drupalcamp-brighton
+  - drupalorg
+meta:
+  description: 'Everything that you wanted to know about Drupal 8 in ten minutes, but were afraid to ask!'
+slug: drupalorg-2015
+---
diff --git a/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md b/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md
new file mode 100644
index 00000000..da9f2c0b
--- /dev/null
+++ b/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md
@@ -0,0 +1,13 @@
+---
+title: Drupal.org in 2015: What's Coming Next
+location: <a href="http://2015.drupalcamplondon.co.uk">DrupalCamp London 2015</a>
+date: 2015-02-28
+tags:
+  - conference
+  - drupalcamp
+  - drupalcamp-london
+  - drupalorg
+meta:
+  description: 'Everything that you wanted to know about Drupal 8 in ten minutes, but were afraid to ask!'
+slug: drupalorg-2015
+---
diff --git a/source/_talks/2015-04-08-drupal-8.md b/source/_talks/2015-04-08-drupal-8.md
index 05c764a6..64d56fa6 100644
--- a/source/_talks/2015-04-08-drupal-8.md
+++ b/source/_talks/2015-04-08-drupal-8.md
@@ -1,6 +1,6 @@
 ---
 title: Drupal 8 (Lightning Talk)
-location: PHPSW
+location: <a href="http://phpsw.org.uk/events/221484360-lightning-talks" title="PHPSW: Lightning Talks">PHPSW</a>
 date: 2015-04-08
 slides: https://speakerdeck.com/opdavies/drupal-8
 tags:
@@ -10,4 +10,5 @@ tags:
   - drupal-8
 meta:
   description: 'Everything that you wanted to know about Drupal 8 in ten minutes, but were afraid to ask!'
+slug: drupal-8
 ---