Skip to content

Fix typo. Fix broken HTML. More concise CoC text. #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 7, 2017
Merged

Fix typo. Fix broken HTML. More concise CoC text. #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e0276a
Fix unordered list. Be more concise in Code of Conduct explanations
daveliepmann Aug 7, 2017
96e2920
Merge branch 'add-coc-to-coach-training' of github.com:clojurebridge-…
daveliepmann Aug 7, 2017
f8cb4d9
HTML changes for 1e0276a (<ul> fixes)
daveliepmann Aug 7, 2017
b58fc41
Fix "memeber" typo
daveliepmann Aug 7, 2017
3573596
Sub-listify CoC
daveliepmann Aug 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions coaches_training.deck.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,17 @@ <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.
<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:

<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>
<li>a dangerous situation</li>
<li>someone in distress</li>
<li>violations of this Code of Conduct</li>
</ul>
</li>
</ul>
Expand Down Expand Up @@ -316,7 +319,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">
Expand Down Expand Up @@ -614,7 +617,7 @@ <h2>deck.rb presentation</h2>
});
// ]]>
</script>

<!--Deck Core and extensions-->

<script src="/deck.js/core/deck.core.js" type="text/javascript"></script>
Expand Down
17 changes: 10 additions & 7 deletions docs/coaches_training.deck.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,15 @@ 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
- violations of this Code of Conduct


# Why ClojureBridge?
Expand Down Expand Up @@ -200,7 +203,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
Expand Down