From 731af8a597eff6c21c6a0ea817980be6d5c8e511 Mon Sep 17 00:00:00 2001
From: j3s <j3s@c3f.net>
Date: Thu, 22 Oct 2020 14:29:16 -0500
Subject: [PATCH] Update changelog and FAQ

---
 capsulflask/templates/changelog.html |  23 ++---
 capsulflask/templates/faq.html       | 132 +++++++++------------------
 2 files changed, 53 insertions(+), 102 deletions(-)

diff --git a/capsulflask/templates/changelog.html b/capsulflask/templates/changelog.html
index 685bc5d..3c0edcc 100644
--- a/capsulflask/templates/changelog.html
+++ b/capsulflask/templates/changelog.html
@@ -8,18 +8,19 @@
 {% block subcontent %}
 <p>
  <ul>
-   <li>2020-01-30: Baikal ownership transferred to Cyberia Computer Club</li>
-   <li>2020-01-31: Prepping docs</li>
-   <li>2020-02-26: Re-prepping docs</li>
-   <li>2020-03-07: CVM goes live</li>
-   <li>2020-03-10: CVM name changed to Capsul</li>
-   <li>2020-03-10: Capsul site goes live</li>
-   <li>2020-03-22: Alpine support added</li>
-   <li>2020-03-25: Network limits made public</li>
-   <li>2020-04-17: OpenBSD support added</li>
-   <li>2020-04-26: Support link added</li>
-   <li>2020-05-04: Simplified payment page</li>
+   <li>2020-10-22: Re-worked FAQ, added more supporting docs</li>
    <li>2020-05-16: Beta version of new Capsul web application</li>
+   <li>2020-05-04: Simplified payment page</li>
+   <li>2020-04-26: Support link added</li>
+   <li>2020-04-17: OpenBSD support added</li>
+   <li>2020-03-25: Network limits made public</li>
+   <li>2020-03-22: Alpine support added</li>
+   <li>2020-03-10: Capsul site goes live</li>
+   <li>2020-03-10: CVM name changed to Capsul</li>
+   <li>2020-03-07: CVM goes live</li>
+   <li>2020-02-26: Re-prepping docs</li>
+   <li>2020-01-31: Prepping docs</li>
+   <li>2020-01-30: Baikal ownership transferred to Cyberia Computer Club</li>
  </ul>           
 </p>
 {% endblock %}
diff --git a/capsulflask/templates/faq.html b/capsulflask/templates/faq.html
index 40f36f5..817e6ba 100644
--- a/capsulflask/templates/faq.html
+++ b/capsulflask/templates/faq.html
@@ -11,65 +11,34 @@
  <ul>
    <li>
      Which instance type should I buy?
-     <ul><li>
-      It depends a lot on your requirements, but I can lay down a few guidelines.
-      <ul>
-        <li>
-          f1-s
-          <ul>
-            <li> blog </li>
-            <li> vpn </li>
-            <li> bot </li>
-            <li> cgit </li>
-          </ul>
-        </li>
-        <li>
-          f1-m
-          <ul>
-            <li> owncloud </li>
-            <li> gitea </li>
-            <li> popular blog/vpn/bot </li>
-          </ul>
-        </li>
-        <li>
-          f1-l
-          <ul>
-            <li> docker host </li>
-            <li> build system </li>
-          </ul>
-        </li>
-        <li>
-          f1-x
-          <ul>
-            <li> large webservice with thousands of users </li>
-            <li> rotund java app </li>
-          </ul>
-        </li>
-        <li>
-          f1-xx
-          <ul>
-            <li> gitlab (wow such memory very devops) </li>
-          </ul>
-        </li>
-        <li>
-          f1-xxx
-          <ul>
-            <li> something huge </li>
-          </ul>
-        </li>
-      </ul>
-     </li></ul>
+     <p>There are no hard rules for this sort of thing, but here are some guidelines:</p>
+     <p>f1-xs</p>
+     <p>  * blog</p>
+     <p>  * vpn</p>
+     <p>  * bot</p>
+     <p>  * cgit</p>
+     <p>f1-s</p>
+     <p>  * owncloud</p>
+     <p>  * gitea</p>
+     <p>  * popular blog/vpn/bot</p>
+     <p>f1-m</p>
+     <p>  * docker host</p>
+     <p>  * build system</p>
+     <p>f1-l</p>
+     <p>  * large webservice with thousands of users</p>
+     <p>  * rotund java app</p>
+     <p>f1-x</p>
+     <p>  * gitlab (wow such devops very memory)</p>
+     <p>f1-xx</p>
+     <p>  * something gigantic</p>
    </li>
    <li>
      How do I log in?
