docs: Simplify team member listing (#2799)

Signed-off-by: Daniel Gray <dngray@privacyguides.org>
Signed-off-by: Freddy <freddy@privacyguides.org>
Signed-off-by: fria <138676274+friadev@users.noreply.github.com>
Signed-off-by: redoomed1 <161974310+redoomed1@users.noreply.github.com>

docs/about.md

@@ -23,27 +23,11 @@ schema:
 [:octicons-home-16:](https://www.privacyguides.org){ .card-link title=Homepage }
 [:octicons-code-16:](https://github.com/privacyguides/privacyguides.org){ .card-link title="Source Code" }
 
-## Staff
+Privacy Guides is built by volunteers and staff members around the world. All changes to our recommendations and resources are reviewed by at least two [trusted](https://discuss.privacyguides.net/u?group=team&order=solutions&period=all) individuals, and we work diligently to ensure our content is updated as quickly as possible to adapt to the ever changing cybersecurity threat landscape.
 
-[**Jonah Aragon**](https://www.jonaharagon.com) is the Project Director and staff writer at *Privacy Guides*. His role includes researching and writing for this website, system administration, creating *Privacy Guides Online Learning* course content, reviewing the products recommended here, and most other day-to-day tasks.
+In addition to our core team, [many other people](about/contributors.md) have made contributions to the project. You can too! We're open source on GitHub, and accepting translation suggestions on [Crowdin](https://crowdin.com/project/privacyguides).
 
-<div class="grid" markdown>
+[Job Openings :material-arrow-right-drop-circle:](about/jobs.md)
-
-[:simple-discourse: Discourse (preferred): @jonah](https://discuss.privacyguides.net/u/jonah)
-
-[:material-email: Email: jonah@privacyguides.org](mailto:jonah@privacyguides.org)
-
-[:simple-mastodon: Mastodon: @jonah@neat.computer](https://mastodon.neat.computer/@jonah "@jonah@neat.computer"){rel=me}
-
-[:simple-signal: Signal: @jonah.01](https://signal.me/#eu/dDtlmTPv09utyEJPwCHq8UYs-AVOPlys8weinr7alfdylK5G-LNIX7GasDNJdV6y)
-
-</div>
-
-*The Project Director is a part-time position which reports directly to the executive committee.*
-
----
-
-[Open Positions :material-arrow-right-drop-circle:](about/jobs.md)
 
 ## Executive Committee
 <!-- markdownlint-disable MD030 -->
@@ -60,8 +44,8 @@ The project executive committee consists of five volunteers charged with managem
 
     [:material-account: Profile](https://discuss.privacyguides.net/u/dngray)
 
-    [:simple-github:](<https://github.com/dngray> "GitHub")
+    [:material-github:](<https://github.com/dngray> "GitHub")
-    [:simple-mastodon:](https://mastodon.social/@dngray "@dngray@mastodon.social"){rel=me}
+    [:material-mastodon:](https://mastodon.social/@dngray "@dngray@mastodon.social"){rel=me}
     [:material-email:](mailto:dngray@privacyguides.org "Email")
 
 -   :detective:{ .lg .middle } **Freddy**
@@ -72,8 +56,8 @@ The project executive committee consists of five volunteers charged with managem
 
     [:material-account: Profile](https://discuss.privacyguides.net/u/freddy)
 
-    [:simple-github:](https://github.com/freddy-m "GitHub")
+    [:material-github:](https://github.com/freddy-m "GitHub")
-    [:simple-mastodon:](https://social.lol/@freddy "@freddy@social.lol"){rel=me}
+    [:material-mastodon:](https://social.lol/@freddy "@freddy@social.lol"){rel=me}
     [:material-email:](mailto:freddy@privacyguides.org "Email")
 
 -   :robot:{ .lg .middle } **Jonah Aragon**
@@ -84,8 +68,9 @@ The project executive committee consists of five volunteers charged with managem
 
     [:material-account: Profile](https://discuss.privacyguides.net/u/jonah)
 
-    [:simple-github:](https://github.com/jonaharagon "GitHub")
+    [:material-home:](https://www.jonaharagon.com "Homepage")
-    [:simple-mastodon:](https://mastodon.neat.computer/@jonah "@jonah@neat.computer"){rel=me}
+    [:material-github:](https://github.com/jonaharagon "GitHub")
+    [:material-mastodon:](https://mastodon.neat.computer/@jonah "@jonah@neat.computer"){rel=me}
     [:material-email:](mailto:jonah@privacyguides.org "Email")
 
 -   :cactus:{ .lg .middle } **Niek de Wilde**
@@ -96,8 +81,8 @@ The project executive committee consists of five volunteers charged with managem
 
     [:material-account: Profile](https://discuss.privacyguides.net/u/Niek-de-Wilde)
 
-    [:simple-github:](https://github.com/blacklight447 "GitHub")
+    [:material-github:](https://github.com/blacklight447 "GitHub")
-    [:simple-mastodon:](https://mastodon.social/@blacklight447 "@blacklight447@mastodon.social"){rel=me}
+    [:material-mastodon:](https://mastodon.social/@blacklight447 "@blacklight447@mastodon.social"){rel=me}
     [:material-email:](mailto:niekdewilde@privacyguides.org "Email")
 
 -   :smirk_cat:{ .lg .middle } **Olivia**
@@ -108,29 +93,11 @@ The project executive committee consists of five volunteers charged with managem
 
     [:material-account: Profile](https://discuss.privacyguides.net/u/olivia)
 
-    [:simple-github:](https://github.com/hook9 "GitHub")
+    [:material-github:](https://github.com/hook9 "GitHub")
-    [:simple-mastodon:](https://mastodon.neat.computer/@oliviablob "@oliviablob@neat.computer"){rel=me}
+    [:material-mastodon:](https://mastodon.neat.computer/@oliviablob "@oliviablob@neat.computer"){rel=me}
 
 </div>
 
-## Volunteer Team
-
-A number of other contributors have volunteered their time to review and approve changes to this website, and keep the website up to date. Changes require 2+ approvals from team members before they can be merged. In addition to the executive committee members above, volunteers [trusted](https://github.com/orgs/privacyguides/people) to review pull requests include:
-
-<div class="grid cards" markdown>
-
-- [:simple-github: **friadev**](https://github.com/friadev)
-- [:simple-github: **ph00lt0**](https://github.com/ph00lt0)
-- [:simple-github: **redoomed1**](https://github.com/redoomed1)
-
-</div>
-
-We also especially thank our dedicated moderation team on Matrix and our forum: *Austin Huang*, *namazso*, *hik*, *riley*, and *Valynor*.
-
-Additionally, [many other people](about/contributors.md) have made contributions to the project. You can too! We're open source on GitHub, and accepting translation suggestions on [Crowdin](https://crowdin.com/project/privacyguides).
-
-Our team members review all changes made to the website and direct the course of the project as a whole. They do not personally profit from any contributions made to this site. Donations to Privacy Guides are generally tax-deductible in the United States.
-
 ## In The Media
 
 > To find [privacy-focused alternative] apps, check out sites like Good Reports and **Privacy Guides**, which list privacy-focused apps in a variety of categories, notably including email providers (usually on paid plans) that aren’t run by the big tech companies.

docs/about/contributors.md

@@ -16,6 +16,6 @@ This project follows the [all-contributors](https://github.com/all-contributors/
 | 💬 | `question` | Someone who has been helpful when answering questions on our [forum](https://discuss.privacyguides.net) or Matrix channels.
 | 🌍 | `translation` | Someone who has contributed on [Crowdin](https://crowdin.com/project/privacyguides).
 
-A huge thank you from Privacy Guides to these wonderful people ([full emoji key](https://allcontributors.org/docs/en/emoji-key)):
+A huge thank you from Privacy Guides to the following wonderful people ([full emoji key](https://allcontributors.org/docs/en/emoji-key)). We also especially thank our dedicated community moderation team on Matrix and our forum: *Austin Huang*, *namazso*, *hik*, *riley*, and *Valynor*.
 
 --8<-- "includes/contributors.md"

docs/about/jobs.md

@@ -3,7 +3,7 @@ title: Job Openings
 description: Privacy Guides has a small, remote team of privacy researchers and advocates. Any open positions we may have in the future will be posted here.
 ---
 
-Privacy Guides has a small, remote team of privacy researchers and advocates working to further our mission of protecting free expression and promoting privacy-respecting technology. As a non-profit, we are expanding very slowly to ensure the project is sustainable in the long term. All of our staff members are listed [here](../about.md#staff). Please consider [donating](donate.md) to support our cause.
+Privacy Guides has a small, remote team of privacy researchers and advocates working to further our mission of protecting free expression and promoting privacy-respecting technology. As a non-profit, we are expanding very slowly to ensure the project is sustainable in the long term. All of our team members are listed [here](https://discuss.privacyguides.net/u?group=team&order=solutions&period=all). Please consider [donating](donate.md) to support our cause.
 
 We are occasionally looking for strong journalistic writers, product reviewers, and privacy experts to help us out, and any open positions will be posted below.
 

docs/about/privacy-policy.md

@@ -2,7 +2,7 @@
 title: "Privacy Policy"
 description: We do not sell or share your data with any third-parties.
 ---
-Privacy Guides is a community project operated by a number of active volunteer contributors. The public list of team members [can be found on GitHub](https://github.com/orgs/privacyguides/people).
+Privacy Guides is a community project operated by a number of active contributors. The public list of team members [can be found on our forum](https://discuss.privacyguides.net/u?group=team&order=solutions&period=all).
 
 ## Data We Collect From Visitors
 

includes/strings.en.env

@@ -24,6 +24,7 @@ HOMEPAGE_BUTTON_GET_STARTED_TITLE="The first step of your privacy journey"
 HOMEPAGE_BUTTON_TOOLS_NAME="Recommended Tools"
 HOMEPAGE_BUTTON_TOOLS_TITLE="Recommended privacy tools, services, and knowledge"
 NAV_ABOUT="About"
+NAV_ABOUT_TEAM_MEMBERS="Team Members"
 NAV_ADVANCED="Advanced"
 NAV_ADVANCED_TOPICS="Advanced Topics"
 NAV_BLOG="Articles"

mkdocs.yml

@@ -442,6 +442,8 @@ nav:
   - !ENV [NAV_ABOUT, "About"]:
       - "about.md"
       - "about/donate.md"
+      - !ENV [NAV_ABOUT_TEAM_MEMBERS, "Team Members"]:
+          https://discuss.privacyguides.net/u?group=team&order=solutions&period=all
       - "about/contributors.md"
       - "about/criteria.md"
       - "about/executive-policy.md"