diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 71d4455d..22d7d66c 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -30,6 +30,6 @@ In the Lemmy community we strive to go the extra step to look out for each other And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing what it was they complained about and apologize. Even if you feel you were misinterpreted or unfairly accused, chances are good there was something you could’ve communicated better — remember that it’s your responsibility to make others comfortable. Everyone wants to get along and we are all here first and foremost because we want to talk about cool technology. You will find that people will be eager to assume good intent and forgive as long as you earn their trust. -The enforcement policies listed above apply to all official Lemmy venues; including git repositories under [github.com/LemmyNet/lemmy](https://github.com/LemmyNet/lemmy) and [yerbamate.dev/LemmyNet/lemmy](https://yerbamate.dev/LemmyNet/lemmy), the [Matrix channel](https://matrix.to/#/!BZVTUuEiNmRcbFeLeI:matrix.org?via=matrix.org&via=privacytools.io&via=permaweb.io); and all instances under lemmy.ml. For other projects adopting the Rust Code of Conduct, please contact the maintainers of those projects for enforcement. If you wish to use this code of conduct for your own project, consider explicitly mentioning your moderation policy or making a copy with your own moderation policy so as to avoid confusion. +The enforcement policies listed above apply to all official Lemmy venues; including git repositories under [github.com/LemmyNet/lemmy](https://github.com/LemmyNet/lemmy) and [yerbamate.ml/LemmyNet/lemmy](https://yerbamate.ml/LemmyNet/lemmy), the [Matrix channel](https://matrix.to/#/!BZVTUuEiNmRcbFeLeI:matrix.org?via=matrix.org&via=privacytools.io&via=permaweb.io); and all instances under lemmy.ml. For other projects adopting the Rust Code of Conduct, please contact the maintainers of those projects for enforcement. If you wish to use this code of conduct for your own project, consider explicitly mentioning your moderation policy or making a copy with your own moderation policy so as to avoid confusion. Adapted from the [Rust Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct), which is based on the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) as well as the [Contributor Covenant v1.3.0](https://www.contributor-covenant.org/version/1/3/0/). diff --git a/README.md b/README.md index e166256a..3d5fe3d2 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Build Status](https://travis-ci.org/LemmyNet/lemmy.svg?branch=main)](https://travis-ci.org/LemmyNet/lemmy) [![GitHub issues](https://img.shields.io/github/issues-raw/LemmyNet/lemmy.svg)](https://github.com/LemmyNet/lemmy/issues) [![Docker Pulls](https://img.shields.io/docker/pulls/dessalines/lemmy.svg)](https://cloud.docker.com/repository/docker/dessalines/lemmy/) -[![Translation status](http://weblate.yerbamate.dev/widgets/lemmy/-/lemmy/svg-badge.svg)](http://weblate.yerbamate.dev/engage/lemmy/) +[![Translation status](http://weblate.yerbamate.ml/widgets/lemmy/-/lemmy/svg-badge.svg)](http://weblate.yerbamate.ml/engage/lemmy/) [![License](https://img.shields.io/github/license/LemmyNet/lemmy.svg)](LICENSE) ![GitHub stars](https://img.shields.io/github/stars/LemmyNet/lemmy?style=social) @@ -140,7 +140,7 @@ Lemmy is free, open-source software, meaning no advertising, monetizing, or vent ### Translations -If you want to help with translating, take a look at [Weblate](https://weblate.yerbamate.dev/projects/lemmy/). +If you want to help with translating, take a look at [Weblate](https://weblate.yerbamate.ml/projects/lemmy/). ## Contact @@ -150,7 +150,7 @@ If you want to help with translating, take a look at [Weblate](https://weblate.y ## Code Mirrors - [GitHub](https://github.com/LemmyNet/lemmy) -- [Gitea](https://yerbamate.dev/LemmyNet/lemmy) +- [Gitea](https://yerbamate.ml/LemmyNet/lemmy) - [Codeberg](https://codeberg.org/LemmyNet/lemmy) ## Credits diff --git a/RELEASES.md b/RELEASES.md index 866ee22e..34ddd62a 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -11,7 +11,7 @@ Here are some of the bigger changes: - Created [LemmyNet](https://github.com/LemmyNet), where all lemmy-related projects live. - Split out the frontend into a separete repository, [lemmy-ui](https://github.com/LemmyNet/lemmy-ui) - Created a [lemmy-js-client](https://github.com/LemmyNet/lemmy-js-client), for any js / typescript developers. -- Split out i18n [lemmy-translations](https://github.com/LemmyNet/lemmy-translations), that any app or site developers can import and use. Lemmy currently supports [~30 languages!](https://weblate.yerbamate.dev/projects/lemmy/lemmy/) +- Split out i18n [lemmy-translations](https://github.com/LemmyNet/lemmy-translations), that any app or site developers can import and use. Lemmy currently supports [~30 languages!](https://weblate.yerbamate.ml/projects/lemmy/lemmy/) ### Lemmy Server @@ -54,7 +54,7 @@ Here are some of the bigger changes: ## Contributors -We'd also like to thank both the [NLnet foundation](https://nlnet.nl/) for their support in allowing us to work full-time on Lemmy ( as well as their support for [other important open-source projects](https://nlnet.nl/project/current.html) ), [those who sponsor us](https://dev.lemmy.ml/sponsors), and those who [help translate Lemmy](https://weblate.yerbamate.dev/projects/lemmy/). Every little bit does help. We remain committed to never allowing advertisements, monetizing, or venture-capital in Lemmy; software should be communal, and should benefit humanity, not a small group of company owners. +We'd also like to thank both the [NLnet foundation](https://nlnet.nl/) for their support in allowing us to work full-time on Lemmy ( as well as their support for [other important open-source projects](https://nlnet.nl/project/current.html) ), [those who sponsor us](https://dev.lemmy.ml/sponsors), and those who [help translate Lemmy](https://weblate.yerbamate.ml/projects/lemmy/). Every little bit does help. We remain committed to never allowing advertisements, monetizing, or venture-capital in Lemmy; software should be communal, and should benefit humanity, not a small group of company owners. ## Upgrading diff --git a/docs/src/administration_configuration.md b/docs/src/administration_configuration.md index 48e32fdd..3958a004 100644 --- a/docs/src/administration_configuration.md +++ b/docs/src/administration_configuration.md @@ -1,6 +1,6 @@ # Configuration -The configuration is based on the file [defaults.hjson](https://yerbamate.dev/LemmyNet/lemmy/src/branch/main/config/defaults.hjson). This file also contains documentation for all the available options. To override the defaults, you can copy the options you want to change into your local `config.hjson` file. +The configuration is based on the file [defaults.hjson](https://yerbamate.ml/LemmyNet/lemmy/src/branch/main/config/defaults.hjson). This file also contains documentation for all the available options. To override the defaults, you can copy the options you want to change into your local `config.hjson` file. The `defaults.hjson` and `config.hjson` files are located at `config/defaults.hjson` and`config/config.hjson`, respectively. To change these default locations, you can set these two environment variables: diff --git a/docs/src/contributing.md b/docs/src/contributing.md index e9c7b9ea..ed6c945f 100644 --- a/docs/src/contributing.md +++ b/docs/src/contributing.md @@ -5,12 +5,12 @@ Information about contributing to Lemmy, whether it is translating, testing, des ## Issue tracking / Repositories - [GitHub (for issues and pull requests)](https://github.com/LemmyNet/lemmy) -- [Gitea (only for pull requests)](https://yerbamate.dev/LemmyNet/lemmy) +- [Gitea (only for pull requests)](https://yerbamate.ml/LemmyNet/lemmy) - [Codeberg](https://codeberg.org/LemmyNet/lemmy) ## Translating -Check out [Lemmy's Weblate](https://weblate.yerbamate.dev/projects/lemmy/) for translations. +Check out [Lemmy's Weblate](https://weblate.yerbamate.ml/projects/lemmy/) for translations. ## Architecture diff --git a/docs/src/contributing_local_development.md b/docs/src/contributing_local_development.md index cf7049bd..ccf1f51e 100644 --- a/docs/src/contributing_local_development.md +++ b/docs/src/contributing_local_development.md @@ -24,7 +24,7 @@ brew install node yarn ``` git clone https://github.com/LemmyNet/lemmy.git # or alternatively from gitea -# git clone https://yerbamate.dev/LemmyNet/lemmy.git +# git clone https://yerbamate.ml/LemmyNet/lemmy.git ``` ### Build the backend (Rust) diff --git a/docs/src/lemmy_council.md b/docs/src/lemmy_council.md index d5b9c790..5de3a6c0 100644 --- a/docs/src/lemmy_council.md +++ b/docs/src/lemmy_council.md @@ -13,8 +13,8 @@ This section describes all the aspects of Lemmy where the council has decision m - Moderation and conflict resolution on: - [dev.lemmy.ml](https://dev.lemmy.ml/) - [github.com/LemmyNet/lemmy](https://github.com/LemmyNet/lemmy) - - [yerbamate.dev/LemmyNet/lemmy](https://yerbamate.dev/LemmyNet/lemmy) - - [weblate.yerbamate.dev/projects/lemmy/](https://weblate.yerbamate.dev/projects/lemmy/) + - [yerbamate.ml/LemmyNet/lemmy](https://yerbamate.ml/LemmyNet/lemmy) + - [weblate.yerbamate.ml/projects/lemmy/](https://weblate.yerbamate.ml/projects/lemmy/) - Technical administration of dev.lemmy.ml - Official Lemmy accounts - [Mastodon](https://mastodon.social/@LemmyDev)