-     <ul><li>
-      <p>ssh to the ip provided to you using the cyberian user.</p>
-      <pre class='code'>$ ssh cyberian@1.2.3.4</pre>
-     </li></ul>
+     <p>ssh to the ip provided to you using the cyberian user.</p>
+     <pre class='code'>$ ssh cyberian@1.2.3.4</pre>
    </li>
    <li>
-    How do I change to the root user?
-    <ul><li>
+     How do I change to the root user?
      <p>The cyberian user has passwordless sudo access by default. This should work:</p>
      <pre class='code'>
 # Linux
@@ -77,74 +46,55 @@ $ sudo su -
 
 # OpenBSD
 $ doas su -</pre>
-    </li></ul>
    </li>
    <li>
-    Do you offer reverse DNS?
-    <ul><li>
+     Do you offer reverse DNS?
      <p>We do, but right now it's a manual process. Shoot us an email and we'll get it done.</p>
-    </li></ul>
    </li>
    <li>
-    What if I don't pay?
-    <ul><li>
-     <p>Your VM will be deleted. You will receive coal. 
-       You will be banned from our minetest server. 
-       We will attempt to give you ample warning before nuking a server, but that's no guarantee.
-      </p>
-    </li></ul>
+    What if I don't pay / don't maintain my payments?
+    <p>Your VM will eventually be deleted.
+       Capsul will send you a few inoffensive reminders as that termination date approaches.
+    </p>
    </li>
    <li>
     Besides my virtual machines and payments, what information do you keep about me?
-    <ul><li>
      <p>We associate an email address with every VM so that we can track payment and respond to support requests.</p>
-     <p>If you pay with a credit card, Stripe sends some additional details about you that we literally cannot delete.</p>
-    </li></ul>
+     <p>If you pay with a credit card, Stripe stores some additional details about you that we literally cannot delete.</p>
    </li>
    <li>
     What can I do with my VM?
-    <ul><li>
-     <p>Make it into a mailserver, a bitcoin miner, a VPN host, whatever.</p>
-     <p>We place no restrictions on what you can do, as long as it's not illegal. Don't get us in trouble.</p>
-    </li></ul>
+     <p>Make it into a mailserver, a bitcoin miner, a VPN host, whatever you'd like.</p>
+     <p>Our systems exist within the USA, and as such we are bound by US law.</p>
    </li>
    <li>
     Can you recover my passwords/insert new keys?
-    <ul><li>
-     <p>Can we? Technically yes. Will we? Never. It would violate the trust that our customers have in us. 
+     <p>Can we? Technically yes. Will we? No, never. It would violate the trust that our users have in us.
       We have no interest in touching client VMs after they're running.
+      We promise to keep your machines running smoothly.
       If you lose access to your VM, that's on you.</p>
-    </li></ul>
    </li>
    <li>
     Do you offer refunds?
-    <ul><li>
-     <p>Not now.</p>
-    </li></ul>
+     <p>Not now, but email us and we can probably figure something out.</p>
    </li>
    <li>
     Where do the VMs run? Is it on a machine that you guys own/control?
-    <ul><li>
      <p>Capsul runs on a server named Baikal which Cyberia built from scratch & mailed to a datacenter
       in Georgia called CyberWurx. CyberWurx staff installed it for us in a rack space that
       Cyberia pays for. </p>
-    </li></ul>
    </li>
    <li>
-    Do you offer support?
-    <ul><li>
-     <p>Yep, email us at <a href="mailto:support@cyberia.club">support@cyberia.club</a></p>
-     <ul>
-       <li>all volunteers have very busy schedules, but we will do our best to respond in a reasonable time period.</li>
-       <li>If you would prefer private support, please send your mail to <a href="mailto:capsul@cyberia.club">capsul@cyberia.club</a> instead.</li>
-     </ul>
-    </li></ul>
+     Do you offer support?
+     <p>Yep, see <a href="/support">our support page</a></p>.
+   </li>
+   <li>
+     Do you have an SLA?
+     <p>No, but we normally respond pretty quickly.</p>
    </li>
    <li>
     Will you implement feature X?
-    <ul><li>
-      Maybe! Email <a href="mailto:ops@cyberia.club">ops@cyberia.club</a> and ask us about it.
-    </li></ul>
+    <p>Maybe! Email <a href="mailto:ops@cyberia.club">ops@cyberia.club</a> and ask us about it.</p>
    </li>
  </ul>
 </p>