rework backup restore options

site/source/misc-guides/attach-drive.rst

@@ -0,0 +1,33 @@
+.. _attach-drive:
+
+==========================
+Use an Existing Data Drive
+==========================
+During initial setup, select this option if you:
+  1. have re-flashed StartOS and want to resume normal operation on the same device
+  2. are transplanting your existing data drive to a new device, perhaps one with a better CPU or more RAM
+
+#. During select "Recover."
+
+    .. figure:: /_static/images/setup/screen0-recover.jpg
+        :width: 60%
+
+#. Next, select "Use Existing Drive."
+
+    .. figure:: /_static/images/setup/screen3-use_existing.jpg
+        :width: 60%
+
+#. Select your server's data drive.
+
+    .. figure:: /_static/images/setup/screen4-use_existing_drive_selection.jpg
+        :width: 60%
+
+#. Enter and confirm a new password.
+
+    .. figure:: /_static/images/setup/screen5-set_password_complete.jpg
+        :width: 60%
+
+#. Your server will initialize again (all previous data will be recovered).
+
+    .. figure:: /_static/images/setup/screen6-storage_initialize.jpg
+        :width: 60%

site/source/misc-guides/index.rst

@@ -8,8 +8,10 @@ Guides that do not fit into the categories of "devices" or "services."
 .. toctree::
   :maxdepth: 1
 
+  attach-drive
+  transfer-data
+  upgrade-pi
   lnd-migration
-  upgrade-hardware/index
   thunderbird
   smtp
   backup-mount

site/source/misc-guides/transfer-data.rst

@@ -1,8 +1,8 @@
-.. _ssd-upgrade:
+.. _transfer-data:
 
-================
-Upgrade Your SSD
-================
+============================
+Transfer Data to a New Drive
+============================
 This guide will go over how to upgrade your data drive and transfer the data from the old one to the new one.  This will preserve the entire state of your server, including all Tor and LAN addresses as well as channels you have open on the lightning network!  You may like to do this in order to increase storage size, storage speed, or just to move your existing server data to new hardware entirely.
 
 This is not the same as running a back up and restoring them onto a new server.  You can read about the differences on the :ref:`Restore page<backup-restore>`.

site/source/misc-guides/upgrade-hardware/index.rst

@@ -1,11 +0,0 @@
-.. _upgrade-hardware:
-
-==================
-Upgrading Hardware
-==================
-
-.. toctree::
-  :maxdepth: 1
-
-  drive-upgrade
-  upgrade-pure

site/source/misc-guides/upgrade-pi.rst

@@ -1,14 +1,12 @@
 .. _upgrade-pi:
 
 =========================
-Upgrade From Raspberry Pi
+Upgrade Your Raspberry Pi
 =========================
 Follow this guide to upgrade from a Raspberry Pi StartOS server to a Server One, Server Pure, or similar device.
 
-.. _external-drives:
-
-External Drive
-==============
+From Pi with External Drive
+---------------------------
 If your current Raspberry Pi setup uses an external drive over USB.
 
 #. Shutdown your Raspberry Pi server and disconnect from power. If you have a speaker, wait for shutdown noises.
@@ -71,9 +69,8 @@ If your current Raspberry Pi setup uses an external drive over USB.
 
     .. warning:: DO NOT reconnect your old server without first wiping the SD card and SSD! This can cause serious problems! If you have lightning channels you could lose your money!
 
-NASPI (Embassy One)
-===================
-
+From NASPI (Embassy One)
+------------------------
     .. figure:: /_static/images/hardware-pics/server-one.png
         :width: 30%