From 1cca8db828740b2ec108daa32e1928e9511931dc Mon Sep 17 00:00:00 2001
From: Bridget Kromhout <bridget@kromhout.org>
Date: Sat, 21 Apr 2018 10:38:54 -0500
Subject: [PATCH 1/2] Rearranging halfday for kube

---
 slides/kube-halfday.yml | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/slides/kube-halfday.yml b/slides/kube-halfday.yml
index 6ed1ebf6..0cfbe235 100644
--- a/slides/kube-halfday.yml
+++ b/slides/kube-halfday.yml
@@ -2,21 +2,24 @@ title: |
   Kubernetes 101
 
 #chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-chat: "[Gitter](https://gitter.im/jpetazzo/training-20180413-paris)"
-#chat: "In person!"
+#chat: "[Gitter](https://gitter.im/jpetazzo/training-20180413-paris)"
+chat: "In person!"
 
 exclude:
 - self-paced
 
 chapters:
 - common/title.md
-- logistics.md
+#- logistics.md
+# Bridget-specific; others use logistics.md
+- logistics-bridget.md
 - kube/intro.md
 - common/about-slides.md
 - common/toc.md
 - - common/prereqs.md
   - kube/versions-k8s.md
   - common/sampleapp.md
+# Bridget doesn't go into as much depth with compose
   #- common/composescale.md
   - common/composedown.md
   - kube/concepts-k8s.md
@@ -24,18 +27,21 @@ chapters:
   - kube/declarative.md
   - kube/kubenet.md
   - kube/kubectlget.md
-- - kube/setup-k8s.md
-  - kube/kubectlrun.md
+  - kube/setup-k8s.md
+- - kube/kubectlrun.md
   - kube/kubectlexpose.md
   - kube/ourapponkube.md
-  - kube/dashboard.md
-- - kube/kubectlscale.md
+- - kube/dashboard.md
+  - kube/kubectlscale.md
   - kube/daemonset.md
   - kube/rollout.md
-  - kube/logs-cli.md
+- - kube/logs-cli.md
+# Bridget hasn't added ELK yet
   #- kube/logs-centralized.md
-  #- kube/helm.md
-  #- kube/namespaces.md
+  - kube/helm.md
+  - kube/namespaces.md
   - kube/whatsnext.md
-  - kube/links.md
+#  - kube/links.md
+# Bridget-specific
+  - kube/links-bridget.md
   - common/thankyou.md

From e7d9a8fa2d7e2bcdcee6672b0f5e54448df27ad9 Mon Sep 17 00:00:00 2001
From: Bridget Kromhout <bridget@kromhout.org>
Date: Sat, 21 Apr 2018 10:43:39 -0500
Subject: [PATCH 2/2] Correcting EFK

---
 slides/kube-halfday.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slides/kube-halfday.yml b/slides/kube-halfday.yml
index 0cfbe235..13e9b1fc 100644
--- a/slides/kube-halfday.yml
+++ b/slides/kube-halfday.yml
@@ -36,7 +36,7 @@ chapters:
   - kube/daemonset.md
   - kube/rollout.md
 - - kube/logs-cli.md
-# Bridget hasn't added ELK yet
+# Bridget hasn't added EFK yet
   #- kube/logs-centralized.md
   - kube/helm.md
   - kube/namespaces.md