_includes/footer.html

@@ -56,8 +56,8 @@
     </div>
 
     <div class="col-sm-4 mb-3 d-flex justify-content-center">
-      <i class="far fa-envelope fa-2x"></i>
-      <a href="/contact/">Contact</a>
+      <i class="far fa-address-card fa-2x"></i>
+      <a href="/contact/">About Us &amp; Contact</a>
     </div>
 
     <div class="col-sm-4 mb-3 d-flex justify-content-center">

nginx/020-redirects.conf

@@ -4,6 +4,9 @@ location = /old/ {
 location = /privacy-policy/ {
 	return 301 /privacy/;
 }
+location = /contact/ {
+	return 301 /about/;
+}
 location = /software/im/ {
 	return 301 /software/real-time-communication/;
 }

pages/about.html

@@ -11,7 +11,8 @@ hidedesc: true
     <p><em>You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities.</em></p>
     <p>At <strong>PrivacyTools</strong>, we provide services, tools, and knowledge to protect your privacy against global mass surveillance, and moderate a thriving community of privacy-minded individuals like yourself to discuss and learn about new advances in protecting your online data. This website serves as the centerpiece of our organization, where we research and recommend various software solutions for our community.</p>
     <p><strong>Transparency</strong> is our strongest value, and it's what sets us apart from the rest of the "privacy recommendations" community. Editorial changes to this website and the products we recommend are always discussed on our extensive <a href="https://github.com/privacytoolsIO/privacytools.io/issues">issue tracker</a>, drafted in a public <a href="https://github.com/privacytoolsIO/privacytools.io/pulls">pull request</a> open for further discussion, and logged in a comprehensive <a href="https://github.com/privacytoolsIO/privacytools.io/commits/master">commit log</a> dating back to our original founding date in 2015. The <em>core</em> team members listed below are responsible for most of the edits and final decisions to changes on this website and across our services, but this website is truly the work of hundreds <a href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">contributors and fact checkers</a> working to make sure our recommendations are solid and trustworthy.</p>
-    <p>Additionally, we are a not-for-profit organization. We do not utilize paid recommendations or affiliate programs to make the recommendations on this website. Unfortunately this practice is very common elsewhere online, which makes it difficult to trust other review sites. We are unique in this area, in that all of our research is conducted independently, and we will never accept payments to modify, add, or remove any of our reviews or recommendations. Our finances are provided entirely by our community <a href="https://opencollective.com/privacytoolsio">donors</a> and <a href="/sponsors/">sponsors</a>, and are handled by the Open Collective Foundation 501(c)(3). Because we are operating as a charity in the United States, we are legally obligated to only use our funding to further our mission of spreading privacy education and promoting online services like Mastodon, Matrix, and WriteFreely. This website is a public resource, not a profit generator. To that regard, all our financial transactions (incoming and outgoing) are logged and made available to the public via our page at <a href="https://opencollective.com/privacytoolsio">opencollective.com/privacytoolsio</a>.
+    <p>Additionally, we are a not-for-profit organization. We do not utilize paid recommendations or affiliate programs to make the recommendations on this website. Unfortunately this practice is very common elsewhere online, which makes it difficult to trust other review sites. We are unique in this area, in that all of our research is conducted independently, and we will never accept payments to modify, add, or remove any of our reviews or recommendations. Our finances are provided entirely by our community <a href="https://opencollective.com/privacytoolsio">donors</a> and <a href="/sponsors/">sponsors</a>, and are handled by the Open Collective Foundation 501(c)(3). Because we are operating as a charity in the United States, we are legally obligated to only use our funding to further our mission of spreading privacy education and promoting online services like Mastodon, Matrix, and WriteFreely. This website is a public resource, not a profit generator. To that regard, all our financial transactions (incoming and outgoing) are logged and made available to the public via our page at <a href="https://opencollective.com/privacytoolsio">opencollective.com/privacytoolsio</a>.</p>
+    <p>We take the operation of our various <a href="/services/">services</a> very seriously, and require all participants to adhere to our <a href="https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md">Code of Conduct</a>. For any questions or to report abuse, please see our CoC’s <a href="https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md#enforcement">Enforcement section</a>.</p>
   </div>
 </div>
 
@@ -112,7 +113,7 @@ website="https://www.reddit.com/user/trai_dep"
 %}
 
 </div>
-<div class="row mt-4">
+<div class="row mt-4 mb-4">
   <div class="col">
     <div class="card">
       <div class="card-body">
@@ -123,3 +124,15 @@ website="https://www.reddit.com/user/trai_dep"
     </div>
   </div>
 </div>
+
+<div class="row">
+  <div class="col">
+    <h2>Contact Us</h2>
+    <p>It's very important to us to stay up-to-date on the latest changes in the privacy space. If you have a software recommendation for us, or want to request a change on this website, please don't hesitate to reach out in one of the following ways.</p>
+    <p><a href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-lg fa-fw"></i> Start a discussion in our Discourse forum</a></p>
+    <p><a href="https://github.com/privacytoolsIO/privacytools.io/issues"><i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub</a></p>
+    <p><a href="https://www.reddit.com/r/privacytoolsIO/"><i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on our subreddit</a></p>
+    <p>For complete transparency, software and providers will only be considered for this website after discussions take place on our GitHub issue tracker. We of course don't make any changes in secret.</p>
+    <p>Join our Matrix room at <code>#general:privacytools.io</code> or join the <a href="https://keybase.io/team/privacytools_io">privacytools_io Keybase team</a> to chat with us and other members about this site and privacy in general! If you need a Matrix account, you can sign up with our own homeserver (<code>https://chat.privacytools.io</code>) using <a href="https://riot.privacytools.io">Riot</a>.</p>
+  </div>
+</div>

pages/contact.md

@@ -1,26 +0,0 @@
----
-layout: page
-permalink: /contact/
-title: "Contact Us"
-description: "Contact the PrivacyTools team if you have any suggestions or are experiencing any issues."
----
-
-## Suggestions?
-
-It's very important to us to stay up-to-date on the latest changes in the privacy space. If you have a software recommendation for us, or want to request a change on this website, please don't hesitate to reach out.
-
-[<i class="fab fa-discourse fa-lg fa-fw"></i> Start a discussion in our Discourse forum](https://forum.privacytools.io/)
-
-[<i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub](https://github.com/privacytoolsIO/privacytools.io/issues)
-
-[<i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on our subreddit](https://www.reddit.com/r/privacytoolsIO/)
-
-For complete transparency, software and providers will only be considered for this website after discussions take place on any of the above platforms.
-
-## Chat with the Team
-
-Join our Matrix room at `#general:privacytools.io` or [privacytools_io Keybase team](https://keybase.io/team/privacytools_io) to chat with [us](https://github.com/orgs/privacytoolsIO/people) and other members about this site and privacy in general! If you need a Matrix account, you can sign up with our own homeserver (`https://chat.privacytools.io`) using [riot.privacytools.io](https://riot.privacytools.io/).
-
-## Code of Conduct
-
-We take the operation of our various [services](/services/) very seriously, and adhere to our [Code of Conduct](https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md). For any questions or to report abuse, please see our CoC's [Enforcement](https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md#enforcement) section.