Merge remote-tracking branch 'origin/main' into main

reflects changes made on the original phlog post, available at gopher://brendo.org/0/phlog/20210120-rip-tilde-tel.txt

index.html

@@ -8,6 +8,10 @@ layout: base
 	<ul class="inline-list">
 		<li><a href="/phonebook/">phonebook</a></li>
 		<li><a href="/the-original/">the original</a></li>
+<<<<<<< HEAD
+<<<<<<< HEAD
 		<li><a href="https://tel.tilde.org.nz/register/">request account</a></li>
+=======
+>>>>>>> Revert "add "register" link to the homepage"
 	</ul>
 </main>

phonebook/index.html

@@ -27,10 +27,20 @@ title: phonebook
 	<h2>The community</h2>
 
 	<p>
+<<<<<<< HEAD
 		Want a <code>tel.tilde.org.nz</code> number?
 		<a href="https://tel.tilde.org.nz/register/">
 			Click here for the registration form!
 		</a>
+=======
+		To get a <code>tel.tilde.org.nz</code> number, please message <code>darcy</code>
+		in <code>#tildetel</code> on <a href="https://tilde.chat">the tilde.chat IRC</a>.
+	</p>
+	<p>
+		If you had a <code>tilde.tel</code> number, in most cases, you can use that number
+		on <code>tel.tilde.org.nz</code>! Just let <code>darcy</code> know when asking for
+		an account.
+>>>>>>> Revert "add "register" link to the homepage"
 	</p>
 
 	<table>