From 0a90ce24746d349ac34a19c275596040ed219bab Mon Sep 17 00:00:00 2001
From: Daniel <dhaavi@users.noreply.github.com>
Date: Tue, 16 May 2023 11:14:10 +0200
Subject: [PATCH] Point to Wiki instead of Docs
---
.github/ISSUE_TEMPLATE/config.yml | 4 +--
_config.yml | 8 ++---
_includes/footer.html | 2 +-
_includes/nav.html | 2 +-
...afing-selects-its-default-dns-providers.md | 4 +--
...pdating-portmasters-default-dns-servers.md | 4 +--
.../2021-12-09-portmaster-vs-pi-hole.md | 4 +--
.../2022-08-17-portmaster-vs-glasswire.md | 2 +-
download/index.html | 30 +++++++------------
features/index.html | 2 +-
privacy/index.md | 2 +-
support/index.html | 5 +---
12 files changed, 27 insertions(+), 42 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 824be52..204e16b 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -10,9 +10,9 @@ contact_links:
# about: "Create issue for everything related to Safing's main website"
- name: "Contribution Guideline"
- url: https://docs.safing.io/portmaster/guides/contribute
+ url: https://wiki.safing.io/en/Contribute
about: Learn how to best contribute and make sure your work is aligned with Safing’s current goals and focus
- name: "Code of Conduct"
- url: https://docs.safing.io/community/code-of-conduct
+ url: https://wiki.safing.io/en/CodeOfConduct
about: Be nice to other community members
diff --git a/_config.yml b/_config.yml
index 3ca1977..66cd1e9 100644
--- a/_config.yml
+++ b/_config.yml
@@ -71,11 +71,9 @@ installer_checksums: https://github.com/safing/checksums/
img_shields_io_stars_url: https://img.shields.io/github/stars/safing/portmaster?color=%23fff0&label=%20&style=for-the-badge
img_shields_io_release_url: https://img.shields.io/github/v/release/safing/portmaster?color=%23fff0&label=%20&style=for-the-badge
-docs_install_linux_url: https://docs.safing.io/portmaster/install/linux
-docs_install_windows_url: https://docs.safing.io/portmaster/install/windows
-docs_code_of_conduct_url: https://docs.safing.io/community/code-of-conduct
-
-spn_alpha_status_page_url: https://docs.safing.io/spn/alpha/status
+docs_install_linux_url: https://wiki.safing.io/en/Portmaster/Install/Linux
+docs_install_windows_url: https://wiki.safing.io/en/Portmaster/Install/Windows
+docs_code_of_conduct_url: https://wiki.safing.io/en/CodeOfConduct
kickstarter_url: https://www.kickstarter.com/projects/safingio/spn
reddit_url: https://reddit.com/r/safing
diff --git a/_includes/footer.html b/_includes/footer.html
index 473c009..93dfe38 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -75,7 +75,7 @@
<div class="footer-links-left">
<a href="{{ site.download_url }}" class="footer-link"> Download </a>
<a href="{{ site.features_url }}" class="footer-link"> Features </a>
- <a href="{{ site.docs_url }}" class="footer-link"> Docs & FAQ </a>
+ <a href="{{ site.wiki_url }}" class="footer-link"> Wiki & FAQ </a>
<a target="_blank" href="{{ site.github_url }}/portmaster/" class="footer-link link-primary-external">Source Code </a>
<a href="{{ site.backlog_url }}#portmaster" class="footer-link"> Backlog </a>
</div>
diff --git a/_includes/nav.html b/_includes/nav.html
index 2ee8dc4..4bb2d23 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -29,7 +29,7 @@
<a href="{{ site.pricing_url }}" class="nav-link {% if currentUrl == "pricing" %}selected{% endif %}"> Pricing </a>
<a href="{{ site.spn_url }}" class="nav-link {% if currentUrl == "spn" %}selected{% endif %}"> SPN </a>
<a href="{{ site.about_url }}" class="nav-link {% if currentUrl == "about" %}selected{% endif %}">About</a>
- <a href="{{ site.docs_url }}" class="nav-link">Docs & FAQ</a>
+ <a href="{{ site.wiki_url }}" class="nav-link">Wiki & FAQ</a>
</div>
<div class="nav-right-actions">
<div class="element-x-center-max space-x-3 items-center flex lg:hidden xl:flex">
diff --git a/_publications/2020-07-07-how-safing-selects-its-default-dns-providers.md b/_publications/2020-07-07-how-safing-selects-its-default-dns-providers.md
index 49ba3af..826afb0 100644
--- a/_publications/2020-07-07-how-safing-selects-its-default-dns-providers.md
+++ b/_publications/2020-07-07-how-safing-selects-its-default-dns-providers.md
@@ -95,7 +95,7 @@ __4/5 Technical Quality__
While Quad9 is operated in locations where PCH is also present, through which they gain a [remarkable global presence](https://quad9.net/locations/). On the other side, there are reports with their performance, and we have also experienced technical issues with their service. To be fair, one must note that they operate on a shoestring budget and definitely punch above their weight.
➖ Lacking Query Performance.
-_You can find the [exact configuration for each provider here](https://docs.safing.io/portmaster/guides/dns-configuration)._
+_You can find the [exact configuration for each provider here](https://wiki.safing.io/en/Portmaster/App/DNSConfiguration)._
### Our Primary Default
@@ -112,7 +112,7 @@ Be reminded that this is not the order in which we rate these providers, but eac
Not all changes between providers in the defined working set will be communicated separately. Be assured that we will [thoroughly communicate any changes to this working set of providers]().
-We would highly appreciate any feedback you have on this selection of providers. If you want to set the DNS provider yourself, [here is how you do it](https://docs.safing.io/portmaster/guides/dns-configuration).
+We would highly appreciate any feedback you have on this selection of providers. If you want to set the DNS provider yourself, [here is how you do it](https://wiki.safing.io/en/Portmaster/App/DNSConfiguration).
By doing so, the Portmaster will never use anything else until you make changes again (for global DNS queries).
### Conclusion
diff --git a/_publications/2020-07-07-we-are-updating-portmasters-default-dns-servers.md b/_publications/2020-07-07-we-are-updating-portmasters-default-dns-servers.md
index a6567ed..1133274 100644
--- a/_publications/2020-07-07-we-are-updating-portmasters-default-dns-servers.md
+++ b/_publications/2020-07-07-we-are-updating-portmasters-default-dns-servers.md
@@ -29,7 +29,7 @@ This means the primary resolver is Quad9 (1). Only when issues arise with Quad9,
### You Can Set Your Own Preference
-A lot of information is shared with DNS providers, which is why trust and empowerment are so important. We know one shoe does not fit all, which is why you can set your own DNS providers of choice, overruling all current and future Portmaster defaults in the process. So the Portmaster will never use anything else until you make changes again (for global DNS queries). We set up a [guide to help you in this process](https://docs.safing.io/portmaster/guides/dns-configuration).
+A lot of information is shared with DNS providers, which is why trust and empowerment are so important. We know one shoe does not fit all, which is why you can set your own DNS providers of choice, overruling all current and future Portmaster defaults in the process. So the Portmaster will never use anything else until you make changes again (for global DNS queries). We set up a [guide to help you in this process](https://wiki.safing.io/en/Portmaster/App/DNSConfiguration).
### The Current Default Impacts Performance
@@ -52,7 +52,7 @@ All of these each excel in a different combinations of wanted attributes. [Read
For the moment, we will be using Cloudflare as our primary default (1), because - quite frankly - its unrivaled speed makes up for some performance issues we have in the Portmaster. Addressing these issues is on our roadmap, but will require lots of time and resources, which we currently lack.
-We would highly appreciate any feedback you have on this selection of providers. If you want to set the DNS provider yourself, [here is how you do it](https://docs.safing.io/portmaster/guides/dns-configuration). If you do this, the Portmaster will never use anything else until you make changes again (for global DNS queries).
+We would highly appreciate any feedback you have on this selection of providers. If you want to set the DNS provider yourself, [here is how you do it](https://wiki.safing.io/en/Portmaster/App/DNSConfiguration). If you do this, the Portmaster will never use anything else until you make changes again (for global DNS queries).
### We Thoroughly Communicate New Resolvers
diff --git a/_publications/2021-12-09-portmaster-vs-pi-hole.md b/_publications/2021-12-09-portmaster-vs-pi-hole.md
index c784a08..f5c31ef 100644
--- a/_publications/2021-12-09-portmaster-vs-pi-hole.md
+++ b/_publications/2021-12-09-portmaster-vs-pi-hole.md
@@ -165,7 +165,7 @@ This could result in additional costs and maintenance.
More setup and technical knowledge is required to access it outside the local network and keep the server secure. In the end, it may well be worth the extra efforts if your threat model demands it.
-The documentation for the [Pi-hole](https://docs.pi-hole.net/) and [Portmaster](https://docs.safing.io/portmaster/architecture/overview) will provide more details if you wish to dig into the technical details.
+The documentation for the [Pi-hole](https://docs.pi-hole.net/) and [Portmaster](https://wiki.safing.io/en/Portmaster/Architecture/Overview) will provide more details if you wish to dig into the technical details.
### Portmaster Allows You to Configure Settings System-Wide and Per-App
@@ -226,7 +226,7 @@ Portmaster also has a Simple/Advanced switch that shows or hides settings, allow
### Both Solutions Can Be Used Alongside an Existing VPN Connection
-The Portmaster and the Pi-hole support running alongside a VPN. Some VPNs require additional setup, so it is always good if you check the compatibility of your VPN in the latest docs of the [Portmaster](https://docs.safing.io/portmaster/install/status/vpn-compatibility) and the [Pi-hole](https://docs.pi-hole.net/guides/vpn/openvpn/overview/).
+The Portmaster and the Pi-hole support running alongside a VPN. Some VPNs require additional setup, so it is always good if you check the compatibility of your VPN in the latest docs of the [Portmaster](https://wiki.safing.io/en/Portmaster/App/Compatibility/VPN) and the [Pi-hole](https://docs.pi-hole.net/guides/vpn/openvpn/overview/).
### Portmaster Makes It Easy to Auto-Block Domains By Category
diff --git a/_publications/2022-08-17-portmaster-vs-glasswire.md b/_publications/2022-08-17-portmaster-vs-glasswire.md
index 6555f3f..1dfbebc 100644
--- a/_publications/2022-08-17-portmaster-vs-glasswire.md
+++ b/_publications/2022-08-17-portmaster-vs-glasswire.md
@@ -193,7 +193,7 @@ On the other hand, Portmaster uses the Windows Filtering Platform (WFP) in kerne
In order to give you an overview of what is happening on your device, the Portmaster directly feeds the raw network data into its Network monitor, showing you what your network has been up to within the last 10 minutes.
-Contrary to GlassWire, Portmaster's system integration is both [documented](https://docs.safing.io/portmaster/architecture/os-integration#windows) and [open source](https://github.com/safing/portmaster-windows-kext/), so you can verify our claims.
+Contrary to GlassWire, Portmaster's system integration is both [documented](https://wiki.safing.io/en/Portmaster/Architecture/OSIntegration#windows) and [open source](https://github.com/safing/portmaster-windows-kext/), so you can verify our claims.
### Portmaster Safeguards Your DNS queries From ISPs to Enhance Your Privacy
diff --git a/download/index.html b/download/index.html
index a5fa5f5..7ddc80e 100644
--- a/download/index.html
+++ b/download/index.html
@@ -109,17 +109,15 @@ title: Safing Portmaster - Download
<span class="card-influence-bottom-funding-amount">
<a target="_blank" href="{{ site.installer_checksums }}" class="link-primary-external">Installer Checksums</a>
</span>
- <span class="card-influence-bottom-funding-amount">
- <a target="_blank" href="https://docs.safing.io/portmaster/faq#install" class="link-primary">Installing FAQ</a>
- </span>
</div>
<div class="card-influence-bottom-funding">
<br>
<br>
+ <br>
</div>
<div class="col-container-center w-full md:w-max text-center md:text-left pt-10">
<a class="btn-primary" href="{{ site.download_windows_url }}"><i class="icon-windows text-md mr-2"></i>Download</a>
- <a target="_blank" class="btn-secondary" href="https://docs.safing.io/portmaster/install/windows">View Docs</a>
+ <a target="_blank" class="btn-secondary" href="https://wiki.safing.io/en/Portmaster/Install/Windows">View Docs</a>
</div>
</div>
</div>
@@ -144,16 +142,14 @@ title: Safing Portmaster - Download
<span class="card-influence-bottom-funding-amount">
<a target="_blank" href="{{ site.installer_checksums }}" class="link-primary-external">Installer Checksums</a>
</span>
- <span class="card-influence-bottom-funding-amount">
- <a target="_blank" href="https://docs.safing.io/portmaster/faq#install" class="link-primary">Installing FAQ</a>
- </span>
+
<span class="card-influence-bottom-funding-amount">
<a target="_blank" href="https://linuxconfig.org/install-deb-file-on-ubuntu-20-04-focal-fossa-linux" class="link-primary-external">How to install .deb file?</a>
</span>
</div>
<div class="col-container-center w-full md:w-max text-center md:text-left pt-10">
<a class="btn-primary" href="{{ site.download_linux_deb_url }}"><i class="icon-ubuntu text-md mr-2"></i>Download</a>
- <a target="_blank" class="btn-secondary" href="https://docs.safing.io/portmaster/install/linux">View Docs</a>
+ <a target="_blank" class="btn-secondary" href="https://wiki.safing.io/en/Portmaster/Install/Linux">View Docs</a>
</div>
</div>
</div>
@@ -178,16 +174,13 @@ title: Safing Portmaster - Download
<span class="card-influence-bottom-funding-amount">
<a target="_blank" href="{{ site.installer_checksums }}" class="link-primary-external">Installer Checksums</a>
</span>
- <span class="card-influence-bottom-funding-amount">
- <a target="_blank" href="https://docs.safing.io/portmaster/faq#install" class="link-primary">Installing FAQ</a>
- </span>
<span class="card-influence-bottom-funding-amount">
<a target="_blank" href="https://itsfoss.com/install-rpm-files-fedora/" class="link-primary-external">How to install .rpm file?</a>
</span>
</div>
<div class="col-container-center w-full md:w-max text-center md:text-left pt-10">
<a class="btn-primary" href="{{ site.download_linux_rpm_url }}"><i class="icon-fedora text-md mr-2"></i>Download</a>
- <a target="_blank" class="btn-secondary" href="https://docs.safing.io/portmaster/install/linux">View Docs</a>
+ <a target="_blank" class="btn-secondary" href="https://wiki.safing.io/en/Portmaster/Install/Linux">View Docs</a>
</div>
</div>
</div>
@@ -212,9 +205,6 @@ title: Safing Portmaster - Download
<span class="card-influence-bottom-funding-amount">
<a target="_blank" href="{{ site.installer_checksums }}" class="link-primary-external">Installer Checksums</a>
</span>
- <span class="card-influence-bottom-funding-amount">
- <a target="_blank" href="https://docs.safing.io/portmaster/faq#install" class="link-primary">Installing FAQ</a>
- </span>
<span class="card-influence-bottom-funding-amount">
<a target="_blank" href="https://itsfoss.com/aur-arch-linux/" class="link-primary-external">How to install from AUR?</a>
</span>
@@ -229,7 +219,7 @@ title: Safing Portmaster - Download
</div>
<div class="col-container-center w-full md:w-max text-center md:text-left">
<a target="_blank" class="btn-primary" href="{{ site.download_arch_url }}">Download (AUR)</a>
- <a target="_blank" class="btn-secondary" href="https://docs.safing.io/portmaster/install/linux">View Docs</a>
+ <a target="_blank" class="btn-secondary" href="https://wiki.safing.io/en/Portmaster/Install/Linux">View Docs</a>
</div>
</div>
</div>
@@ -254,12 +244,12 @@ title: Safing Portmaster - Download
<span class="card-influence-bottom-funding-amount">
<a target="_blank" href="{{ site.installer_checksums }}" class="link-primary-external">Installer Checksums</a>
</span>
- <span class="card-influence-bottom-funding-amount">
- <a target="_blank" href="https://docs.safing.io/portmaster/faq#install" class="link-primary">Installing FAQ</a>
- </span>
+ <br>
+ <br>
+ <br>
</div>
<div class="col-container-center w-full md:w-max text-center md:text-left pt-10">
- <a target="_blank" class="btn-primary" href="https://docs.safing.io/portmaster/install/linux#manual-install-and-launching">Manual Install Guide</a>
+ <a target="_blank" class="btn-primary" href="https://wiki.safing.io/en/Portmaster/Install/Linux#manual-install-and-launching">Manual Install Guide</a>
</div>
</div>
</div>
diff --git a/features/index.html b/features/index.html
index b34b796..389989c 100644
--- a/features/index.html
+++ b/features/index.html
@@ -72,7 +72,7 @@ title: Safing Portmaster - Features
as good as we can.
</p>
<div class="col-container w-full text-left md:text-center lg:w-max lg:text-left space-x-4" style="margin-left: 0;">
- <a class="btn-secondary" href="{{ site.docs_url }}">Checkout the docs</a>
+ <a class="btn-secondary" href="{{ site.wiki_url }}">Checkout the Wiki</a>
<a target="_blank" class="link-primary-external inline-flex" href="{{ site.github_url }}/portmaster"><i class="icon-github text-md mr-2"></i>Inspect source code</a>
</div>
</div>
diff --git a/privacy/index.md b/privacy/index.md
index fb3063c..23331a5 100644
--- a/privacy/index.md
+++ b/privacy/index.md
@@ -66,7 +66,7 @@ Although the information collected is basic and may not be classed as PII, we tr
Safing operates these websites, hosted and managed by GitHub ([Pages](https://pages.github.com/)):
- Website: https://safing.io
-- Documentation: https://docs.safing.io
+- Documentation: https://wiki.safing.io
You can [read GitHub's privacy policy](https://docs.github.com/en/github/site-policy/github-privacy-statement) to see how they handle your data.
diff --git a/support/index.html b/support/index.html
index ff86822..6709089 100644
--- a/support/index.html
+++ b/support/index.html
@@ -11,11 +11,8 @@ layout: page
Chances are, someone else had the same problem.
</p>
<div class="col-container-center w-full md:w-max text-center md:text-left">
- <a class="btn-secondary" href="{{ site.docs_url }}">
- Docs & FAQ
- </a>
<a class="btn-secondary" href="{{ site.wiki_url }}">
- Wiki
+ Wiki & FAQ
</a>
<a class="btn-secondary" href="https://github.com/issues?q=is%3Aopen+is%3Aissue+user%3Asafing+sort%3Aupdated-desc">
GitHub Issues