diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index c987415d..072cbbcf 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -43,7 +43,7 @@ We're trying to keep it simple and promote the best tools, not all of them. There can be exceptions if no software is available that meet the criteria. -Note: This criteria applies to all of the PrivacyTools website and recommendations. +Note: This criteria applies to all of the Privacy Guides website and recommendations. ### Providers diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 52f4ca2b..6fb1e124 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -2,6 +2,6 @@ contact_links: - name: Services issues url: https://github.com/privacytools/services/issues/new/choose about: Open any issues/bug reports/requests related to our services (Mastodon, Matrix, etc) here. - - name: PrivacyTools Community + - name: Privacy Guides Community url: https://forum.privacytools.io/ about: Please ask any generic questions on our forum. diff --git a/.well-known/librehost.json b/.well-known/librehost.json index eccf338c..813f09b0 100644 --- a/.well-known/librehost.json +++ b/.well-known/librehost.json @@ -6,7 +6,7 @@ "tagLine" : "Private Services: No Ads, No Google Analytics, No Affiliates, and No Cross-Site Requests", "homeUrl" : "https://www.privacytools.io/", "logo" : "https://www.privacytools.io/assets/img/layout/shield.svg", - "description": "PrivacyTools is a socially motivated website that provides information and services for protecting your security and privacy online. No Ads, No Google Analytics, No Affiliates, and No Cross-Site Requests.", + "description": "Privacy Guides is a socially motivated website that provides information and services for protecting your security and privacy online. No Ads, No Google Analytics, No Affiliates, and No Cross-Site Requests.", "communicationLanguages": ["en"], "contactUrl": "https://www.privacytools.io/contact/", "privacyPolicyUrl" : "https://www.privacytools.io/privacy/", diff --git a/_includes/legacy/sections/resources.html b/_includes/legacy/sections/resources.html index 03db019b..8cfb6705 100644 --- a/_includes/legacy/sections/resources.html +++ b/_includes/legacy/sections/resources.html @@ -37,11 +37,11 @@ %} {% include legacy/card.html color="secondary" - title="PrivacyTools Services" + title="Privacy Guides Services" icon="far fa-eye-slash" iconcolor="dark" page="/services/" - description="The PrivacyTools team is proud to launch a variety of privacy-centric online services, including a Mastodon instance, search engine, and more!" + description="The Privacy Guides team is proud to launch a variety of privacy-centric online services, including a Mastodon instance, search engine, and more!" %} {% include legacy/card.html color="danger" diff --git a/_includes/legacy/sections/search-engines.html b/_includes/legacy/sections/search-engines.html index 8ce0d505..6c043539 100644 --- a/_includes/legacy/sections/search-engines.html +++ b/_includes/legacy/sections/search-engines.html @@ -8,7 +8,7 @@ include legacy/cardv2.html title="Searx" image="/assets/img/legacy_svg/3rd-party/searx.svg" - description='Searx is an open-source, self-hostable, metasearch engine, aggregating the results of other search engines while not storing information about its users. There is a list of public instances or you can try the PrivacyTools instance.' + description='Searx is an open-source, self-hostable, metasearch engine, aggregating the results of other search engines while not storing information about its users. There is a list of public instances or you can try the Privacy Guides instance.' website="https://searx.me/" tor="http://ulrn6sryqaifefld.onion" forum="https://forum.privacytools.io/t/discussion-searx/283" diff --git a/_includes/legacy/team.html b/_includes/legacy/team.html index ad387ede..120b09cd 100644 --- a/_includes/legacy/team.html +++ b/_includes/legacy/team.html @@ -41,7 +41,7 @@ {% endif %} {% if include.blog %} - + {% endif %} diff --git a/collections/_browsers/brave.md b/collections/_browsers/brave.md index f0a07144..9cc2003b 100644 --- a/collections/_browsers/brave.md +++ b/collections/_browsers/brave.md @@ -2,4 +2,4 @@ name: Brave Browser type: "Anti-Recommendation" --- -**Brave** is widely touted as a privacy-friendly Chromium browser, but we have a number of concerns with their business practices and future business model that would prevent us from recommending them. The Brave team [has publicly stated](https://www.reddit.com/r/privacytoolsIO/comments/cs8foq/update_delisting_brave/) they do not want to be associated with privacy-focused groups like PrivacyTools ([PrivacyTools PR #657](https://github.com/privacytools/privacytools.io/pull/657)), which causes us to believe the Brave team does not wish to be under too much scrutiny from the privacy community as they continue to develop their product ([Reddit discussion](http://archive.today/2020.05.13-035943/https://www.removeddit.com/r/brave_browser/comments/csapsy/brave_browser_is_being_delisted_from/exf6i0f/)). +**Brave** is widely touted as a privacy-friendly Chromium browser, but we have a number of concerns with their business practices and future business model that would prevent us from recommending them. The Brave team [has publicly stated](https://www.reddit.com/r/privacytoolsIO/comments/cs8foq/update_delisting_brave/) they do not want to be associated with privacy-focused groups like Privacy Guides ([Privacy Guides PR #657](https://github.com/privacytools/privacytools.io/pull/657)), which causes us to believe the Brave team does not wish to be under too much scrutiny from the privacy community as they continue to develop their product ([Reddit discussion](http://archive.today/2020.05.13-035943/https://www.removeddit.com/r/brave_browser/comments/csapsy/brave_browser_is_being_delisted_from/exf6i0f/)). diff --git a/collections/_posts/2019-10-05-understanding-vpns.md b/collections/_posts/2019-10-05-understanding-vpns.md index 7ad2df47..2aeff0a9 100644 --- a/collections/_posts/2019-10-05-understanding-vpns.md +++ b/collections/_posts/2019-10-05-understanding-vpns.md @@ -5,7 +5,7 @@ cover: understanding-vpns-cover.jpg cover_src: 'https://unsplash.com/@freeche' cover_src_publisher: Kvistholt Photography canonical: 'https://blog.privacytools.io/understanding-vpns/' -canonical_publisher: the PrivacyTools Blog +canonical_publisher: the Privacy Guides Blog layout: post excerpt: A VPN is a tool that secures your internet connection from attackers on your network... --- diff --git a/collections/_posts/2019-11-09-firefox-privacy.md b/collections/_posts/2019-11-09-firefox-privacy.md index 61b835c4..20d57508 100644 --- a/collections/_posts/2019-11-09-firefox-privacy.md +++ b/collections/_posts/2019-11-09-firefox-privacy.md @@ -6,14 +6,14 @@ cover_src: 'https://unsplash.com/@vmxhu' cover_src_publisher: Szabo Viktor color: "linear-gradient(to bottom, rgba(158, 82, 19, 0.5), rgba(158, 82, 19, 0.9))" canonical: 'https://blog.privacytools.io/firefox-privacy-an-introduction-to-safe/' -canonical_publisher: the PrivacyTools Blog +canonical_publisher: the Privacy Guides Blog layout: post excerpt: Mozilla Firefox is one of the most popular web browsers around, and for good reason. It's fast, secure, open-source, and it's backed by an organization that actually respects your privacy. --- Mozilla Firefox is one of the most popular web browsers around, and for good reason. It's fast, secure, open-source, and it's backed by an organization that actually respects your privacy. Unlike many other Chrome alternatives and forks, it has a massive development team behind it that publishes new updates on a constant, regular basis. Regular updates doesn't only mean shiny new features, it means you'll also receive security updates that will keep you protected as you browse the web. -Because of all of this, the PrivacyTools team [recommends Firefox](https://www.privacytools.io/browsers/#browser) as a general-purpose browser for most users. It's the best alternative to Google Chrome and Edge for privacy conscious individuals. +Because of all of this, the Privacy Guides team [recommends Firefox](https://www.privacytools.io/browsers/#browser) as a general-purpose browser for most users. It's the best alternative to Google Chrome and Edge for privacy conscious individuals. Firefox is fantastic out of the box, but where it really shines is customizability. By adjusting Firefox privacy settings and using helpful add-ons, you can increase your privacy and security even further. Making those changes is what we're going to go over in this Firefox privacy guide. @@ -149,7 +149,7 @@ A containers setup may be a good alternative to techniques like regularly deleti ## Additional Resources -[Web Browsers at PrivacyTools](https://www.privacytools.io/browsers/) — PrivacyTools's comprehensive set of recommendations for browsers and tweaks you can make to enhance your privacy is a great next step for more advanced users looking to protect their privacy online. +[Web Browsers at Privacy Guides](https://www.privacytools.io/browsers/) — Privacy Guides's comprehensive set of recommendations for browsers and tweaks you can make to enhance your privacy is a great next step for more advanced users looking to protect their privacy online. [ghacks user.js](https://github.com/ghacksuserjs/ghacks-user.js) — For more advanced users, the ghacks user.js is a "configuration file that can control hundreds of Firefox settings [...] which aims to provide as much privacy and enhanced security as possible, and to reduce tracking and fingerprinting as much as possible - while minimizing any loss of functionality and breakage". diff --git a/legacy_pages/about/about.html b/legacy_pages/about/about.html index 9f1bceb2..5236da78 100644 --- a/legacy_pages/about/about.html +++ b/legacy_pages/about/about.html @@ -1,8 +1,8 @@ --- layout: page permalink: /about/ -title: "About PrivacyTools" -description: "About the PrivacyTools organization, and contributors to the PrivacyTools website, communities, and services." +title: "About Privacy Guides" +description: "About the Privacy Guides organization, and contributors to the Privacy Guides website, communities, and services." hidedesc: true ---
@@ -31,7 +31,7 @@ hidedesc: true avatar="burung.png" name="Burung Hantu" role="Founder" -bio="I founded PrivacyTools in 2015 to share resources and tools, allowing users to avoid international mass-surveillance programs." +bio="I founded Privacy Guides in 2015 to share resources and tools, allowing users to avoid international mass-surveillance programs." keys="https://keybase.io/privacytools" mastodon="https://social.privacytools.io/@BurungHantu" twitter="privacytoolsIO" @@ -104,7 +104,7 @@ website="https://www.reddit.com/user/trai_dep"

