From 1e0276a0ccfcc05485de2b205dfb1a66078255a7 Mon Sep 17 00:00:00 2001
From: Dave Liepmann <dave.liepmann@gmail.com>
Date: Mon, 7 Aug 2017 13:28:46 +0200
Subject: [PATCH 1/4] Fix unordered list. Be more concise in Code of Conduct
 explanations

---
 docs/coaches_training.deck.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/coaches_training.deck.md b/docs/coaches_training.deck.md
index 2019559..2476c79 100644
--- a/docs/coaches_training.deck.md
+++ b/docs/coaches_training.deck.md
@@ -24,12 +24,12 @@ The Berlin Code of Conduct ([berlincodeofconduct.org](berlincodeofconduct.org))
 
 ### Expected Behavior
 
- - Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
- - Exercise consideration and respect in your speech and actions.
- -Attempt collaboration before conflict.
- - Refrain from demeaning, discriminatory, or harassing behavior and speech.
- - Be mindful of your surroundings and of your fellow participants.
-  - Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
+ - Participate authentically and actively
+ - Be considerate and respectful
+ - Attempt collaboration before conflict
+ - Refrain from demeaning, discriminatory, or harassing behavior/speech
+ - Be mindful of your surroundings and fellow participants
+ - Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct (even if it seems inconsequential)
 
 
 # Why ClojureBridge?

From f8cb4d9e03bc085caa6c68f4f5757a9b0ed8f2db Mon Sep 17 00:00:00 2001
From: Dave Liepmann <dave.liepmann@gmail.com>
Date: Mon, 7 Aug 2017 13:34:39 +0200
Subject: [PATCH 2/4] HTML changes for 1e0276a (<ul> fixes)

---
 coaches_training.deck.html | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/coaches_training.deck.html b/coaches_training.deck.html
index 17f6fd6..fe6d228 100644
--- a/coaches_training.deck.html
+++ b/coaches_training.deck.html
@@ -53,16 +53,12 @@ <h2>Code of Conduct</h2>
 <h3>Expected Behavior</h3>
 
 <ul>
-<li>Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.</li>
-<li>Exercise consideration and respect in your speech and actions.
--Attempt collaboration before conflict.</li>
-<li>Refrain from demeaning, discriminatory, or harassing behavior and speech.</li>
-<li>Be mindful of your surroundings and of your fellow participants.
-
-<ul>
-<li>Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.</li>
-</ul>
-</li>
+<li>Participate authentically and actively</li>
+<li>Be considerate and respectful</li>
+<li>Attempt collaboration before conflict</li>
+<li>Refrain from demeaning, discriminatory, or harassing behavior/speech</li>
+<li>Be mindful of your surroundings and fellow participants</li>
+<li>Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct (even if it seems inconsequential)</li>
 </ul>
 
 </section>
@@ -614,7 +610,7 @@ <h2>deck.rb presentation</h2>
 });
 // ]]>
     </script>
-
+    
 <!--Deck Core and extensions-->
 
     <script src="/deck.js/core/deck.core.js" type="text/javascript"></script>

From b58fc414fd79823ae2b78a6e2aa40d0b5f713379 Mon Sep 17 00:00:00 2001
From: Dave Liepmann <dave.liepmann@gmail.com>
Date: Mon, 7 Aug 2017 13:35:17 +0200
Subject: [PATCH 3/4] Fix "memeber" typo

---
 coaches_training.deck.html    | 2 +-
 docs/coaches_training.deck.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/coaches_training.deck.html b/coaches_training.deck.html
index fe6d228..e0d4582 100644
--- a/coaches_training.deck.html
+++ b/coaches_training.deck.html
@@ -312,7 +312,7 @@ <h2>Code of Conduct Violations</h2>
 
 <h4>Q: How do I react if an attendee complains about CoC violation?</h4>
 
-<h4>A: Bring them to an orga-team memeber</h4>
+<h4>A: Bring them to an orga-team member</h4>
 
 </section>
     <section class="slide" id="discussion_technical_capability">
diff --git a/docs/coaches_training.deck.md b/docs/coaches_training.deck.md
index 2476c79..5ff5713 100644
--- a/docs/coaches_training.deck.md
+++ b/docs/coaches_training.deck.md
@@ -200,7 +200,7 @@ DISCUSS!
 The Berlin Code of Conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
 
 #### Q: How do I react if an attendee complains about CoC violation?
-#### A: Bring them to an orga-team memeber
+#### A: Bring them to an orga-team member
 
 
 # Discussion: Technical Capability

From 357359612b73ff53e3ca09b6f9b979cc0cccc425 Mon Sep 17 00:00:00 2001
From: Dave Liepmann <dave.liepmann@gmail.com>
Date: Mon, 7 Aug 2017 13:39:13 +0200
Subject: [PATCH 4/4] Sub-listify CoC

---
 coaches_training.deck.html    | 9 ++++++++-
 docs/coaches_training.deck.md | 5 ++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/coaches_training.deck.html b/coaches_training.deck.html
index e0d4582..686355d 100644
--- a/coaches_training.deck.html
+++ b/coaches_training.deck.html
@@ -58,7 +58,14 @@ <h3>Expected Behavior</h3>
 <li>Attempt collaboration before conflict</li>
 <li>Refrain from demeaning, discriminatory, or harassing behavior/speech</li>
 <li>Be mindful of your surroundings and fellow participants</li>
-<li>Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct (even if it seems inconsequential)</li>
+<li>Alert community leaders if you notice:
+
+<ul>
+<li>a dangerous situation</li>
+<li>someone in distress</li>
+<li>violations of this Code of Conduct</li>
+</ul>
+</li>
 </ul>
 
 </section>
diff --git a/docs/coaches_training.deck.md b/docs/coaches_training.deck.md
index 5ff5713..4b61f76 100644
--- a/docs/coaches_training.deck.md
+++ b/docs/coaches_training.deck.md
@@ -29,7 +29,10 @@ The Berlin Code of Conduct ([berlincodeofconduct.org](berlincodeofconduct.org))
  - Attempt collaboration before conflict
  - Refrain from demeaning, discriminatory, or harassing behavior/speech
  - Be mindful of your surroundings and fellow participants
- - Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct (even if it seems inconsequential)
+ - Alert community leaders if you notice:
+   - a dangerous situation
+   - someone in distress
+   - violations of this Code of Conduct
 
 
 # Why ClojureBridge?