update trust ca and twitter icon

site/source/user-manual/backups/backup-restore.rst

@@ -119,30 +119,30 @@ Select the appropriate tab below to restore your data:
 
         #. Select "Transfer"
         
-            .. figure:: /_static/images/transfer/transfer0.png
+            .. figure:: /_static/images/setup/transfer.png
                 :width: 60%
 
         #. Plug in the drive (make sure it is powered on) of the server you are migrating **from** and select it (in this example, /dev/sda).  You may need to try a different USB port and hit "Refresh" if you don't see it immediately.  You will see a warning about using the old drive again; read and understand it.
         
-            .. figure:: /_static/images/transfer/transfer1.png
+            .. figure:: /_static/images/setup/transfer-from.png
                 :width: 60%
 
         #. Select the drive on your new server (that you are migrating **onto**).
         
-            .. figure:: /_static/images/transfer/transfer2.png
+            .. figure:: /_static/images/setup/transfer-to.png
                 :width: 60%
          
             .. warning:: This will **PERMANENETLY ERASE** any existing data on that drive.  If you re-using an old drive, ensure that you have first removed all your data!!
 
         #. Set your new master password.  *Make it good.  Write it down.*  Click finish.
         
-            .. figure:: /_static/images/transfer/transfer3.png
+            .. figure:: /_static/images/setup/screen5-set_password.png
                 :width: 60%
 
-            .. figure:: /_static/images/transfer/transfer4.png
+            .. figure:: /_static/images/setup/transfer-calc-size.png
                 :width: 60%
 
         #. Your server will now initialize and migrate the old data to the new drive.  The time required can vary greatly depending on how much data you are migrating.  Be prepared for this to take many hours, especially if you have 1-2TB+ of data.  Go have a sandwich and contemplate other aspects of your sovereignty.
 
-            .. figure:: /_static/images/transfer/transfer5.png
+            .. figure:: /_static/images/setup/transfer-copying.png
                 :width: 60%

site/source/user-manual/initial-setup.rst

@@ -3,55 +3,14 @@
 =============
 Initial Setup
 =============
-Follow the instructions below to set up your server for the first time.
 
 #. Connect your server to power and Ethernet
 
 #. From a client device (desktop/laptop/phone), open a browser and visit ``http://start.local``. Your client must be connected to the same Local Area Network (LAN) as your server. This usually means they are using the same router, either by ethernet or WiFi
 
-	.. note:: If you are `not` using a Raspberry Pi, you can also plug a monitor and keyboard into the server.
+	.. note:: If you are `not` using a Raspberry Pi, you can also plug a monitor and keyboard into the server. This is known as "Kiosk mode".
 
-#. Select ``Start Fresh``
-
-	.. figure:: /_static/images/setup/screen0-startfresh_or_recover.jpg
-		:width: 50%
-		:alt: Fresh Setup
-
-#. Select your storage drive. In most cases, there will be only one
-
-	.. figure:: /_static/images/setup/screen2-select_storage.jpg
-		:width: 50%
-		:alt: Select Drive
-
-#. Create a master password for your server and click ``Finish``
-
-	.. warning:: Choose a strong master password. Write it down. Store it somewhere safe. DO NOT LOSE IT.
-
-	.. figure:: /_static/images/setup/screen5-set_password_complete.jpg
-		:width: 50%
-		:alt: Create New Password
-
-#. StartOS will initialize. This can take a few minutes
-
-	.. figure:: /_static/images/setup/screen6-storage_initialize.jpg
-		:width: 50%
-		:alt: SSD Initialization
-
-#. Click the ``Download`` button to download a file containing the URLs (`.local` and `.onion`) and Root CA of your server. Keep this file for future reference.
-
-	.. note:: If you connected a monitor, you will `not` see the download button
-
-	.. figure:: /_static/images/setup/screen7-startfresh_complete.jpg
-		:width: 50%
-		:alt: Setup Complete
-
-#. Setup complete! Click ``Login to StartOS`` to access your new server
-
-	.. figure:: /_static/images/setup/screen9-startfresh_complete_saved.jpg
-		:width: 50%
-		:alt: Setup Complete
-
-#. Now you will need to :ref:`trust your root CA<trust-root-ca-on-initial-setup>` in order to login.
+#. Follow the on-screen instructions.
 
 .. _setup-troubleshooting:
 

site/source/user-manual/trust-ca.rst

@@ -4,46 +4,36 @@
 Trusting Your Root CA
 =====================
 
-Download and trust your server's Root Certificate Authority (Root CA) to enable encrypted communications locally and enhance speeds over Tor.
-
-.. _trust-root-ca-on-initial-setup:
-
-Trust Root CA on Initial Setup
-------------------------------
-
-If you've just completed initial setup, you will automatically be prompted to trust your server's Root CA.  Do these mandatory steps below:
- 
-	#. Click `DOWNLOAD`` to download your Root CA
-
-		.. figure:: /_static/images/setup/trust-ca-1.png
-			:width: 40%
-			:alt: Download your Server's Root CA
-
- 
-	#. You may see a dialog box noting it saved to your Downloads folder.  Select :ref:`VIEW DOCS<trust-your-root-ca>` to learn how to trust your server's Root CA on your device's operating system.
-
-		.. figure:: /_static/images/setup/trust-ca-2.png
-			:width: 40%
-			:alt: 
- 
-	#. The `Go To Login` panel will display "Waiting for trust..." until you have completed the process to install and trust your Root CA on your device.
-
-		.. figure:: /_static/images/setup/trust-ca-3.png
-			:width: 40%
-			:alt:
-  
-  
-	#. Once you've successfully trusted your Root CA, you can login by selecting `OPEN`.
-
-		.. figure:: /_static/images/setup/trust-ca-4.png
-			:width: 40%
-			:alt:
+Download and trust your server's Root Certificate Authority (Root CA) to establish a secure (HTTPS) connection with your server, and to enhance speeds over Tor.
 
 .. _download-root-ca:
 
-Download Root CA
------------------
-Your server's Root CA was included in the downloaded file at the end of initial setup. If you do not have that file, you can find your server's Root CA inside the StartOS dashboard.
+Downloading Root CA
+===================
+
+After Initial Setup
+-------------------
+You will be directed to your server's **http**://adjective-noun.local. Follow the on screen instructions to complete these mandatory steps.
+
+		.. note:: You can click "SKIP" to forego trusting your Root CA (not recommended) and bypass the browser's security warning.
+
+		.. figure:: /_static/images/setup/trust-ca.png
+			:width: 40%
+			:alt: Trust your Root CA
+
+From StartOS-info.html File
+----------------------------
+
+You can download your Root CA by clicking "Download certificate" in the file downloaded at the end of initial setup.
+
+		.. figure:: /_static/images/setup/startos-address-info.png
+			:width: 40%
+			:alt: StartOS address info
+
+In StartOS UI
+-------------
+
+You can find your server's Root CA inside the StartOS dashboard.
 
 	#. Navigate to `System > Root CA` and click `Download Certificate`
 
@@ -51,12 +41,12 @@ Your server's Root CA was included in the downloaded file at the end of initial
 			:width: 40%
 			:alt: LAN setup menu item
 
-.. _trust-your-root-ca:
+.. _trust-root-ca:
 
-Trust Root CA
---------------
+Establishing Trust
+==================
 
-Select your OS:
+To trust your Root CA, select your operating system and follow the guide:
 
 - :ref:`Linux <ca-linux>`
 - :ref:`Mac <ca-mac>`