Skip to content

Commit f3373c6

Browse files
authored
Merge pull request #66 from clojurebridge-berlin/add-coc-to-coach-training
Fix typo. Fix broken HTML. More concise CoC text.
2 parents 1be41c6 + 3573596 commit f3373c6

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed

coaches_training.deck.html

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,17 @@ <h2>Code of Conduct</h2>
5353
<h3>Expected Behavior</h3>
5454

5555
<ul>
56-
<li>Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.</li>
57-
<li>Exercise consideration and respect in your speech and actions.
58-
-Attempt collaboration before conflict.</li>
59-
<li>Refrain from demeaning, discriminatory, or harassing behavior and speech.</li>
60-
<li>Be mindful of your surroundings and of your fellow participants.
56+
<li>Participate authentically and actively</li>
57+
<li>Be considerate and respectful</li>
58+
<li>Attempt collaboration before conflict</li>
59+
<li>Refrain from demeaning, discriminatory, or harassing behavior/speech</li>
60+
<li>Be mindful of your surroundings and fellow participants</li>
61+
<li>Alert community leaders if you notice:
6162

6263
<ul>
63-
<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>
64+
<li>a dangerous situation</li>
65+
<li>someone in distress</li>
66+
<li>violations of this Code of Conduct</li>
6467
</ul>
6568
</li>
6669
</ul>
@@ -316,7 +319,7 @@ <h2>Code of Conduct Violations</h2>
316319

317320
<h4>Q: How do I react if an attendee complains about CoC violation?</h4>
318321

319-
<h4>A: Bring them to an orga-team memeber</h4>
322+
<h4>A: Bring them to an orga-team member</h4>
320323

321324
</section>
322325
<section class="slide" id="discussion_technical_capability">
@@ -614,7 +617,7 @@ <h2>deck.rb presentation</h2>
614617
});
615618
// ]]>
616619
</script>
617-
620+
618621
<!--Deck Core and extensions-->
619622

620623
<script src="/deck.js/core/deck.core.js" type="text/javascript"></script>

docs/coaches_training.deck.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,15 @@ The Berlin Code of Conduct ([berlincodeofconduct.org](berlincodeofconduct.org))
2424

2525
### Expected Behavior
2626

27-
- Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
28-
- Exercise consideration and respect in your speech and actions.
29-
-Attempt collaboration before conflict.
30-
- Refrain from demeaning, discriminatory, or harassing behavior and speech.
31-
- Be mindful of your surroundings and of your fellow participants.
32-
- Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
27+
- Participate authentically and actively
28+
- Be considerate and respectful
29+
- Attempt collaboration before conflict
30+
- Refrain from demeaning, discriminatory, or harassing behavior/speech
31+
- Be mindful of your surroundings and fellow participants
32+
- Alert community leaders if you notice:
33+
- a dangerous situation
34+
- someone in distress
35+
- violations of this Code of Conduct
3336

3437

3538
# Why ClojureBridge?
@@ -200,7 +203,7 @@ DISCUSS!
200203
The Berlin Code of Conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
201204

202205
#### Q: How do I react if an attendee complains about CoC violation?
203-
#### A: Bring them to an orga-team memeber
206+
#### A: Bring them to an orga-team member
204207

205208

206209
# Discussion: Technical Capability

0 commit comments

Comments
 (0)