revert (im git dumb)

This commit is contained in:
Vitor Gonçalves 2023-05-19 15:37:34 -03:00
parent b573afdf38
commit 69283a7630
1 changed files with 11 additions and 4 deletions

View File

@ -11,14 +11,18 @@
<body>
<!--#include file="nav.php" -->
<div class=h><h1 id=vern>Welcome to ~vern!</h1> <a aria-hidden=true href=#vern>#vern</a></div>
<p>~vern is a non-commercial <a href=//tildeverse.org>tilde</a> focused on free software and services! This means we are a community open for sharing, engaging, participating and creating free and open source software for everyone, without exceptions.</p>
<p>While we host a lot of services like privacy front-ends, ~vern is well known for it's cozy and participative community, that has been built that way since the beginning. We are here not to just get software to your hands, but to walk you through it.</p>
<p>~vern also has a <a href=/en/sysinfo#pubnix>pubnix</a>, that is, a public machine that runs NixOS on top of the Linux-Libre kernel for improved freedom. The nonfree repositories are not enabled by default, too.</p>
<p>Finally, ~vern's purpose is to provide to you the best experience you could have in this hopeless Internet, and to get you to get stuff done as soon as you can!</p>
<p>~vern is a non-commercial <a href=//tildeverse.org>tilde</a> focused on free software and services!</p>
<p>All our servers run <a href=/en/sysinfo>free GNU/Linux distributions</a>.</p>
<div class=h><h2 id=announcements>Announcements</h2> <a aria-hidden=true href=#announcements>#announcements</a></div>
<p>A list of announcements can be found at <a href=/en/announcements>/announcements</a>
<!--#include file="ssi_anno.shtml" -->
<div class=h><h2 id=services>Services</h2> <a aria-hidden=true href=#services>#services</a></div>
<p>We host many services that are available for public use.</p>
<p>You can get access to the "Reg Needed" services by <a href=/en/register>signing up</a> via the registration form.</p>
<p>With the exception of clearnet Minetest &amp; services hosted on <a href=/en/sysinfo#iceberg>Iceberg</a>, none of the services we host have the capability to log IP addresses due to our use of WireGuard. IP logging on Iceberg is disabled.</p>
<p>We also host <a href=/en/tor>Tor</a> and <a href=/en/i2p>I2P</a> versions of most of these services.</p>
<p>Services marked with "AD:" have alternate (sub)domains you can use for them.</p>
<!--#include file="services.html" -->
<div class=h><h2 id=community>Community</h2> <a aria-hidden=true href=#community>#community</a></div>
<p><b>You can join our community on most major free software chat programs:</b></p>
<p>We make use of bridging so you can chat with us regardless of what chat program you use</p>
@ -39,6 +43,7 @@
<li><a href='//mto.vern.cc/#/#abuse:vern.cc' target="_blank">Matrix</a></li>
<li><a href="xmpp:abuse@muc.vern.cc" target="_blank">XMPP</a></li>
</ul>
<<<<<<< HEAD
<<<<<<< HEAD
<div class=h><h2 id=services>Services</h2> <a aria-hidden=true href=#services>#services</a></div>
<p>You can get access to the "Reg Needed" services by <a href=/en/register>signing up</a> via the registration form.</p>
@ -46,6 +51,8 @@
<p>We also host <a href=/en/tor>Tor</a> and <a href=/en/i2p>I2P</a> versions of most of these services.</p>
<p>Services marked with "AD:" have alternate (sub)domains you can use for them.</p>
<!--#include file="services.html" -->
=======
>>>>>>> parent of 1402f88 (shuffled stuff, made copywriting (somewhat))
<div class=h><h2 id=sysinfo>What computers do ~vern servers run on?</h2> <a aria-hidden=true href=#sysinfo>#sysinfo</a></div>
<p>~vern has many servers running in different ways. You can find a list of them and their uses at <a href=/en/sysinfo>/sysinfo</a>.</p>
=======