From af361749eeac9f14d3db4fa974b0bf439bf2d14c Mon Sep 17 00:00:00 2001
From: Bady <bady@disroot.org>
Date: Sat, 10 Oct 2020 17:07:22 +0530
Subject: [PATCH] Update email format to prevent spams
---
content/welcome-mentors.md | 2 +-
content/welcome.md | 4 ++--
website/content/coc.md | 8 ++++----
website/content/welcome-mentor.md | 2 +-
website/content/welcome-mentors.md | 2 +-
website/content/welcome.md | 4 ++--
website/layouts/_default/baseof.html | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/content/welcome-mentors.md b/content/welcome-mentors.md
index 9af0c7d..5e7fb7d 100644
--- a/content/welcome-mentors.md
+++ b/content/welcome-mentors.md
@@ -14,7 +14,7 @@ We have received your application to join Free Software Camp 2020 organized by F
2) Add your project ideas to this [wiki page](https://git.fosscommunity.in/fsfi/camp/-/wikis/ideas-list) (contact us with your git.fosscommunity.in username for getting access to edit the wiki page)
3) Consider subscribing to our low volume announcement [mailing list](https://lists.fsci.in/postorius/lists/camp-announce.mm.gnu.org.in/) or following us on [mastodon/fediverse](https://social.masto.host/@fscamp) for updates regarding the camp and join in the conversation on [matrix](https://matrix.to/#/#fscamp:poddery.com) using any of the matrix powered apps like Element. If new to using matrix, you can sign up for accounts by following instructions at [chat.feneas.org](https://chat.feneas.org), [chat.tchncs.de](https://chat.tchncs.de) or [chat.privacytools.io](https://chat.privacytools.io), instead of using matrix.org which will help to reduce their server load.
-You can reach out to us on camp@mm.gnu.org.in for any queries or concerns.
+You can reach out to us on camp at mm.gnu.org.in for any queries or concerns.
Regards,
diff --git a/content/welcome.md b/content/welcome.md
index c5878c3..b30f02f 100644
--- a/content/welcome.md
+++ b/content/welcome.md
@@ -13,7 +13,7 @@ We have received your application to join Free Software Camp 2020 organized by F
1. Make sure you have read the [code of conduct](https://camp.fsf.org.in/coc.html).
2. Make sure you take the learners' [survey](https://ee.kobotoolbox.org/single/nxw4UE3B) that indicates to us your preferred language for sessions.
3. Consider subscribing to our low volume announcement [mailing list](https://lists.fsci.in/postorius/lists/camp-announce.mm.gnu.org.in/) or following us on [mastodon/fediverse](https://social.masto.host/@fscamp) for updates regarding the camp and join in the conversation on [matrix](https://matrix.to/#/#fscamp:poddery.com) using any of the matrix powered apps like Element.
-4. If your age is below 15, please contact us at [camp@mm.gnu.org.in](mailto:camp@mm.gnu.org.in)
+4. If your age is below 15, please contact us at camp at mm.gnu.org.in
If you are new to these terms, here is an explanation:
@@ -31,7 +31,7 @@ Mastodon is a Free Software to create a social media service similar to Twitter
Matrix is a communication protocol for sharing instant messages, photos, files and audio/video calls. Element is most feature-complete app for Matrix protocol and is available on smart phones and laptop/desktop. Matrix has a similar decentralized architecture to mastodon, where different people and organizations provide an interoperable network of home servers (similar to an instance of mastodon). If you are new to using matrix, you can sign up for accounts by following instructions at [https://chat.feneas.org](https://chat.feneas.org), [https://chat.tchncs.de](https://chat.tchncs.de) or [https://chat.privacytools.io](https://chat.privacytools.io), instead of using matrix.org which will help to reduce their server load.
-You can reach out to us by mailing to [camp@mm.gnu.org.in](mailto:camp@mm.gnu.org.in) for any queries or concerns.
+You can reach out to us by mailing to camp at mm.gnu.org.in for any queries or concerns.
\
\
diff --git a/website/content/coc.md b/website/content/coc.md
index b918eac..3dda0ca 100644
--- a/website/content/coc.md
+++ b/website/content/coc.md
@@ -35,13 +35,13 @@ Respect yourself, and respect others. Be courteous to those around you. If someo
By default, all material presented in the camp should be suitable for people aged 12 and above.
-If you could reasonably assume that some people may be offended by your talk or presentation, please state so explicitly to the Editorial Team. In case you are unsure if this applies to you, please contact the Editorial Team at [camp@mm.gnu.org.in](mailto:camp@mm.gnu.org.in). Please note that you are solely responsible if anything is deemed inappropriate and you did not contact the Editorial Team beforehand.
+If you could reasonably assume that some people may be offended by your talk or presentation, please state so explicitly to the Editorial Team. In case you are unsure if this applies to you, please contact the Editorial Team at camp at mm.gnu.org.in. Please note that you are solely responsible if anything is deemed inappropriate and you did not contact the Editorial Team beforehand.
## Be aware
We ask everyone to be aware that we will not tolerate intimidation, harassment, or any abusive, discriminatory or derogatory behavior by anyone at any FSCI program or in related media.
-Complaints can be made to the organizers by emailing [camp-coc@mm.gnu.org.in](mailto:camp-coc@mm.gnu.org.in). All complaints made to camp organizers will remain confidential and be taken seriously. The complaint will be treated appropriately and with discretion. Should camp organizers or moderators consider it appropriate, measures they may take can include:
+Complaints can be made to the organizers by emailing camp-coc at mm.gnu.org.in. All complaints made to camp organizers will remain confidential and be taken seriously. The complaint will be treated appropriately and with discretion. Should camp organizers or moderators consider it appropriate, measures they may take can include:
* The individuals may be told to apologize
* The individuals may be told to stop/modify their behavior appropriately
@@ -70,9 +70,9 @@ We want everyone to have a good time in our program.
## Questions?
-If you’re not sure about anything in this camp Code of Conduct, please contact the Free Software Camp organizers at [camp@mm.gnu.org.in](mailto:camp@mm.gnu.org.in)
+If you’re not sure about anything in this camp Code of Conduct, please contact the Free Software Camp organizers at camp at mm.gnu.org.in
-If you wish to report a violation of this Code of Conduct, please contact [camp-coc@mm.gnu.org.in](mailto:camp-coc@mm.gnu.org.in)
+If you wish to report a violation of this Code of Conduct, please contact camp-coc at mm.gnu.org.in
## Our Promise to You
diff --git a/website/content/welcome-mentor.md b/website/content/welcome-mentor.md
index da360af..664bf5e 100644
--- a/website/content/welcome-mentor.md
+++ b/website/content/welcome-mentor.md
@@ -18,7 +18,7 @@ We have received your application to join Free Software Camp 2020 organized by F
3. Consider subscribing to our low volume announcement mailing list or following us on mastodon/fediverse for updates regarding the camp and join in the conversation on matrix using any of the matrix powered apps like Element. If new to using matrix, you can sign up for accounts by following instructions at chat.feneas.org, chat.tchncs.de or chat.privacytools.io, instead of using matrix.org which will help to reduce their server load.
-You can reach out to us on camp@mm.gnu.org.in for any queries or concerns.
+You can reach out to us on camp at mm.gnu.org.in for any queries or concerns.
\
diff --git a/website/content/welcome-mentors.md b/website/content/welcome-mentors.md
index 9af0c7d..5e7fb7d 100644
--- a/website/content/welcome-mentors.md
+++ b/website/content/welcome-mentors.md
@@ -14,7 +14,7 @@ We have received your application to join Free Software Camp 2020 organized by F
2) Add your project ideas to this [wiki page](https://git.fosscommunity.in/fsfi/camp/-/wikis/ideas-list) (contact us with your git.fosscommunity.in username for getting access to edit the wiki page)
3) Consider subscribing to our low volume announcement [mailing list](https://lists.fsci.in/postorius/lists/camp-announce.mm.gnu.org.in/) or following us on [mastodon/fediverse](https://social.masto.host/@fscamp) for updates regarding the camp and join in the conversation on [matrix](https://matrix.to/#/#fscamp:poddery.com) using any of the matrix powered apps like Element. If new to using matrix, you can sign up for accounts by following instructions at [chat.feneas.org](https://chat.feneas.org), [chat.tchncs.de](https://chat.tchncs.de) or [chat.privacytools.io](https://chat.privacytools.io), instead of using matrix.org which will help to reduce their server load.
-You can reach out to us on camp@mm.gnu.org.in for any queries or concerns.
+You can reach out to us on camp at mm.gnu.org.in for any queries or concerns.
Regards,
diff --git a/website/content/welcome.md b/website/content/welcome.md
index 041268f..e268a8e 100644
--- a/website/content/welcome.md
+++ b/website/content/welcome.md
@@ -13,7 +13,7 @@ We have received your application to join Free Software Camp 2020 organized by F
1. Make sure you have read the [code of conduct](https://camp.fsf.org.in/coc.html).
2. Make sure you take the learners' [survey](https://ee.kobotoolbox.org/single/nxw4UE3B) that indicates to us your preferred language for sessions.
3. Consider subscribing to our low volume announcement [mailing list](https://lists.fsci.in/postorius/lists/camp-announce.mm.gnu.org.in/) or following us on [mastodon/fediverse](https://social.masto.host/@fscamp>https://social.masto.host/@fscamp)for updates regarding the camp and join in the conversation on [matrix](https://matrix.to/#/#fscamp:poddery.com) using any of the matrix powered apps like Element.
-4. If your age is below 15, please contact us at [camp@mm.gnu.org.in](mailto:camp@mm.gnu.org.in)
+4. If your age is below 15, please contact us at camp at mm.gnu.org.in
If you are new to these terms, here is an explanation:
@@ -31,7 +31,7 @@ Mastodon is a Free Software to create a social media service similar to Twitter
Matrix is a communication protocol for sharing instant messages, photos, files and audio/video calls. Element is most feature-complete app for Matrix protocol and is available on smart phones and laptop/desktop. Matrix has a similar decentralized architecture to mastodon, where different people and organizations provide an interoperable network of home servers (similar to an instance of mastodon). If you are new to using matrix, you can sign up for accounts by following instructions at [https://chat.feneas.org](https://chat.feneas.org), [https://chat.tchncs.de](https://chat.tchncs.de) or [https://chat.privacytools.io](https://chat.privacytools.io), instead of using matrix.org which will help to reduce their server load.
-You can reach out to us by mailing to [camp@mm.gnu.org.in](mailto:camp@mm.gnu.org.in) for any queries or concerns.
+You can reach out to us by mailing to camp at mm.gnu.org.in for any queries or concerns.
\
diff --git a/website/layouts/_default/baseof.html b/website/layouts/_default/baseof.html
index ef75271..857d745 100644
--- a/website/layouts/_default/baseof.html
+++ b/website/layouts/_default/baseof.html
@@ -3,7 +3,7 @@
{{- partial "head.html" . -}}
<body>
<div style="background-color:#fbe7e3;color:#7e3328;padding:5px 35px 5px 35px;border-left: solid 7px #f3bbb1;text-align: center;">
- <p>Dear learner and mentors, if you have applied for this camp you will receive a reply mail within 5 days of application, please check your Spam folder too in case it doesn't land in your Inbox. If you use Gmail, it might categorize mailing list emails under the 'Promotions' tab. You will need to set a filter for "<i>mm.gnu.org.in</i>" to ensure it ends up in your Primary inbox. If you don't get one please mail to <i>camp@mm.gnu.org.in</i></p>
+ <p>Dear learner and mentors, if you have applied for this camp you will receive a reply mail within 5 days of application, please check your Spam folder too in case it doesn't land in your Inbox. If you use Gmail, it might categorize mailing list emails under the 'Promotions' tab. You will need to set a filter for "<i>mm.gnu.org.in</i>" to ensure it ends up in your Primary inbox. If you don't get one please mail to <i>camp at mm.gnu.org.in</i></p>
</div>
{{- partial "nav.html" . -}}
<main>
--
GitLab