Emeritus

-

Emeriti are honorary PrivacyTools team members who have formerly contributed to the project in a central way but are no longer currently active.

+

Emeriti are honorary Privacy Guides team members who have formerly contributed to the project in a central way but are no longer currently active.

diff --git a/legacy_pages/notices.md b/legacy_pages/notices.md index c52f115a..7ea90ca3 100644 --- a/legacy_pages/notices.md +++ b/legacy_pages/notices.md @@ -2,26 +2,26 @@ layout: page permalink: /notices/ title: "Notices and Disclaimers" -description: "PrivacyTools is provided with good intentions on an "as-is" basis, without warranty, and disclaiming liability for damages." +description: "Privacy Guides is provided with good intentions on an "as-is" basis, without warranty, and disclaiming liability for damages." --- Section 1 # Legal Disclaimer -PrivacyTools is not a law firm. As such, the PrivacyTools website and contributors are not providing legal advice. The material and recommendations in our website and guides do not constitute legal advice nor does contributing to the website or communicating with PrivacyTools or other contributors about our website create an attorney-client relationship. +Privacy Guides is not a law firm. As such, the Privacy Guides website and contributors are not providing legal advice. The material and recommendations in our website and guides do not constitute legal advice nor does contributing to the website or communicating with Privacy Guides or other contributors about our website create an attorney-client relationship. -Running this website, like any human endeavor, involves uncertainty and trade-offs. We hope this website helps, but it may include mistakes, and can’t address every situation. If you have any questions about your situation, we encourage you to do your own research, seek out other experts, and discuss with your and the PrivacyTools community. If you have any legal questions, you should consult with your own legal counsel before moving forward. +Running this website, like any human endeavor, involves uncertainty and trade-offs. We hope this website helps, but it may include mistakes, and can’t address every situation. If you have any questions about your situation, we encourage you to do your own research, seek out other experts, and discuss with your and the Privacy Guides community. If you have any legal questions, you should consult with your own legal counsel before moving forward. -PrivacyTools is an open source project contributed to under licenses that include terms that, for the protection of the website and its contributors, make clear that the PrivacyTools project and website is offered "as-is", without warranty, and disclaiming liability for damages resulting from using the website or any recommendations contained within. PrivacyTools does not warrant or make any representations concerning the accuracy, likely results, or reliability of the use of the materials on the website or otherwise relating to such materials on the website or on any third-party sites linked on this site. +Privacy Guides is an open source project contributed to under licenses that include terms that, for the protection of the website and its contributors, make clear that the Privacy Guides project and website is offered "as-is", without warranty, and disclaiming liability for damages resulting from using the website or any recommendations contained within. Privacy Guides does not warrant or make any representations concerning the accuracy, likely results, or reliability of the use of the materials on the website or otherwise relating to such materials on the website or on any third-party sites linked on this site. -PrivacyTools additionally does not warrant that this website will be constantly available, or available at all. +Privacy Guides additionally does not warrant that this website will be constantly available, or available at all. Section 2 # Licenses Content copyright on this website is waived under the terms of [CC0 1.0 Universal](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt). -In certain jurisdictions, namely those in which the copyright waiver in the CC0-1.0 is judged for any reason to be legally invalid or ineffective under applicable law, content may be copyright © PrivacyTools contributors, released under the [CC 1.0 Universal](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt) license. +In certain jurisdictions, namely those in which the copyright waiver in the CC0-1.0 is judged for any reason to be legally invalid or ineffective under applicable law, content may be copyright © Privacy Guides contributors, released under the [CC 1.0 Universal](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt) license. **Content** on this website is based on [github.com/privacytools/privacytools.io](https://github.com/privacytools/privacytools.io) and is made freely available under the CC-1.0. @@ -32,11 +32,11 @@ Code, including source files and code samples if any in the content, is released - [Popper.js](https://github.com/privacytools/privacytools.io/blob/master/assets/js/popper.min.js) is under the MIT license. See: [github.com/FezVrasta/popper.js/raw/master/LICENSE.md](https://github.com/FezVrasta/popper.js/raw/master/LICENSE.md) - [Sortable](https://github.com/privacytools/privacytools.io/blob/master/assets/js/sortable.min.js) is under the MIT license. See: [github.com/HubSpot/sortable/raw/master/LICENSE](https://github.com/HubSpot/sortable/raw/master/LICENSE) - The Font Awesome icons are under CC-BY-4.0, Font Awesome fonts are under SIL OFL 1.1, and Font Awesome code is under the MIT License. See: [fontawesome.com/license/free](https://fontawesome.com/license/free) -- The PrivacyTools fonts, icons, and code in `fonts` are under ISC license. See: [github.com/privacytools/privacytools.io/blob/master/font/LICENSE](https://github.com/privacytools/privacytools.io/blob/master/font/LICENSE). +- The Privacy Guides fonts, icons, and code in `fonts` are under ISC license. See: [github.com/privacytools/privacytools.io/blob/master/font/LICENSE](https://github.com/privacytools/privacytools.io/blob/master/font/LICENSE). Portions of this notice itself were adopted from [opensource.guide](https://github.com/github/opensource.guide/blob/master/notices.md) on GitHub, released under [CC-BY-4.0](https://github.com/github/opensource.guide/blob/master/LICENSE). -This means that you can use the code and content in this repository **except** for the PrivacyTools [branding](https://github.com/privacytools/brand) in your own projects. PrivacyTools's brand trademarks include the "PrivacyTools" wordmark and shield logo. More information on the use of PrivacyTools's branding can be found on our [branding guidelines page](https://github.com/privacytools/brand). +This means that you can use the code and content in this repository **except** for the Privacy Guides [branding](https://github.com/privacytools/brand) in your own projects. Privacy Guides's brand trademarks include the "PrivacyTools" wordmark and shield logo. More information on the use of Privacy Guides's branding can be found on our [branding guidelines page](https://github.com/privacytools/brand). We believe that the logos and other images in `assets` from third-party providers are either in the public domain or **fair use**. In a nutshell, legal [fair use doctrine](https://en.wikipedia.org/wiki/Fair_use) allows the use of copyrighted image in order to identify the subject matter for purposes of public comment. However, these logos and other images may still be subject to trademark laws in one or more jurisdictions. Before using this content, please ensure that it is used to identify the entity or organization that owns the trademark and that you have the right to use it under the laws which apply in the circumstances of your intended use. *You are solely responsible for ensuring that you do not infringe someone else's trademark or copyright.* @@ -45,9 +45,9 @@ When you contribute to this repository you are doing so under the above licenses Section 3 # Acceptable Use -You may not use this website in any way that causes or may cause damage to the website or impairment of the availability or accessibility of PrivacyTools, or in any way which is unlawful, illegal, fraudulent, or harmful, or in connection with any unlawful, illegal, fraudulent, or harmful purpose or activity. +You may not use this website in any way that causes or may cause damage to the website or impairment of the availability or accessibility of Privacy Guides, or in any way which is unlawful, illegal, fraudulent, or harmful, or in connection with any unlawful, illegal, fraudulent, or harmful purpose or activity. -You must not conduct any systematic or automated data collection activities on or in relation to this website without PrivacyTools's express written consent, including: +You must not conduct any systematic or automated data collection activities on or in relation to this website without Privacy Guides's express written consent, including: * Excessive Automated Scans * Denial of Service Attacks diff --git a/legacy_pages/privacy.md b/legacy_pages/privacy.md index 0277fd50..161be8f6 100644 --- a/legacy_pages/privacy.md +++ b/legacy_pages/privacy.md @@ -2,7 +2,7 @@ layout: page permalink: /privacy/ title: "Privacy Q&A" -description: "This Privacy Statement explains what information PrivacyTools and its related entities collect about its users, what we do with that information, and how we handle the content you place in our products and services." +description: "This Privacy Statement explains what information Privacy Guides and its related entities collect about its users, what we do with that information, and how we handle the content you place in our products and services." --- ## Who is {{ site.name }}? diff --git a/legacy_pages/providers/vpn.html b/legacy_pages/providers/vpn.html index 8caa8ce3..8f6d5bf3 100644 --- a/legacy_pages/providers/vpn.html +++ b/legacy_pages/providers/vpn.html @@ -204,7 +204,7 @@ breadcrumb: "VPN"
  1. VPN - a Very Precarious Narrative by Dennis Schubert
  2. Don't use VPN services by Sven Slootweg
    3. -
  3. The self-contained networks recommended by PrivacyTools are able to replace a VPN that allows access to services on local area network
    4. +
  4. The self-contained networks recommended by Privacy Guides are able to replace a VPN that allows access to services on local area network
  5. Slicing Onions: Part 1 – Myth-busting Tor by blacklight447
  6. Slicing Onions: Part 2 – Onion recipes; VPN not required by blacklight447
