Merge branch 'master' into feature/integrate-safingTailwind

_config.yml

@@ -40,7 +40,7 @@ video_url: /video/
 whitepaper_url: /files/whitepaper/Gate17.pdf
 vpn_comparison_url: /blog/2020/01/22/how-the-spn-compares-to-vpns/
 tor_comparison_url: /blog/2020/01/22/how-the-spn-compares-to-tor/
-pihole_comparison_url: /blog/2021/12/09/portmaster-vs-pi-hole/ 
+pihole_comparison_url: /blog/2021/12/09/portmaster-vs-pi-hole/
 
 ### external
 account_server_url: https://account.safing.io/
@@ -53,6 +53,7 @@ github_url: https://github.com/safing
 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
 invidious_channel_url: https://invidious.snopyta.org/channel/UC_6TW053IlS4M22g7CxnukA
 kickstarter_url: https://www.kickstarter.com/projects/safingio/spn
 reddit_url: https://reddit.com/r/safing

_publications/2021-12-06-spn-reaches-alpha.md

@@ -14,9 +14,9 @@ In October 2020 one of our supporters joked around and said he would gift us a v
 
 Yes, as of today, all customers get access to the [SPN]({{ site.spn_url }}). Whether you pre-ordered the SPN a while ago or are going to purchase it today. You are in!
 
-### To Celebrate, All Customers Can Use the SPN For Free in December
+### To Celebrate, All Customers Can Use the SPN For Free in December + January
 
-This is an exciting moment for all of us. To celebrate and to say thanks, all customers can [use the SPN for free](http://account.safing.io/spn-reaches-alpha) throughout December 2021. Every paying person, new or old, gets automatic access.
+This is an exciting moment for all of us. To celebrate and to say thanks, all customers can [use the SPN for free](http://account.safing.io/spn-reaches-alpha) throughout December 2021 and January 2022. Every paying person, new or old, gets automatic access.
 
 Of course the free SPN access will not charge for your paid subscription. Only after the free period you will decide when to start your paid subscription.
 

_publications/2021-12-09-portmaster-vs-pi-hole.md

@@ -140,7 +140,7 @@ An auditable and open source code builds a high level of trust in the software.
 Instead of having to trust a privacy policy of the company, people can check the source code and see what it really does on a technical level.
 
 The beauty with this is, the bigger the community around a software gets, the more secure it becomes, often outperforming proprietary software.
-Zero-day exploits and long-forgotten vulnerabilities are very rare because someone from the community will undoubtedly discover them.
+Zero-day exploits and long-forgotten vulnerabilities become rarer since someone from the community usually discovers them.
 
 The Portmaster[](https://github.com/safing/portmaster/) and Pi-hole[](https://github.com/pi-hole/pi-hole/) are both free and open source, with great communities involved. They are also both transparent about their funding which gives additional insight into their organization and motives. ([Portmaster](https://safing.io/ownership/) / [Pi-hole](https://discourse.pi-hole.net/t/results-of-the-pi-hole-user-survey/8958))
 

_publications/2022-01-31-reminder-free-period-ends.md

@@ -0,0 +1,17 @@
+---
+# possible values: blog video podcast
+category: blog
+layout:   blog
+title: "Reminder: Free Period Ends February, 1st"
+date: 2022-01-31
+author: david
+custom_thumbnail_name: placeholder-announcement
+---
+
+Just a quick reminder to all SPN customers. Your free period will end tomorrow, February 1st, 2022.
+
+To continue using the SPN, please sign in to your SPN account and hit the "activate" button which **will appear tomorrow, February 1st.**
+
+During the free period we pushed plenty of improvements and hope you are happy with the [current speeds and experience](https://docs.safing.io/spn/alpha/status).
+
+Thanks for your support!

spn/index.html

@@ -45,7 +45,7 @@ layout: page
         <img src="{{ site.img_url }}shapes/circle-sm.png" alt="">
     </span>
   </div>
-</header> 
+</header>
 <section class="general-layout">
     <div class="intro-container mt-32">
         <h2 class="intro-container-title">

terms/index.md

@@ -493,6 +493,10 @@ party's use and enjoyment of any of our Services.
 -   You will not use the Service for anything other than lawful
     purposes.
 
+-   You will not over burden any Safing network with high traffic loads, sustained or in bursts.
+
+-   You will use all Safing products within the normal operational parameters.
+
 -   You will not copy or reproduce, in any way shape or form, by any
     means, any part of the SPN Services, unauthorised by you.