From 20a690db86b2dbaa3e55b2d489b03df0a6a02a27 Mon Sep 17 00:00:00 2001
From: Matthew Cengia <mattcen@mattcen.com>
Date: Mon, 10 Jul 2023 20:54:47 -0700
Subject: [PATCH] Merge Contact page into About

---
 config.yml               |  2 --
 content/pages/about.md   | 14 ++++++++++++++
 content/pages/contact.md | 17 -----------------
 3 files changed, 14 insertions(+), 19 deletions(-)
 delete mode 100644 content/pages/contact.md

diff --git a/config.yml b/config.yml
index 08f0768..df000db 100644
--- a/config.yml
+++ b/config.yml
@@ -29,8 +29,6 @@ menu:
   main:
     - name: About
       pageRef: about
-    - name: Contact
-      pageRef: contact
     - name: Posts
       pageRef: posts
     - name: Publications
diff --git a/content/pages/about.md b/content/pages/about.md
index 0cb006d..131bdbc 100644
--- a/content/pages/about.md
+++ b/content/pages/about.md
@@ -4,10 +4,24 @@ author: mattcen
 type: page
 url: /about
 date: 2016-01-21T06:57:02+00:00
+aliases: /contact
 
 ---
 <img src="/wp-content/uploads/2018/02/me-large.jpg" style="display: block; margin: auto; width: 50%; height: 50%">
 
+## Contact Details
+
+My contact details are accessible via the icons in the footer of this website, but I'll also include some here for convenience:
+
+* Email: mattcen AT mattcen DOT com
+* Matrix: [@mattcen:mattcen.com](https://matrix.to/#/@mattcen:mattcen.com)
+* Mastodon: [@mattcen@aus.social](https://aus.social/@mattcen)
+* GitHub: [@mattcen](https://github.com/mattcen)
+
+I'm also available via Signal; feel free to email me if you'd prefer that medium.
+
+## About Me
+
 Hi! I'm Matthew Cengia. You can call me Matt, or my online handle, [@mattcen](https://aus.social/@mattcen).
 
 I'm a Linux systems administrator and software developer, free and open source software advocate, and scout leader. I'm also polyamorous, bisexual, and non-binary, and I use they/them/theirs pronouns. All of the above are important to my identity, and each component may be the focus of one or more blog posts in future.
diff --git a/content/pages/contact.md b/content/pages/contact.md
deleted file mode 100644
index e79497a..0000000
--- a/content/pages/contact.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-title: Contact
-author: mattcen
-type: page
-url: /contact
-date: 2016-01-21T08:07:48+00:00
-
----
-
-My contact details are accessible via the icons in the footer of this website, but I'll also include some here for convenience:
-
-* Email: mattcen AT mattcen DOT com
-* Matrix: [@mattcen:mattcen.com](https://matrix.to/#/@mattcen:mattcen.com)
-* Mastodon: [@mattcen@aus.social](https://aus.social/@mattcen)
-* GitHub: [@mattcen](https://github.com/mattcen)
-
-I'm also available via Signal; feel free to email me if you'd prefer that medium.