diff --git a/legacy_pages/services/chat.html b/legacy_pages/services/chat.html index d0f252f6..56a2fd02 100644 --- a/legacy_pages/services/chat.html +++ b/legacy_pages/services/chat.html @@ -51,7 +51,7 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re

No. Messages sent to the #general chat are encrypted from with client-to-server encryption, i.e. HTTPS. This means that your messages can't be viewed by an attacker on your network, or your ISP, etc. However, because this is a public chat room anybody can view your messages if they are a member, and newcomers will be able to see all message history. Do not say anything in rooms that don't use End-to-End (E2E) encryption that you wouldn't want tied to you personally.

Isn't Matrix behind Cloudflare?

-

The default matrix.org homeserver is behind Cloudflare. The PrivacyTools homeserver is not. +

The default matrix.org homeserver is behind Cloudflare. The Privacy Guides homeserver is not.

Isn't Matrix slow?

It can be, for some! Due to the trememdous amount of people registering on the matrix.org homeserver, it is often overloaded and occasionally slow to respond. Therefore, users on that homeserver occasionally report a less than ideal chat experience. If that's you, you can fix this problem by switching to another homeserver. Good alternatives include... @@ -69,15 +69,15 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re

Why do XMPP users keep joining and leaving all the time?

It's an issue with the XMPP bridge.

-

I'm not using the PrivacyTools homeserver, can I find PrivacyTools rooms in Element?

-

Yes! Open the room explorer (compass icon on Element desktop), click the server selection drop down next to the search bar, click "Add a new server", type privacytools.io, and click Add. You should then be able to view and search through rooms that the PrivacyTools server is aware of. Note that not every room hosted on PrivacyTools is affiliated with or moderated by the PrivacyTools team.

+

I'm not using the Privacy Guides homeserver, can I find Privacy Guides rooms in Element?

+

Yes! Open the room explorer (compass icon on Element desktop), click the server selection drop down next to the search bar, click "Add a new server", type privacytools.io, and click Add. You should then be able to view and search through rooms that the Privacy Guides server is aware of. Note that not every room hosted on Privacy Guides is affiliated with or moderated by the Privacy Guides team.

Rooms

To join a room, just type /join [room address] in any room. You can run this command from any server, not just ours!

-

The PrivacyTools administration operates the following channels:

+

The Privacy Guides administration operates the following channels: