Merge pull request #75 from 1183519e/master

merge several policies into one reference to help.ccc.de
Awesome, thanks so much!
This commit is contained in:
Pepi Zawodsky 2018-12-15 11:53:43 +01:00 committed by GitHub
commit 0eb91e184e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -32,8 +32,7 @@ You'll also find a list of all the nice humans who have contributed to this list
- If you spot somebody not being excellent to someone else, remind them to be excellent and ask them to apologi(s|z)e to the insulted part(y|ies), but only if the insulted wish to receive an apology. Sometimes the insulted party will just want to move on and not have any further contact with someone who was coarse to them. - If you spot somebody not being excellent to someone else, remind them to be excellent and ask them to apologi(s|z)e to the insulted part(y|ies), but only if the insulted wish to receive an apology. Sometimes the insulted party will just want to move on and not have any further contact with someone who was coarse to them.
- If you don't want to be called $swearword, don't behave like one. - If you don't want to be called $swearword, don't behave like one.
- Help each other out. - Help each other out.
- Read the “[Anti Harrassment Policy][3]” and live by it. - Read the Code of Conduct and all linked documents at [help.ccc.de][3] and live by it.
- There is a [Code of Conduct][47] and it applies to you.
- Ask if it is ok to take a picture BEFORE taking the picture. - Ask if it is ok to take a picture BEFORE taking the picture.
@ -675,7 +674,7 @@ These people have contributed to improve this list for everyone (in no particula
<!-- ## 🔗 Links --> <!-- ## 🔗 Links -->
[1]:https://events.ccc.de/congress/2017/wiki/Static:How_To_Survive [1]:https://events.ccc.de/congress/2017/wiki/Static:How_To_Survive
[2]:https://www.eventphone.de/ [2]:https://www.eventphone.de/
[3]:https://events.ccc.de/congress/2013/wiki/Static:Anti-Harassment_Policy "Anti Harrassment Policy" [3]:https://help.ccc.de/
[4]:http://r0cket.de/ [4]:http://r0cket.de/
[5]:https://www.noisebridge.net/wiki/Passport [5]:https://www.noisebridge.net/wiki/Passport
[6]:https://en.wikipedia.org/wiki/Schuko [6]:https://en.wikipedia.org/wiki/Schuko
@ -719,7 +718,6 @@ These people have contributed to improve this list for everyone (in no particula
[44]:https://www.gesetze-im-internet.de/btmg_1981/anlage_iii.html [44]:https://www.gesetze-im-internet.de/btmg_1981/anlage_iii.html
[45]:https://www.gesetze-im-internet.de/btmg_1981/ [45]:https://www.gesetze-im-internet.de/btmg_1981/
[46]:https://www.bfarm.de/SharedDocs/Downloads/DE/Bundesopiumstelle/Betaeubungsmittel/Reisen/reise_scheng_formular.pdf?__blob=publicationFile&v=3 [46]:https://www.bfarm.de/SharedDocs/Downloads/DE/Bundesopiumstelle/Betaeubungsmittel/Reisen/reise_scheng_formular.pdf?__blob=publicationFile&v=3
[47]:https://events.ccc.de/congress/2017/wiki/index.php?title=Code_Of_Conduct "Code of Conducti: A galactic Congress welcomes all lifeforms"
[48]:https://www.youtube.com/watch?v=HXi1g6lueTo [48]:https://www.youtube.com/watch?v=HXi1g6lueTo
[49]:https://en.wikipedia.org/wiki/Towel_Day [49]:https://en.wikipedia.org/wiki/Towel_Day