diff --git a/articles/wiki/email.md b/articles/wiki/email.md index 96dc23f..cce0a8a 100644 --- a/articles/wiki/email.md +++ b/articles/wiki/email.md @@ -10,7 +10,7 @@ Your email can be accessed in one of three ways: 2. Logging into your email account from our [Rainloop web mail](https://www.thunix.net/webmail/) service 3. Through an email client program installed on your computer, using IMAP -Unlike the email services provided by Microsoft, Yahoo, Google and other providers, who intrusively spy on its users beyond reasonable law enforcement and advertising tactics, thunix email services will always respect user privacy, as you can see through our [GDPR Statement and Privacy Policy](https://www.thunix.net/gdpr.php). +Unlike the email services provided by Microsoft, Yahoo, Google and other providers, who intrusively spy on its users beyond reasonable law enforcement and advertising tactics, thunix email services will always respect user privacy, as you can see through our [GDPR Statement and Privacy Policy](https://www.thunix.net/gdpr). ## Mutt and Alpine Email Clients diff --git a/articles/wiki/ssh.md b/articles/wiki/ssh.md index da30f85..7993307 100644 --- a/articles/wiki/ssh.md +++ b/articles/wiki/ssh.md @@ -2,7 +2,7 @@ --- -When you [sign up](https://www.thunix.net/signup.php) for an account on thunix, you'll be given remote access to a Linux shell server, with web hosting, gopher hosting and email. And because of our [GDPR and privacy policy](https://www.thunix.net/gdpr.php), we take security seriously. This is why we use SSH key pairs to grant access to our server through SSH or SFTP. +When you [sign up](https://www.thunix.net/signup) for an account on thunix, you'll be given remote access to a Linux shell server, with web hosting, gopher hosting and email. And because of our [GDPR and privacy policy](https://www.thunix.net/gdpr), we take security seriously. This is why we use SSH key pairs to grant access to our server through SSH or SFTP. On our signup page, you'll seen an entry for a "Public SSH Key." SSH key pairs work on the basis of having two files; one is a public key that you can send to us when we create your account, while the other is a private key that you keep on your computer, away from public knowledge. If you're wondering where to find these things, you have to generate them yourself. diff --git a/articles/wiki/system/thunix.md b/articles/wiki/system/thunix.md index eb6d2d3..bcf0802 100644 --- a/articles/wiki/system/thunix.md +++ b/articles/wiki/system/thunix.md @@ -94,12 +94,12 @@ it. nal file storage must also follow copyright law. If you want to request for content you own the copyright for to be removed from thunix, please refer to our abuse reporting page (https://www.thu‐ - nix.net/abuse.php). In the email, please identify who you are, if you are the copyright holder or legally representing them, the exact files you want removed with + nix.net/contac). In the email, please identify who you are, if you are the copyright holder or legally representing them, the exact files you want removed with links to the files and infringed content, and contact information such as phone numbers or a reply-to email address. Users that repeatedly violate the Terms of Service will have their account removed. Depending on the degree of the offense, their account may be removed immedi‐ ately. These terms also apply to communication services such as forums, mailing lists, irc channels, newsgroups, and any other service either hosted on or used - for thunix. If you come across anything that violates the terms of service, please let us know with the abuse reporting page (https://www.thunix.net/abuse.php). + for thunix. If you come across anything that violates the terms of service, please let us know with the abuse reporting page (https://www.thunix.net/contac). Architecture The Thunix system consists of one server, running Debian 9, which runs inside of an LXD container. This allows for an out-of-band