From fb6bdd120787508723d7baaa1b2262cac6252053 Mon Sep 17 00:00:00 2001 From: Fredrik Bergelin Date: Thu, 14 Nov 2024 09:30:39 +0100 Subject: [PATCH] Revert back to absolute URLs --- src/backend/templates/views/markdown/cg.md | 2 +- .../templates/views/markdown/privacy-fr.md | 4 ++-- .../templates/views/markdown/privacy-ru.md | 2 +- .../templates/views/markdown/privacy.md | 2 +- src/backend/templates/views/markdown/rules.md | 18 +++++++++--------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/backend/templates/views/markdown/cg.md b/src/backend/templates/views/markdown/cg.md index 47999950..58214552 100644 --- a/src/backend/templates/views/markdown/cg.md +++ b/src/backend/templates/views/markdown/cg.md @@ -9,7 +9,7 @@ We expect these guidelines to be honored by everyone who contributes to the FAFo These guidelines are not exhaustive or complete. They serve to distill our common understanding of a collaborative, shared environment and goals. We expect them to be followed in spirit as much as in the letter, so that they can enrich all of us and the technical communities in which we participate. They may be supplemented by further rules specifying desired and undesired behaviour in certain areas. -The [Rules of the FAForever community](/rules) also apply to contributors. +The [Rules of the FAForever community](https://www.faforever.com/rules) also apply to contributors. ## Specific Guidelines diff --git a/src/backend/templates/views/markdown/privacy-fr.md b/src/backend/templates/views/markdown/privacy-fr.md index 554e9ba2..b3282a8b 100644 --- a/src/backend/templates/views/markdown/privacy-fr.md +++ b/src/backend/templates/views/markdown/privacy-fr.md @@ -37,7 +37,7 @@ Lorsque vous créez un nouveau compte, vous donnez votre accord pour la collecti Sous la RGPD, nous sommes obligés de vous informer à propos des implications légales de notre traitement de vos Informations utilisateur personnelles -Lorsque vous créez un compte, nous requerrons votre nom d'utilisateur et adresse courriel afin d'accepter les [Conditions d'Utilisation](/tos), et nous utilisons ces données comme base de ce contrat. Nous traitons également avec votre adresse courriel et non d'utilisateur pour d'autres implications légales. +Lorsque vous créez un compte, nous requerrons votre nom d'utilisateur et adresse courriel afin d'accepter les [Conditions d'Utilisation](https://www.faforever.com/tos), et nous utilisons ces données comme base de ce contrat. Nous traitons également avec votre adresse courriel et non d'utilisateur pour d'autres implications légales. Le reste du traitement des informations que nous effectuons est nécessaire dans le cadre de nos intérêts légitimes. Par exemple, pour des raisons de sécurité, nous devons conserver des traces des informations matérielles uniques de votre machine afin d'identifier des utilisateurs frauduleux tentant de masquer leur identité. @@ -72,4 +72,4 @@ Cette déclaration de confidentialité est sous la license [Creative Commons Zer ## Note Ce document a été traduit de l'anglais. En cas de litige, seul le document original fait foi. -Vous pouvez trouver le document dans sa version originale à l'adresse suivante [ici](/privacy). +Vous pouvez trouver le document dans sa version originale à l'adresse suivante [ici](https://www.faforever.com/privacy). diff --git a/src/backend/templates/views/markdown/privacy-ru.md b/src/backend/templates/views/markdown/privacy-ru.md index 42bd2729..6ef6f484 100644 --- a/src/backend/templates/views/markdown/privacy-ru.md +++ b/src/backend/templates/views/markdown/privacy-ru.md @@ -35,7 +35,7 @@ _Данный перевод не имеет юридической силы, в В соответствии с GDPR мы обязаны оповещать Вас о правовой базе, на которой мы обрабатываем Персональную Информацию Пользователя. -Когда Вы создаёте аккаунт, мы требуем, чтобы Ваше имя пользователя и email адрес вошли в соглашение [Условия обслуживания](/tos) с нами, и мы используем указанные данные как основу для этого контакта. Мы также обрабатываем Ваш email адрес и имя пользователя на других юридических основаниях. +Когда Вы создаёте аккаунт, мы требуем, чтобы Ваше имя пользователя и email адрес вошли в соглашение [Условия обслуживания](https://www.faforever.com/tos) с нами, и мы используем указанные данные как основу для этого контакта. Мы также обрабатываем Ваш email адрес и имя пользователя на других юридических основаниях. Оставшаяся часть проводимой нами обработки информации необходима для наших законных интересов. Например, в целях безопасности мы сохраняем уникальные для Вашей машины логи аппаратуры для того чтобы идентифицировать злонамеренных пользователей, пытающихся подменить свою личность. Если Вы захотите удалить Ваши данные, пожалуйста напишите нам по адресу [admin@faforever.com](mailto:admin@faforever.com). diff --git a/src/backend/templates/views/markdown/privacy.md b/src/backend/templates/views/markdown/privacy.md index 9dd4850e..ed547603 100644 --- a/src/backend/templates/views/markdown/privacy.md +++ b/src/backend/templates/views/markdown/privacy.md @@ -43,7 +43,7 @@ When you create a new account, you agree to our collection of this User Personal Under the GDPR, we’re required to notify you about the legal basis on which we process User Personal Information. -When you create an account, we require your user name and email address to enter into the [Terms of Service](/tos) agreement with us, and we use this data as the basis of that contract. We also process your email address and user name on other legal bases. +When you create an account, we require your user name and email address to enter into the [Terms of Service](https://www.faforever.com/tos) agreement with us, and we use this data as the basis of that contract. We also process your email address and user name on other legal bases. The remainder of information processing we do is necessary for the purposes of our legitimate interests. For example, for security purposes, we keep logs of hardware information unique to your machine, in order to identify malicious users trying to spoof their identify. If you would like to request erasure of your data, please email us at [admin@faforever.com](mailto:admin@faforever.com). diff --git a/src/backend/templates/views/markdown/rules.md b/src/backend/templates/views/markdown/rules.md index 1c9d3d8d..0e9147e4 100644 --- a/src/backend/templates/views/markdown/rules.md +++ b/src/backend/templates/views/markdown/rules.md @@ -2,7 +2,7 @@ Welcome to the Forged Alliance Forever community\! By joining this community, you help keep our favorite RTS active more than a decade after it launched. Please take a moment to review the following rules and guidelines to make sure that being part of our community remains a pleasant experience for everyone. -By accessing FAF services, you agree to the rules outlined here. This Code of Conduct is supplemental to the FAF [Terms of Service](/tos). +By accessing FAF services, you agree to the rules outlined here. This Code of Conduct is supplemental to the FAF [Terms of Service](https://www.faforever.com/tos).
@@ -12,7 +12,7 @@ By accessing FAF services, you agree to the rules outlined here. This Code of Co ## **The Moderation Team** -The moderation team actively moderates the FAF environment. This includes the game itself, as well as all official FAF channels of communication, such as the FAF client, the FAF forums, and official FAF Discord. Users who do not follow the rules listed in this page may receive penalties limiting their access to FAF services. The moderation team judges rule violations and decides on appropriate penalties. However, moderation decisions may be challenged through the appeal system. More information on report processing, ban reasons, appeals, and FAQs can be found on the [FAF Moderation page](/moderation#page-not-created-yet). +The moderation team actively moderates the FAF environment. This includes the game itself, as well as all official FAF channels of communication, such as the FAF client, the FAF forums, and official FAF Discord. Users who do not follow the rules listed in this page may receive penalties limiting their access to FAF services. The moderation team judges rule violations and decides on appropriate penalties. However, moderation decisions may be challenged through the appeal system. More information on report processing, ban reasons, appeals, and FAQs can be found on the [FAF Moderation page](https://www.faforever.com/moderation#page-not-created-yet). ## **Reporting Code of Conduct violations** @@ -22,12 +22,12 @@ We encourage reporting disrespectful or unfair behavior. However, we expect you ## **Contents** -- [Common rules summarized](#commonrulessummarized) -- [Section 1: General rules and responsibilities](#section1generalrulesandresponsibilities) -- [Section 2: In-Game conduct](#section2ingameconduct) -- [Section 3: Communication](#section3communication) -- [Section 4: Account Management](#section4accountmanagement) -- [Section 5: FAF content development (Mods and Maps)](#section5fafcontentdevelopmentmodsandmaps) +- [Common rules summarized](https://www.faforever.com/rules#commonrulessummarized) +- [Section 1: General rules and responsibilities](https://www.faforever.com/rules#section1generalrulesandresponsibilities) +- [Section 2: In-Game conduct](https://www.faforever.com/rules#section2ingameconduct) +- [Section 3: Communication](https://www.faforever.com/rules#section3communication) +- [Section 4: Account Management](https://www.faforever.com/rules#section4accountmanagement) +- [Section 5: FAF content development (Mods and Maps)](https://www.faforever.com/rules#section5fafcontentdevelopmentmodsandmaps) ## **Common rules summarized** @@ -47,7 +47,7 @@ FAF as a community cannot work without respect, fairness, and accountability. By ### **FAF regulations** -- **ToS** — By using FAF services, you agree to the [Terms of Service](/tos) and are responsible for your actions, behavior, and communications. +- **ToS** — By using FAF services, you agree to the [Terms of Service](https://www.faforever.com/tos) and are responsible for your actions, behavior, and communications. - **Moderation actions** — FAF reserves the right to take action on posts or accounts without prior warning, including deleting, locking, or moving forum posts. The Moderation team has the full authority to determine rule violations and apply appropriate sanctions. ### **General rules**