summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--contact.html36
-rw-r--r--index.html25
2 files changed, 38 insertions, 23 deletions
diff --git a/contact.html b/contact.html
new file mode 100644
index 0000000..16962e3
--- /dev/null
+++ b/contact.html
@@ -0,0 +1,36 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+	<head>
+		<title>Contact Andrew Yu</title>
+		<link rel="stylesheet" href="/plain.css" />
+		<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
+		<meta charset="utf-8" />
+	</head>
+	<body class="indent">
+		<h1>Contact Andrew Yu</h1>
+		<p>There are many ways to contact me.  None of these require proprietary software.</p>
+		<ul>
+			<li>Talk to me in real life.</li>
+			<li>Paper mail.  (I cannot provide my home address to the general public.)</li>
+			<li>Electronic mail to <code>andrew</code> AT <code>andrewyu</code> DOT <code>org</code>.</li>
+			<li>Internet Relay Chat: <code>Andrew</code> on <a href="https://libera.chat/">Libera Chat</a> and <a href="https://irc.andrewyu.org/">LibreIRC</a>.</li>
+			<li>Matrix: <code>@libreirc_Andrew:vern.cc</code> and <code>@Andrew:libera.chat</code>.  May occasionally fail.</li>
+		</ul>
+		<p><a href="/note/wechat.html">Do not contact me via WeChat.</a></p>
+		<p><a href="/note/social-media.html">I do not use social media.</a></p>
+		<h2 id="pgp">OpenPGP</h3>
+		<p>Usually, electronic mail that I send are signed with my OpenPGP key.  Please use OpenPGP when contacting me through electronic mail.  The following are available.</p>
+		<ul>
+			<li><a href="https://www.andrewyu.org/pgp/andrew-ecc.asc">My ECC key</a> (recommended)</li>
+			<li><a href="https://www.andrewyu.org/pgp/andrew.asc">My RSA key</a></li>
+			<li><a href="https://www.andrewyu.org/pgp/allkeys.asc">My keyring of friends</a></li>
+		</ul>
+		<p>In order to verify the authenticity of the key, check if you've actually downloaded these keys from <code>andrewyu.org</code>, and also check the fingerprints with me elsewhere (email, IRC, in real life, etc) before trusting or signing it.</p>
+		<p>Once confirmed, please sign and share my key in order to build the OpenPGP Web of Trust.</p>
+		<div id="footer">
+			<hr />
+			<p><a href="/">Andrew Yu's Website</a></p>
+		</div>
+	</body>
+</html>
diff --git a/index.html b/index.html
index 55e15bf..5a0c85e 100644
--- a/index.html
+++ b/index.html
@@ -7,42 +7,21 @@
 	</head>
 	<body>
 		<h1>Andrew Yu</h1>
-		<p>Andrew Yu, student of YK Pao School and Free Computing activist, welcomes you to <a href="/note/their.html">their</a> Website.</p>
+		<p>Andrew Yu, a fellow Free Computing activist, welcomes you to <a href="/note/their.html">their</a> Website.</p>
 		<hr />
 		<h2 id="nav">Navigation</h2>
 		<ul>
 			<li><a href="https://www.andrewyu.org">Personal site (this page)</a></li>
-			<li><a href="#articles">Articles</a></li>
 			<li><a href="https://git.andrewyu.org">Git repositories</a></li>
 			<li><a href="https://fcm.andrewyu.org">Free Computing Movement</a></li>
 			<li><a href="https://learn.tuxiversity.org">The Tuxiversity Project</a></li>
 			<!--li><a href="https://host.andrewyu.org">Server guides (WIP)</a></li-->
 			<li><a href="https://users.andrewyu.org">Other users</a></li>
 			<li><a href="/note/">Frequently Used Answers</a></li>
-			<li><a href="/buffer.html">(Don't click here)</a></li>
+			<li><a href="/buffer.html">Buffer Area</a></li>
 		</ul>
 		<h2 id="me">About me</h2>
 		<p>I am Andrew Yu, a 14-year-old in Shanghai, China, currently studying at <a href="https://ykpaoschool.cn/">YK Pao School</a> (link requires JavaScript to function, will discuss replacements).  My main fields of interest are philosophy (especially political philosophy), metamathematics, programming fundamentals and molecular biology.  I'm also a Free Computing activist.</p>
-		<h2 id="contact">Contact</h2>
-		<p>There are many ways to contact me.  None of these require proprietary software.</p>
-		<ul>
-			<li>Talk to me in real life.</li>
-			<li>Paper mail.  (I cannot provide my home address to the general public.)</li>
-			<li>Electronic mail to <code>andrew</code> AT <code>andrewyu</code> DOT <code>org</code>.</li>
-			<li>Internet Relay Chat: <code>Andrew</code> on <a href="https://libera.chat/">Libera Chat</a> and <a href="https://irc.andrewyu.org/">LibreIRC</a>.</li>
-			<li>Matrix: <code>@libreirc_Andrew:vern.cc</code> and <code>@Andrew:libera.chat</code>.  May occasionally fail.</li>
-		</ul>
-		<p><a href="/note/wechat.html">Do not contact me via WeChat.</a></p>
-		<p><a href="/note/social-media.html">I do not use social media.</a></p>
-		<h3 id="pgp">OpenPGP</h3>
-		<p>Usually, electronic mail that I send are signed with my OpenPGP key.  Please use OpenPGP when contacting me through electronic mail.  The following are available.</p>
-		<ul>
-			<li><a href="https://www.andrewyu.org/pgp/andrew-ecc.asc">My ECC key</a> (recommended)</li>
-			<li><a href="https://www.andrewyu.org/pgp/andrew.asc">My RSA key</a></li>
-			<li><a href="https://www.andrewyu.org/pgp/allkeys.asc">My keyring of friends</a></li>
-		</ul>
-		<p>In order to verify the authenticity of the key, check if you've actually downloaded these keys from <code>andrewyu.org</code>, and also check the fingerprints with me elsewhere (email, IRC, in real life, etc) before trusting or signing it.</p>
-		<p>Once confirmed, please sign and share my key in order to build the OpenPGP Web of Trust.</p>
 		<h2 id="articles">Articles</h2>
 		<p>Pages for other projects are not listed&mdash;only independent articles are listed here.  These are sorted from newest to oldest.  Some drafts aren't listed here, but are shown in <a href="/article/">the directory index</a>.</p>
 		<ul>