From a54046f6bab5a7c0eb5eeb60089247563f6b6831 Mon Sep 17 00:00:00 2001
From: Dessalines <dessalines@users.noreply.github.com>
Date: Mon, 7 Jun 2021 17:10:47 -0400
Subject: [PATCH] Change join.lemmy.ml to join-lemmy.org (#1628)

---
 CONTRIBUTING.md                       |  2 +-
 README.md                             | 24 +++++++++---------
 RELEASES.md                           | 36 +++++++++++++--------------
 ansible/templates/config.hjson        |  4 +--
 config/config.hjson                   |  2 +-
 crates/apub/src/extensions/context.rs |  2 +-
 docker/lemmy.hjson                    |  2 +-
 readmes/README.es.md                  | 22 ++++++++--------
 readmes/README.ru.md                  | 24 +++++++++---------
 9 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 20f331b79..ef0ce6b46 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
 # Contributing
 
-See [here](https://join.lemmy.ml/docs/en/contributing/contributing.html) for contributing Instructions.
+See [here](https://join-lemmy.org/docs/en/contributing/contributing.html) for contributing Instructions.
 
diff --git a/README.md b/README.md
index 1090463fd..ec35ea5cb 100644
--- a/README.md
+++ b/README.md
@@ -17,17 +17,17 @@
 </p>
 
 <p align="center">
-  <a href="https://join.lemmy.ml/" rel="noopener">
+  <a href="https://join-lemmy.org/" rel="noopener">
  <img width=200px height=200px src="https://raw.githubusercontent.com/LemmyNet/lemmy-ui/main/src/assets/icons/favicon.svg"></a>
 
- <h3 align="center"><a href="https://join.lemmy.ml">Lemmy</a></h3>
+ <h3 align="center"><a href="https://join-lemmy.org">Lemmy</a></h3>
   <p align="center">
     A link aggregator / Reddit clone for the fediverse.
     <br />
     <br />
-    <a href="https://join.lemmy.ml">Join Lemmy</a>
+    <a href="https://join-lemmy.org">Join Lemmy</a>
     ·
-    <a href="https://join.lemmy.ml/docs/en/index.html">Documentation</a>
+    <a href="https://join-lemmy.org/docs/en/index.html">Documentation</a>
     ·
     <a href="https://github.com/LemmyNet/lemmy/issues">Report Bug</a>
     ·
@@ -35,7 +35,7 @@
     ·
     <a href="https://github.com/LemmyNet/lemmy/blob/main/RELEASES.md">Releases</a>
     ·
-    <a href="https://join.lemmy.ml/docs/en/code_of_conduct.html">Code of Conduct</a>
+    <a href="https://join-lemmy.org/docs/en/code_of_conduct.html">Code of Conduct</a>
   </p>
 </p>
 
@@ -74,7 +74,7 @@ Each Lemmy server can set its own moderation policy; appointing site-wide admins
 
 - Open source, [AGPL License](/LICENSE).
 - Self hostable, easy to deploy.
-  - Comes with [Docker](https://join.lemmy.ml/docs/en/administration/install_docker.html) and [Ansible](https://join.lemmy.ml/docs/en/administration/install_ansible.html).
+  - Comes with [Docker](https://join-lemmy.org/docs/en/administration/install_docker.html) and [Ansible](https://join-lemmy.org/docs/en/administration/install_ansible.html).
 - Clean, mobile-friendly interface.
   - Only a minimum of a username and password is required to sign up!
   - User avatar support.
@@ -109,8 +109,8 @@ Each Lemmy server can set its own moderation policy; appointing site-wide admins
 
 ## Installation
 
-- [Docker](https://join.lemmy.ml/docs/en/administration/install_docker.html)
-- [Ansible](https://join.lemmy.ml/docs/en/administration/install_ansible.html)
+- [Docker](https://join-lemmy.org/docs/en/administration/install_docker.html)
+- [Ansible](https://join-lemmy.org/docs/en/administration/install_ansible.html)
 
 ## Lemmy Projects
 
@@ -133,7 +133,7 @@ Lemmy is free, open-source software, meaning no advertising, monetizing, or vent
 - [Support on Liberapay](https://liberapay.com/Lemmy).
 - [Support on Patreon](https://www.patreon.com/dessalines).
 - [Support on OpenCollective](https://opencollective.com/lemmy).
-- [List of Sponsors](https://join.lemmy.ml/sponsors).
+- [List of Sponsors](https://join-lemmy.org/sponsors).
 
 ### Crypto
 
@@ -143,9 +143,9 @@ Lemmy is free, open-source software, meaning no advertising, monetizing, or vent
 
 ## Contributing
 
-- [Contributing instructions](https://join.lemmy.ml/docs/en/contributing/contributing.html)
-- [Docker Development](https://join.lemmy.ml/docs/en/contributing/docker_development.html)
-- [Local Development](https://join.lemmy.ml/docs/en/contributing/local_development.html)
+- [Contributing instructions](https://join-lemmy.org/docs/en/contributing/contributing.html)
+- [Docker Development](https://join-lemmy.org/docs/en/contributing/docker_development.html)
+- [Local Development](https://join-lemmy.org/docs/en/contributing/local_development.html)
 
 ### Translations
 
diff --git a/RELEASES.md b/RELEASES.md
index 209edf2ec..978898752 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -8,7 +8,7 @@ Since our last release this month, we've had [~60](https://github.com/LemmyNet/l
 
 #### Major Changes
 
-- Add option to disable strict allowlist ( [#1486](https://github.com/LemmyNet/lemmy/issues/1486)) [documentation](https://join.lemmy.ml/docs/en/federation/administration.html) 
+- Add option to disable strict allowlist ( [#1486](https://github.com/LemmyNet/lemmy/issues/1486)) [documentation](https://join-lemmy.org/docs/en/federation/administration.html) 
 - Add option to limit community creation to admins only ([#1587](https://github.com/LemmyNet/lemmy/issues/1587))
 - Many search improvements:
   - Don't search for communities or users when the id is included.
@@ -54,12 +54,12 @@ Since our last release this month, we've had [~60](https://github.com/LemmyNet/l
 
 ### Servers
 
-If you'd like to make a DB backup before upgrading, follow [this guide](https://join.lemmy.ml/docs/en/administration/backup_and_restore.html).
+If you'd like to make a DB backup before upgrading, follow [this guide](https://join-lemmy.org/docs/en/administration/backup_and_restore.html).
 
 To upgrade your instance to `v0.10.0`, simply follow the instructions in the documentation:
 
-- [Upgrade with manual Docker installation](https://join.lemmy.ml/docs/en/administration/install_docker.html#updating)
-- [Upgrade with Ansible installation](https://join.lemmy.ml/docs/en/administration/install_ansible.html)
+- [Upgrade with manual Docker installation](https://join-lemmy.org/docs/en/administration/install_docker.html#updating)
+- [Upgrade with Ansible installation](https://join-lemmy.org/docs/en/administration/install_ansible.html)
 
 ### Clients / Apps
 
@@ -80,7 +80,7 @@ To upgrade your instance to `v0.10.0`, simply follow the instructions in the doc
 
 ## Changes
 
-Since our last release in February, we've had [~150](https://github.com/LemmyNet/lemmy/compare/0.9.9...main) commits to Lemmy. The biggest changes, as we'll outline below, are a split of Lemmy's user tables into federated and local tables, necessitating a `v3` of Lemmy's API, federated moderation, i18n support in join.lemmy.ml, and lots of back-end cleanup.
+Since our last release in February, we've had [~150](https://github.com/LemmyNet/lemmy/compare/0.9.9...main) commits to Lemmy. The biggest changes, as we'll outline below, are a split of Lemmy's user tables into federated and local tables, necessitating a `v3` of Lemmy's API, federated moderation, i18n support in join-lemmy.org, and lots of back-end cleanup.
 
 ### Lemmy Server
 
@@ -119,9 +119,9 @@ Since our last release in February, we've had [~150](https://github.com/LemmyNet
 
 ### Lemmy Docs
 
-- Gazconroy built an [Async API spec for Lemmy](https://join.lemmy.ml/api/index.html), that now serves as our main API docs.
+- Gazconroy built an [Async API spec for Lemmy](https://join-lemmy.org/api/index.html), that now serves as our main API docs.
 
-### join.lemmy.ml
+### join-lemmy.org
 
 - Rewrote in inferno isomorphic, added i18n support via [weblate](https://weblate.yerbamate.ml/projects/lemmy/joinlemmy/).
 - Added a section on the support page thanking contributors.
@@ -137,12 +137,12 @@ Since our last release in February, we've had [~150](https://github.com/LemmyNet
     - now: `allowed_instances: ["ds9.lemmy.ml", "enterprise.lemmy.ml"]` , and only one of the `allowed_instances` or `blocked_instances` blocks can be set.
 - The API has been upgraded from `v2` to `v3`, so all clients need to be updated: [lemmy-js-client: 0.9.9 -> 0.10.0](https://github.com/LemmyNet/lemmy-js-client/compare/0.9.9...0.10.0-rc.13) .
 
-If you'd like to make a DB backup before upgrading, follow [this guide](https://join.lemmy.ml/docs/en/administration/backup_and_restore.html).
+If you'd like to make a DB backup before upgrading, follow [this guide](https://join-lemmy.org/docs/en/administration/backup_and_restore.html).
 
 To upgrade your instance to `v0.10.0`, simply follow the instructions in the documentation:
 
-- [Upgrade with manual Docker installation](https://join.lemmy.ml/docs/en/administration/install_docker.html#updating)
-- [Upgrade with Ansible installation](https://join.lemmy.ml/docs/en/administration/install_ansible.html)
+- [Upgrade with manual Docker installation](https://join-lemmy.org/docs/en/administration/install_docker.html#updating)
+- [Upgrade with Ansible installation](https://join-lemmy.org/docs/en/administration/install_ansible.html)
 
 
 ## Compilation time
@@ -201,7 +201,7 @@ On the other hand, some crates have gotten much slower to compile, in particular
 
 - Fixed inbox_urls not being correctly set, which broke federation in `v0.9.5`. Added some logging to catch these.
 - Fixing community search not using auth.
-- Moved docs to https://join.lemmy.ml
+- Moved docs to https://join-lemmy.org
 - Fixed an issue w/ lemmy-ui with forms being cleared out.
 
 # Lemmy v0.9.4 Pre-Release (2021-02-02)
@@ -282,10 +282,10 @@ None of these are breaking changes, so federation between 0.9.0 and 0.8.11 will
 
 ## Upgrading
 
-If you'd like to make a DB backup before upgrading, follow [this guide](https://join.lemmy.ml/docs/en/administration/backup_and_restore.html).
+If you'd like to make a DB backup before upgrading, follow [this guide](https://join-lemmy.org/docs/en/administration/backup_and_restore.html).
 
-- [Upgrade with manual Docker installation](https://join.lemmy.ml/docs/en/administration/install_docker.html#updating)
-- [Upgrade with Ansible installation](https://join.lemmy.ml/docs/en/administration/install_ansible.html)
+- [Upgrade with manual Docker installation](https://join-lemmy.org/docs/en/administration/install_docker.html#updating)
+- [Upgrade with Ansible installation](https://join-lemmy.org/docs/en/administration/install_ansible.html)
 
 # Lemmy v0.8.0 Release (2020-10-16)
 
@@ -309,7 +309,7 @@ Here are some of the bigger changes:
 - The first **federation public beta release**, woohoo :fireworks: 
 - All Lemmy functionality now works over ActivityPub (except turning remote users into mods/admins)
 - Instance allowlist and blocklist
-- Documentation for [admins](https://join.lemmy.ml/docs/administration_federation.html) and [devs](https://join.lemmy.ml/docs/contributing_federation_overview.html) on how federation works
+- Documentation for [admins](https://join-lemmy.org/docs/administration_federation.html) and [devs](https://join-lemmy.org/docs/contributing_federation_overview.html) on how federation works
 - Upgraded to newest versions of @asonix activitypub libraries
 - Full local federation setup for manual testing
 - Automated testing for nearly every federation action
@@ -347,8 +347,8 @@ We'd also like to thank both the [NLnet foundation](https://nlnet.nl/) for their
 
 ## Upgrading
 
-- [with manual Docker installation](https://join.lemmy.ml/docs/administration_install_docker.html#updating)
-- [with Ansible installation](https://join.lemmy.ml/docs/administration_install_ansible.html)
+- [with manual Docker installation](https://join-lemmy.org/docs/administration_install_docker.html#updating)
+- [with Ansible installation](https://join-lemmy.org/docs/administration_install_ansible.html)
 
 ## Testing Federation
 
@@ -436,7 +436,7 @@ Overall, since our last major release in January (v0.6.0), we have closed over
 
 Before starting the upgrade, make sure that you have a working backup of your
 database and image files. See our
-[documentation](https://join.lemmy.ml/docs/administration_backup_and_restore.html)
+[documentation](https://join-lemmy.org/docs/administration_backup_and_restore.html)
 for backup instructions.
 
 **With Ansible:**
diff --git a/ansible/templates/config.hjson b/ansible/templates/config.hjson
index 51d25e77f..7e5474e68 100644
--- a/ansible/templates/config.hjson
+++ b/ansible/templates/config.hjson
@@ -1,6 +1,6 @@
 {
   # for more info about the config, check out the documentation
-  # https://join.lemmy.ml/docs/en/administration/configuration.html
+  # https://join-lemmy.org/docs/en/administration/configuration.html
 
   # settings related to the postgresql database
   database: {
@@ -33,7 +33,7 @@
     # whether to enable activitypub federation. 
     enabled: false
     # Allows and blocks are described here:
-    # https://join.lemmy.ml/docs/en/federation/administration.html#instance-allowlist-and-blocklist
+    # https://join-lemmy.org/docs/en/federation/administration.html#instance-allowlist-and-blocklist
     #
     # comma separated list of instances with which federation is allowed
     # Only one of these blocks should be uncommented
diff --git a/config/config.hjson b/config/config.hjson
index 3054b7cb2..461efa0d3 100644
--- a/config/config.hjson
+++ b/config/config.hjson
@@ -63,7 +63,7 @@
     # whether to enable activitypub federation.
     enabled: false
     # Allows and blocks are described here:
-    # https://join.lemmy.ml/docs/en/federation/administration.html#instance-allowlist-and-blocklist
+    # https://join-lemmy.org/docs/en/federation/administration.html#instance-allowlist-and-blocklist
     #
     # list of instances with which federation is allowed
     # allowed_instances: ["instance1.tld","instance2.tld"]
diff --git a/crates/apub/src/extensions/context.rs b/crates/apub/src/extensions/context.rs
index 63ae2c6d0..08491dcbf 100644
--- a/crates/apub/src/extensions/context.rs
+++ b/crates/apub/src/extensions/context.rs
@@ -9,7 +9,7 @@ pub fn lemmy_context() -> Result<Vec<AnyBase>, LemmyError> {
     "sc": "http://schema.org#",
     "sensitive": "as:sensitive",
     "stickied": "as:stickied",
-    "pt": "https://join.lemmy.ml#",
+    "pt": "https://join-lemmy.org#",
     "comments_enabled": {
       "type": "sc:Boolean",
       "id": "pt:commentsEnabled"
diff --git a/docker/lemmy.hjson b/docker/lemmy.hjson
index bceb5f6cd..8f117e30e 100644
--- a/docker/lemmy.hjson
+++ b/docker/lemmy.hjson
@@ -1,6 +1,6 @@
 {
   # for more info about the config, check out the documentation
-  # https://join.lemmy.ml/docs/en/administration/configuration.html
+  # https://join-lemmy.org/docs/en/administration/configuration.html
 
   setup: {
     # username for the admin user
diff --git a/readmes/README.es.md b/readmes/README.es.md
index 329deb1cc..1076803c4 100644
--- a/readmes/README.es.md
+++ b/readmes/README.es.md
@@ -17,17 +17,17 @@
 </p>
 
 <p align="center">
-  <a href="https://join.lemmy.ml/" rel="noopener">
+  <a href="https://join-lemmy.org/" rel="noopener">
  <img width=200px height=200px src="https://raw.githubusercontent.com/LemmyNet/lemmy-ui/main/src/assets/icons/favicon.svg"></a>
 
- <h3 align="center"><a href="https://join.lemmy.ml">Lemmy</a></h3>
+ <h3 align="center"><a href="https://join-lemmy.org">Lemmy</a></h3>
   <p align="center">
     Un agregador de enlaces / alternativa a Menéame - Reddit para el fediverso. 
     <br />
     <br />
-    <a href="https://join.lemmy.ml">Unirse a Lemmy</a>
+    <a href="https://join-lemmy.org">Unirse a Lemmy</a>
     ·
-    <a href="https://join.lemmy.ml/docs/es/index.html">Documentación</a>
+    <a href="https://join-lemmy.org/docs/es/index.html">Documentación</a>
     ·
     <a href="https://github.com/LemmyNet/lemmy/issues">Reportar Errores (bugs)</a>
     ·
@@ -35,7 +35,7 @@
     ·
     <a href="https://github.com/LemmyNet/lemmy/blob/main/RELEASES.md">Lanzamientos</a>
     ·
-    <a href="https://join.lemmy.ml/docs/es/code_of_conduct.html">Código de Conducta</a>
+    <a href="https://join-lemmy.org/docs/es/code_of_conduct.html">Código de Conducta</a>
   </p>
 </p>
 
@@ -111,8 +111,8 @@ Cada servidor lemmy puede establecer su propia política de moderación; nombran
 
 ## Instalación
 
-- [Docker](https://join.lemmy.ml/docs/es/administration/install_docker.html)
-- [Ansible](https://join.lemmy.ml/docs/es/administration/install_ansible.html)
+- [Docker](https://join-lemmy.org/docs/es/administration/install_docker.html)
+- [Ansible](https://join-lemmy.org/docs/es/administration/install_ansible.html)
 
 ## Proyectos de Lemmy
 
@@ -135,7 +135,7 @@ Lemmy es un software libre y de código abierto, lo que significa que no hay pub
 - [Apoya en Liberapay](https://liberapay.com/Lemmy).
 - [Apoya en Patreon](https://www.patreon.com/dessalines).
 - [Apoya en OpenCollective](https://opencollective.com/lemmy).
-- [Lista de patrocinadores](https://join.lemmy.ml/sponsors).
+- [Lista de patrocinadores](https://join-lemmy.org/sponsors).
 
 ### Crypto
 
@@ -145,9 +145,9 @@ Lemmy es un software libre y de código abierto, lo que significa que no hay pub
 
 ## Contribuir
 
-- [Instrucciones para contribuir](https://join.lemmy.ml/docs/es/contributing/contributing.html)
-- [Desarrollo por Docker](https://join.lemmy.ml/docs/es/contributing/docker_development.html)
-- [Desarrollo Local](https://join.lemmy.ml/docs/es/contributing/local_development.html)
+- [Instrucciones para contribuir](https://join-lemmy.org/docs/es/contributing/contributing.html)
+- [Desarrollo por Docker](https://join-lemmy.org/docs/es/contributing/docker_development.html)
+- [Desarrollo Local](https://join-lemmy.org/docs/es/contributing/local_development.html)
 
 ### Traducciones
 
diff --git a/readmes/README.ru.md b/readmes/README.ru.md
index 0ef3d9e75..c7cc90cfb 100644
--- a/readmes/README.ru.md
+++ b/readmes/README.ru.md
@@ -17,17 +17,17 @@
 </p>
 
 <p align="center">
-  <a href="https://join.lemmy.ml/" rel="noopener">
+  <a href="https://join-lemmy.org/" rel="noopener">
  <img width=200px height=200px src="https://raw.githubusercontent.com/LemmyNet/lemmy-ui/main/src/assets/icons/favicon.svg"></a>
 
- <h3 align="center"><a href="https://join.lemmy.ml">Lemmy</a></h3>
+ <h3 align="center"><a href="https://join-lemmy.org">Lemmy</a></h3>
   <p align="center">
     Агрегатор ссылок / Клон Reddit для федиверс.
     <br />
     <br />
-    <a href="https://join.lemmy.ml">Присоединяйтесь к Lemmy</a>
+    <a href="https://join-lemmy.org">Присоединяйтесь к Lemmy</a>
     ·
-    <a href="https://join.lemmy.ml/docs/en/index.html">Документация</a>
+    <a href="https://join-lemmy.org/docs/en/index.html">Документация</a>
     ·
     <a href="https://github.com/LemmyNet/lemmy/issues">Сообщить об Ошибке</a>
     ·
@@ -35,7 +35,7 @@
     ·
     <a href="https://github.com/LemmyNet/lemmy/blob/main/RELEASES.md">Релизы</a>
     ·
-    <a href="https://join.lemmy.ml/docs/en/code_of_conduct.html">Нормы поведения</a>
+    <a href="https://join-lemmy.org/docs/en/code_of_conduct.html">Нормы поведения</a>
   </p>
 </p>
 
@@ -74,7 +74,7 @@
 
 - Открытое программное обеспечение, [Лицензия AGPL](/LICENSE).
 - Возможность самостоятельного размещения, простота развёртывания.
-  - Работает на [Docker](https://join.lemmy.ml/docs/en/administration/install_docker.html) и [Ansible](https://join.lemmy.ml/docs/en/administration/install_ansible.html).
+  - Работает на [Docker](https://join-lemmy.org/docs/en/administration/install_docker.html) и [Ansible](https://join-lemmy.org/docs/en/administration/install_ansible.html).
 - Понятый и удобный интерфейс для мобильных устройств.
   - Для регистрации требуется минимум: имя пользователя и пароль!
   - Поддержка аватара пользователя.
@@ -109,8 +109,8 @@
 
 ## Установка
 
-- [Docker](https://join.lemmy.ml/docs/en/administration/install_docker.html)
-- [Ansible](https://join.lemmy.ml/docs/en/administration/install_ansible.html)
+- [Docker](https://join-lemmy.org/docs/en/administration/install_docker.html)
+- [Ansible](https://join-lemmy.org/docs/en/administration/install_ansible.html)
 
 ## Проекты Lemmy
 
@@ -133,7 +133,7 @@ Lemmy - бесплатное программное обеспечение с о
 - [Поддержать на Liberapay](https://liberapay.com/Lemmy).
 - [Поддержать на Patreon](https://www.patreon.com/dessalines).
 - [Поддержать на OpenCollective](https://opencollective.com/lemmy).
-- [Список Спонсоров](https://join.lemmy.ml/sponsors).
+- [Список Спонсоров](https://join-lemmy.org/sponsors).
 
 ### Криптовалюты
 
@@ -143,9 +143,9 @@ Lemmy - бесплатное программное обеспечение с о
 
 ## Вклад
 
-- [Инструкции по внесению вклада](https://join.lemmy.ml/docs/en/contributing/contributing.html)
-- [Docker разработка](https://join.lemmy.ml/docs/en/contributing/docker_development.html)
-- [Локальное развитие](https://join.lemmy.ml/docs/en/contributing/local_development.html)
+- [Инструкции по внесению вклада](https://join-lemmy.org/docs/en/contributing/contributing.html)
+- [Docker разработка](https://join-lemmy.org/docs/en/contributing/docker_development.html)
+- [Локальное развитие](https://join-lemmy.org/docs/en/contributing/local_development.html)
 
 ### Переводы