From afc63f20236c18f933b3178a60650cc333d8bd50 Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Thu, 7 Jun 2018 16:57:47 -0400
Subject: [PATCH] add code of conduct

---
 wiki/index.php                |  8 +--
 wiki/pages/advanced-ssh.md    |  2 +-
 wiki/pages/code-of-conduct.md | 98 +++++++++++++++++++++++++++++++++++
 wiki/pages/goals-roadmap.md   | 10 ++--
 wiki/pages/manifesto.md       |  9 ++++
 5 files changed, 118 insertions(+), 9 deletions(-)
 create mode 100644 wiki/pages/code-of-conduct.md
 create mode 100644 wiki/pages/manifesto.md

diff --git a/wiki/index.php b/wiki/index.php
index 3f89205..075ac7d 100644
--- a/wiki/index.php
+++ b/wiki/index.php
@@ -27,11 +27,13 @@ foreach (glob("pages/*.md") as $page) {
 
 } else {
     // show a single page ?>
-    <a href="/wiki/"><h1>&lt; ~wiki</h1></a>
+    <a href="/wiki/">&lt; ~wiki</a>
     <hr>
-    <?=$parser->parse(file_get_contents("pages/{$_GET['page']}.md"))->getContent()?>
+        <?=$parser->parse(file_get_contents("pages/{$_GET['page']}.md"))->getContent()?>
     <hr>
-    <a href="https://git.tilde.team/meta/site/src/branch/master/wiki/pages/<?=$_GET["page"]?>.md"><i class="fa fa-edit"></i> source</a>
+    <a href="https://git.tilde.team/meta/site/src/branch/master/wiki/pages/<?=$_GET["page"]?>.md">
+        <i class="fa fa-edit"></i> source
+    </a>
 <?php }
 
 include __DIR__.'/../footer.php';
diff --git a/wiki/pages/advanced-ssh.md b/wiki/pages/advanced-ssh.md
index 72f7c70..5c716e7 100644
--- a/wiki/pages/advanced-ssh.md
+++ b/wiki/pages/advanced-ssh.md
@@ -1,6 +1,6 @@
 ---
 author: ~ben
-published: true
+published: false
 title: advanced ssh
 category: 
     - main
diff --git a/wiki/pages/code-of-conduct.md b/wiki/pages/code-of-conduct.md
new file mode 100644
index 0000000..389276a
--- /dev/null
+++ b/wiki/pages/code-of-conduct.md
@@ -0,0 +1,98 @@
+---
+author: ~ben
+published: false
+title: code of conduct
+category: 
+    - main
+---
+
+# code of conduct
+
+**tl;dr** learn by doing and helping. be excellent to each other. have fun!
+
+
+## 1. purpose
+
+a primary goal of tilde.team is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. as such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
+
+this code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
+
+we invite all those who participate in tilde.team to help us create safe and positive experiences for everyone.
+
+
+## 2. tilde.team mission
+
+[full goals/roadmap document](https://tilde.team/wiki/?page=goals-roadmap)
+
+**tilde.team exists to foster an engaged community for socializing, learning, and making cool stuff**
+
+in a mass-media age, it is up to small, intentional communities to gather and work together to provide a space outside of the advertising-laden, profit-seeking, corporate-owned world of social media.
+
+to that end, tilde.team strives to be a radically inclusive community where people of all backgrounds and all technological experience levels can come together to learn, to teach, and to delight in one another's creations.
+
+
+## 3. expected behavior
+
+the following behaviors are expected and requested of all community members:
+
+  * 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.
+  * teach when people need help. don't do it for them.
+
+
+## 4. unacceptable behavior
+
+the following behaviors are considered harassment and are unacceptable within our community:
+
+  * violence, threats of violence or violent language directed against another person.
+  * sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
+  * posting or displaying sexually explicit or violent material.
+  * posting or threatening to post other people's personally identifying information ("doxing").
+  * personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
+  * unwelcome sexual attention. this includes sexualized comments or jokes.
+  * deliberate intimidation, stalking or following.
+
+
+## 5. consequences of unacceptable behavior
+
+unacceptable behavior from any community member, including sponsors and those with decision-making authority (sudo), will not be tolerated.
+
+anyone asked to stop unacceptable behavior is expected to comply immediately.
+
+if a community member engages in unacceptable behavior, the community organizers may take any action they deem appropriate, up to and including a temporary ban or permanent expulsion from tilde.team without warning (meaning your account will be terminated and all user data deleted).
+
+
+## 6. reporting guidelines
+
+if you are subject to or witness unacceptable behavior, or have any other concerns, please contact an admin (see info below).
+
+additionally, help engaging with law enforcement is available.
+
+
+## 7. addressing grievances
+
+if you feel you have been falsely or unfairly accused of violating this code of conduct, use the contact info below to send a concise description of your grievance.
+
+
+## 8. scope
+
+we expect all tilde.team members to abide by this code of conduct while:
+
+* engaging with other members
+* publishing content on tilde.team
+
+
+## 9. contact info
+
+tilde.team admin:
+
+* [ben](https://tilde.team/~ben/): 
+  - [ben@tilde.team](mailto:ben@tilde.team)
+  - on irc `/query ben hello`
+
+## 10. license and attribution
+
+this code of conduct is based on [citizencodeofconduct.org](http://citizencodeofconduct.org/) and [tilde.town coc](http://tilde.town/wiki/conduct.html) under the terms of the [creative commons attribution-sharealike license](http://creativecommons.org/licenses/by-sa/3.0/).
diff --git a/wiki/pages/goals-roadmap.md b/wiki/pages/goals-roadmap.md
index 494bd84..4da1989 100644
--- a/wiki/pages/goals-roadmap.md
+++ b/wiki/pages/goals-roadmap.md
@@ -1,12 +1,12 @@
 ---
 author: ~ben
 published: true
-title: goals-roadmap
+title: goals and roadmap
 category: 
     - main
 ---
 
-## tilde.team goals and roadmap
+# tilde.team goals and roadmap
 
 [living draft of this document](https://pad.tilde.team/code/#/2/code/edit/RFBUqXec+9+MlZzx4mnhU3ps/)
 
@@ -50,7 +50,7 @@ environments.
 * this would allow people to find co-developers, or to allow non-devs to give devs good ideas.
 
 
-### services
+## services
 
 * mail
     - this is currently just forwarding addresses from google domains
@@ -67,7 +67,7 @@ environments.
 * [cryptpad](https://pad.tilde.team)
 
 
-### future plans
+## future plans
 
 * ldap auth
 * some kind of pastebin
@@ -80,7 +80,7 @@ environments.
 * ~ben shouldn't be the single point of failure. need a way to pass command to another admin if i go MIA.
 
 
-### to do
+## to do
 
 * come up with a community charter
 * terms of use
diff --git a/wiki/pages/manifesto.md b/wiki/pages/manifesto.md
new file mode 100644
index 0000000..f49afd7
--- /dev/null
+++ b/wiki/pages/manifesto.md
@@ -0,0 +1,9 @@
+---
+author: ~ben
+published: false
+title: manifesto
+category: 
+    - main
+---
+
+# tilde.team manifesto