updated about

2 files changed, 132 insertions, 16 deletions

diff --git a/about.html b/about.html
index b2b12e8..4ce7c1b 100644
--- a/about.html
+++ b/about.html
@@ -59,27 +59,149 @@
     </nav>
 
     <article>
-      <h1>About</h1>
+      <h1>Info</h1>
 
-      <p>My name is Adam Carpenter. On some sites I'm 53hornet.</p>
+      <h2>About Me</h2>
+
+      <p>
+        My name is <em>Adam Carpenter</em> (on some sites I'm <em>53hornet</em>)
+        and this is my personal web site.
+      </p>
       <p>
         <img src="https://nextcloud.53hor.net/s/JybL4rc3AQZb3Hk/preview" />
       </p>
 
       <p>
-        I am a professional computer programmer, amateur Hudson driver,
-        mechanic, and caretaker, and a UNIX/FreeBSD enthusiast. I also see
-        myself as a loving husband and doting puppy parent.
+        I am a professional computer programmer. I also see myself as a loving
+        husband and doting puppy parent.
       </p>
 
+      <p>You can find my <a href="/cv.html">detailed CV here</a>.</p>
+
+      <h2>What Will You Find Here?</h2>
+
       <p>
         This site is my home on the web. I post things I've learned, things I
-        want to share, and things I don't want to forget.
+        want to share, and things I don't want to forget. I am generally
+        interested in:
+      </p>
+
+      <ul>
+        <li>Hudson Motor Cars, esp. my Fabulous 1953 Hudson Hornet</li>
+        <li>Systems-level and application-level programming</li>
+        <li>Home servers and self-hosting</li>
+        <li>FreeBSD and other *BSDs or UNIX-like operating systems</li>
+      </ul>
+
+      <h3>Web Log</h3>
+      <p>
+        I run a web log on this site. It's index is at the
+        <a href="/">site index</a> but you can find
+        <a href="/posts/">detailed categories here</a>
+      </p>
+
+      <h3>Self-Hosted Apps and Games</h3>
+
+      <h3>Personal Software Projects & Repositories</h3>
+
+      <h2>Contacting Me</h2>
+
+      <p>
+        You can write to <a href="mailto:atc@53hor.net">atc@53hor.net</a>. I
+        also exist on the following sites but may or may not use them that
+        often. E-mail is the best way to reach me.
+      </p>
+
+      <ul>
+        <li>
+          <a href="#">Discord</a>
+        </li>
+        <li>
+          <a href="#">Facebook</a>
+        </li>
+        <li>
+          <a href="#">Reddit</a>
+        </li>
+        <li>
+          <a href="#">Twitter</a>
+        </li>
+        <li>
+          <a href="#">YouTube</a>
+        </li>
+        <li>
+          <a href="https://www.linkedin.com/in/adam-carpenter/">LinkedIn</a>
+        </li>
+        <li>
+          <a href="https://steamcommunity.com/id/53hornet/">Steam</a>
+        </li>
+      </ul>
+
+      <p>
+        I'm also testing out Tox as an alternative to apps like Discord, so you
+        can message me there for the time being.
+      </p>
+      <p>
+        <img
+          src="/includes/tox.png"
+          alt="33FF8453F9A8E3583EFBC1185F17B466C2A76761AD7E35CBFEB9F1D977F71022FC8FBBC6AB41"
+          title="33FF8453F9A8E3583EFBC1185F17B466C2A76761AD7E35CBFEB9F1D977F71022FC8FBBC6AB41"
+        />
+      </p>
+
+      <h2>Disclaimer</h2>
+
+      <p>
+        The views on this web site are entirely mine! That should go without
+        saying. They don't reflect my company, co-workers, friends, family, dog,
+        or anyone I mention anywhere in any way.
+      </p>
+
+      <p>
+        I prefer not to go back and edit old posts. So when you're reading
+        something from 2 years ago, that was my opinion 2 years ago. Times
+        change and so can I, so please try to keep that in mind.
+      </p>
+
+      <p>
+        If I reference an external public profile or site as fact, I will do so
+        with links so you can go and read the source.
+      </p>
+
+      <h2>Privacy</h2>
+
+      <p>
+        My web server has an access log. As the following, by visiting this site
+        you're surrendering:
+      </p>
+
+      <ul>
+        <li>Your public IP address</li>
+        <li>Your browser's user agent</li>
+        <li>The URL of the page you visited</li>
+        <li>The time and date of your visit</li>
+      </ul>
+
+      <h2>License</h2>
+
+      <p>
+        Content on this site is licensed under the
+        <a href="https://creativecommons.org/licenses/by/4.0/"
+          >Creative Commons Attribution 4.0 International License</a
+        >
+      </p>
+
+      <p>
+        Source code on this site, unless otherwise stated, is licensed under the
+        <a href="https://opensource.org/licenses/BSD-3-Clause">
+          BSD 3-Clause license</a
+        >.
       </p>
 
       <p>
-        If you want to see my "professional" profile,
-        <a href="/profile">go here</a>.
+        The structure and content of this page are loosely based on
+        <a href="https://www.worthe-it.co.za/about.html"
+          >Justin Wernick's about page</a
+        >.
       </p>
     </article>
   </body>
diff --git a/templates/template.html b/templates/template.html
index ef925d0..abcd222 100644
--- a/templates/template.html
+++ b/templates/template.html
@@ -26,9 +26,9 @@
           </a>
         </li>
         <li>
-          <a href="/about.html">
+          <a href="/info.html">
             <img src="/includes/icons/information-variant.svg" />
-            About
+            Info
           </a>
         </li>
         <li>
@@ -49,12 +49,6 @@
             RSS
           </a>
         </li>
-        <li>
-          <a href="/contact.html">
-            <img src="/includes/icons/at.svg" />
-            Contact
-          </a>
-        </li>
       </ul>
     </nav>