From 10a550c41aa5de83ddf24366b4a5520432dca41f Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Tue, 21 Jan 2020 10:52:11 -0500 Subject: Reorganize wiki and add CoC. --- pages/code-of-conduct.txt | 86 +++++++++++++++++++++++++++++++++++++++++ pages/gnu/social-contract.txt | 55 ++++++++++++++++++++++++++ pages/playground/playground.txt | 1 - pages/social-contract.txt | 55 -------------------------- pages/start.txt | 10 ++++- pages/wiki/welcome.txt | 30 -------------- 6 files changed, 150 insertions(+), 87 deletions(-) create mode 100644 pages/code-of-conduct.txt create mode 100644 pages/gnu/social-contract.txt delete mode 100644 pages/playground/playground.txt delete mode 100644 pages/social-contract.txt delete mode 100644 pages/wiki/welcome.txt (limited to 'pages') diff --git a/pages/code-of-conduct.txt b/pages/code-of-conduct.txt new file mode 100644 index 0000000..3f9b794 --- /dev/null +++ b/pages/code-of-conduct.txt @@ -0,0 +1,86 @@ + +# Contributor Covenant Code of Conduct + +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience +* Focusing on what is best not just for us as individuals, but for the overall community + +Examples of unacceptable behavior include: + +* The use of sexualized language or imagery, and sexual attention or + advances of any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email + address, without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at . All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series of actions. + +**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within the community. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0, +available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. + +Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity). + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see the FAQ at +https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations. + diff --git a/pages/gnu/social-contract.txt b/pages/gnu/social-contract.txt new file mode 100644 index 0000000..e8fdd1c --- /dev/null +++ b/pages/gnu/social-contract.txt @@ -0,0 +1,55 @@ + +# GNU Social Contract [DRAFT] +--- + +This document states the core commitments of the GNU Project to the +broader free software community. All current GNU Project members +have agreed to uphold these values. + + +The purpose of the GNU Project is to provide software and systems that +respect users' freedoms. + +## GNU respects users' freedoms + +We provide software that guarantees to users the four essential freedoms, +without compromise: + 0. The freedom to run the program as they wish, for any purpose. + 1. The freedom to study how the program works, and change it so it does + their computing as they wish. + Access to the source code is a precondition for this. + 2. The freedom to redistribute copies so they can help others. + 3. The freedom to distribute copies of their modified versions to others. + By doing this they can give the whole community a chance to benefit + from their changes. + Access to the source code is a precondition for this. + +All software written by us is distributed under copyleft licenses, designed +to ensure that developers cannot strip off users' freedom from GNU software. + +Besides upholding the four essential freedoms, we pay attention and respond +to new threats to users' freedom as they arise, such as services as a +software substitute (SaaSS), use of non-free scripts on web pages, mass +surveillance, digital restrictions management (DRM), etc. + +## GNU provides consistent systems + +We develop an operating system and a set of applications, in the form of +GNU packages. GNU package developers work together to ensure consistency +across packages. GNU packages follow the design and development guidelines +of the GNU Project. + +## GNU collaborates with the broader free software community + +Free software has extended beyond the GNU Project, and we work with +companion free software projects that develop key components of our system. +We aim to extend the reach of free software to new fields. + +## GNU welcomes contributions from all and everyone + +We want to give everyone the opportunity to contribute to our efforts +on any of the many tasks that require work. We welcome all contributors, +regardless of their gender, ethnicity, sexual orientation, level of +experience, or any other personal characteristics. We commit to providing +a harassment-free experience for all our contributors. + diff --git a/pages/playground/playground.txt b/pages/playground/playground.txt deleted file mode 100644 index a2274bd..0000000 --- a/pages/playground/playground.txt +++ /dev/null @@ -1 +0,0 @@ -====== PlayGround ====== diff --git a/pages/social-contract.txt b/pages/social-contract.txt deleted file mode 100644 index e8fdd1c..0000000 --- a/pages/social-contract.txt +++ /dev/null @@ -1,55 +0,0 @@ - -# GNU Social Contract [DRAFT] ---- - -This document states the core commitments of the GNU Project to the -broader free software community. All current GNU Project members -have agreed to uphold these values. - - -The purpose of the GNU Project is to provide software and systems that -respect users' freedoms. - -## GNU respects users' freedoms - -We provide software that guarantees to users the four essential freedoms, -without compromise: - 0. The freedom to run the program as they wish, for any purpose. - 1. The freedom to study how the program works, and change it so it does - their computing as they wish. - Access to the source code is a precondition for this. - 2. The freedom to redistribute copies so they can help others. - 3. The freedom to distribute copies of their modified versions to others. - By doing this they can give the whole community a chance to benefit - from their changes. - Access to the source code is a precondition for this. - -All software written by us is distributed under copyleft licenses, designed -to ensure that developers cannot strip off users' freedom from GNU software. - -Besides upholding the four essential freedoms, we pay attention and respond -to new threats to users' freedom as they arise, such as services as a -software substitute (SaaSS), use of non-free scripts on web pages, mass -surveillance, digital restrictions management (DRM), etc. - -## GNU provides consistent systems - -We develop an operating system and a set of applications, in the form of -GNU packages. GNU package developers work together to ensure consistency -across packages. GNU packages follow the design and development guidelines -of the GNU Project. - -## GNU collaborates with the broader free software community - -Free software has extended beyond the GNU Project, and we work with -companion free software projects that develop key components of our system. -We aim to extend the reach of free software to new fields. - -## GNU welcomes contributions from all and everyone - -We want to give everyone the opportunity to contribute to our efforts -on any of the many tasks that require work. We welcome all contributors, -regardless of their gender, ethnicity, sexual orientation, level of -experience, or any other personal characteristics. We commit to providing -a harassment-free experience for all our contributors. - diff --git a/pages/start.txt b/pages/start.txt index 919ac86..3a3dba7 100644 --- a/pages/start.txt +++ b/pages/start.txt @@ -1,3 +1,11 @@ ====== Welcome to the wiki for GNU Maintainers! ====== -The wiki is entirely driven by a git backend. To register for the wiki please email wiki@gnu.tools and interact with a human. Registration for the wiki is currently limited to GNU Maintainers, but we hope to open this up further in the future. +The wiki is entirely driven by a git backend. + +To register for the wiki please email wiki@gnu.tools and interact with a human. + +Registration for the wiki is currently limited to GNU Maintainers, but we hope to open this up further in the future. + +The wiki supports dokuwiki formatting natively or markdown via wrapping via %% ... %%. + +The wiki is goverened by a [[code-of-conduct|code of conduct]]. diff --git a/pages/wiki/welcome.txt b/pages/wiki/welcome.txt deleted file mode 100644 index 6978f1b..0000000 --- a/pages/wiki/welcome.txt +++ /dev/null @@ -1,30 +0,0 @@ -====== Welcome to your new DokuWiki ====== - -Congratulations, your wiki is now up and running. Here are a few more tips to get you started. - -Enjoy your work with DokuWiki,\\ --- the developers - -===== Create your first pages ===== - -Your wiki needs to have a start page. As long as it doesn't exist, this link will be red: [[:start]]. - -Go on, follow that link and create the page. If you need help with using the syntax you can always refer to the [[wiki:syntax|syntax page]]. - -You might also want to use a sidebar. To create it, just edit the [[:sidebar]] page. Everything in that page will be shown in a margin column on the side. Read our [[doku>faq:sidebar|FAQ on sidebars]] to learn more. - -Please be aware that not all templates support sidebars. - -===== Customize your Wiki ===== - -Once you're comfortable with creating and editing pages you might want to have a look at the [[this>doku.php?do=admin&page=config|configuration settings]] (be sure to login as superuser first). - -You may also want to see what [[doku>plugins|plugins]] and [[doku>templates|templates]] are available at DokuWiki.org to extend the functionality and looks of your DokuWiki installation. - -===== Join the Community ===== - -DokuWiki is an Open Source project that thrives through user contributions. A good way to stay informed on what's going on and to get useful tips in using DokuWiki is subscribing to the [[doku>newsletter]]. - -The [[http://forum.dokuwiki.org|DokuWiki User Forum]] is an excellent way to get in contact with other DokuWiki users and is just one of the many ways to get [[doku>faq:support|support]]. - -Of course we'd be more than happy to have you [[doku>teams:getting_involved|getting involved]] with DokuWiki. -- cgit v1.2.1