diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 57e3cc7c59..8d064b64f5 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,3 +1,3 @@ # Code of Conduct -The Code of Conduct for this repository can be found online at [zed.dev/docs/code-of-conduct](https://zed.dev/docs/code-of-conduct). +The Code of Conduct for this repository can be found online at [zed.dev/code-of-conduct](https://zed.dev/code-of-conduct). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f7657b9ccd..4a0a632413 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ Thanks for your interest in contributing to Zed, the collaborative platform that is also a code editor! -All activity in Zed forums is subject to our [Code of Conduct](https://zed.dev/docs/code-of-conduct). Additionally, contributors must sign our [Contributor License Agreement](https://zed.dev/cla) before their contributions can be merged. +All activity in Zed forums is subject to our [Code of Conduct](https://zed.dev/code-of-conduct). Additionally, contributors must sign our [Contributor License Agreement](https://zed.dev/cla) before their contributions can be merged. ## Contribution ideas diff --git a/crates/zed/resources/flatpak/zed.metainfo.xml.in b/crates/zed/resources/flatpak/zed.metainfo.xml.in index 15a5055961..6c0d5309ac 100644 --- a/crates/zed/resources/flatpak/zed.metainfo.xml.in +++ b/crates/zed/resources/flatpak/zed.metainfo.xml.in @@ -38,7 +38,7 @@ https://github.com/zed-industries/zed/issues https://zed.dev/faq https://zed.dev/docs/getting-started - https://zed.dev/docs/feedback-and-support + https://zed.dev/feedback-and-support https://github.com/zed-industries/zed https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md index 967b91d59d..8383e990d9 100644 --- a/docs/src/SUMMARY.md +++ b/docs/src/SUMMARY.md @@ -129,10 +129,3 @@ - [Local Collaboration](./development/local-collaboration.md) - [Release Process](./development/releases.md) - [Debugging Crashes](./development/debugging-crashes.md) - -# Community - -- [Code of Conduct](./code-of-conduct.md) -- [Contributing to Zed](./contribute-to-zed.md) -- [Conversations](./conversations.md) -- [Feedback and Support](./feedback-and-support.md) diff --git a/docs/src/code-of-conduct.md b/docs/src/code-of-conduct.md deleted file mode 100644 index 6c168dcc7d..0000000000 --- a/docs/src/code-of-conduct.md +++ /dev/null @@ -1,127 +0,0 @@ -# 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 -hi@zed.dev. -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 - -[homepage]: https://www.contributor-covenant.org - -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](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). - -For answers to common questions about this code of conduct, see [the Contributor Covenant FAQ](https://www.contributor-covenant.org/faq). -For translations, see [Contributor Covenant Translations](https://www.contributor-covenant.org/translations). diff --git a/docs/src/contribute-to-zed.md b/docs/src/contribute-to-zed.md deleted file mode 100644 index 14a189b0e5..0000000000 --- a/docs/src/contribute-to-zed.md +++ /dev/null @@ -1,15 +0,0 @@ -# Contributing to Zed - -Thank you for your interest in contributing to the Zed! Before making contributions, we recommend reading our [CONTRIBUTING.md](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md) guidelines. This document provides a detailed guide to contributing to Zed. - -### Issues - -If you're eager to dive in and start contributing immediately, check out the issues in the [issue tracker](https://github.com/zed-industries/zed/issues). - -## Public Roadmap - -If you're wanting to contribute by building out a feature, we recommend taking a look at our [#roadmap](https://zed.dev/roadmap). This roadmap documents, at a high level, the larger features we're planning to build out in the future. - -## Zed GitHub Repository - -Check [our codebase out on GitHub](https://github.com/zed-industries/zed). diff --git a/docs/src/conversations.md b/docs/src/conversations.md deleted file mode 100644 index bab2fd6d5d..0000000000 --- a/docs/src/conversations.md +++ /dev/null @@ -1,21 +0,0 @@ -# Conversations - -## Zed Channels - -Our Zed channel tree is public. You can find us hanging out and writing code across various channels. The root channel, [#zed](https://zed.dev/channel/zed-283), is a great place to ask questions and get to know other Zed users. - -## Discord Channel - -[Zed Community](https://discord.gg/zed-community) is our official Discord channel. We drop in pretty regularly to answer questions and chat with the community. - -## Twitter - -We use Twitter to highlight new Zed features and to share our blog posts. Follow us [@zeddotdev](https://x.com/zeddotdev). - -## YouTube - -We have a [YouTube channel](https://www.youtube.com/@zeddotdev) where we post longer-form videos about Zed. - -## Blog - -Our [blog](https://zed.dev/blog) gets frequent updates. We post about big releases, new features, and under-the-hood Zed tech. diff --git a/docs/src/development.md b/docs/src/development.md index ecd68a1181..96993389c2 100644 --- a/docs/src/development.md +++ b/docs/src/development.md @@ -15,5 +15,5 @@ If you'd like to develop collaboration features, additionally see: - [CONTRIBUTING.md](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md) - [Releases](./development/releases.md) - [Debugging Crashes](./development/debugging-crashes.md) -- [Code of Conduct](./code-of-conduct.md) +- [Code of Conduct](https://zed.dev/code-of-conduct) - [Zed Contributor License](https://zed.dev/cla) diff --git a/docs/src/feedback-and-support.md b/docs/src/feedback-and-support.md deleted file mode 100644 index 2e4be92caa..0000000000 --- a/docs/src/feedback-and-support.md +++ /dev/null @@ -1,39 +0,0 @@ -# Feedback and Support - -## Community Support - -Our [Discord community](https://discord.gg/zed-community) is vibrant and a great place to ask questions and learn from others. Be sure to check out the `#support` channel. - -Use the [community forum](https://github.com/zed-industries/zed/discussions) to ask questions and learn from one another. We will be present in the forum and answering questions as well. - -## Frequently Asked Questions - -Our [FAQ](https://zed.dev/faq) is a great place to start for common questions about Zed. - -## Issue Tracking - -We track our issues at [`zed-industries/zed`](https://github.com/zed-industries/zed/issues). - -### Feature Requests - -Try to focus on the things that are most critical to you rather than exhaustively listing all features another editor you have used has. - -Command palette: `zed: request feature` - -### Bug Reports - -Try to add as much detail as possible, if it is not obvious to reproduce. Let us know how severe the problem is for you; is the issue more of a minor inconvenience or something that would prevent you from using Zed? - -Command palette: `zed: file bug report` - -## Feedback Channels - -In-app feedback can be submitted from within Zed via the feedback modal. - -Command palette: `feedback: give feedback` - -If you prefer to write up your thoughts as an email, you can send them to [hi@zed.dev](mailto:hi@zed.dev). - -## Merch Store - -We have a [merch store](https://zedindustries.creator-spring.com/) where you can buy Zed stickers, shirts, and more.