Cropped images, updated ssh, misc edits

site/source/contribute/decentralize.rst

@@ -5,5 +5,11 @@ Decentralize
 
 EmbassyOS allows users to swap to an alternative Marketplace in case they want a service not offered in the official `Start9 Marketplace <https://marketplace.start9.com>`_, would like a backup registry, or have for some reason lost trust in :ref:`Start9 <start9>`.
 
+<<<<<<< Updated upstream
     - In order to change to an unofficial Marketplace, you can see our documentation :ref:`here <alt-marketplaces>`.
-    
+    
+=======
+- In order to change to an unofficial Marketplace, you can see our documentaion :ref:`here <alt-marketplaces>`
+
+.. - If you'd like to run your own Marketplace, and help decentralize the ecosystem, please see our guide `here <https://github.com/Start9Labs/registry>`_.
+>>>>>>> Stashed changes

site/source/user-manual/ssh.rst

@@ -5,13 +5,30 @@ Using SSH
 =========
 
 .. contents::
-  :depth: 2 
+  :depth: 2
   :local:
 
-Creating an SSH Key
--------------------
+Creating an SSH Key (Linux/Mac)
+-------------------------------
 
-@TODO
+#. Open a terminal and enter the following command, replacing the example email address with your own (or, alternatively, a comment):
+
+    .. code-block:: bash
+
+        ssh-keygen -t ed25519 -C "your_email@example.com"
+
+    You will be asked to ``Enter a file in which to save the key`` - we recommend you press ``Enter`` to use the default location
+
+#. Create a strong passphrase and save it somewhere safe, or press ``Enter`` for no passphrase
+
+#. Next, start your system's ``ssh-agent`` and add your key to it:
+
+    .. code-block:: bash
+
+        eval "$(ssh-agent -s)"
+        ssh-add ~/.ssh/id_ed25519
+
+    Note that if you changed the file name/location in step 1, you will need to use that file/path in this step
 
 Registering an SSH Key
 ----------------------
@@ -20,8 +37,8 @@ Registering an SSH Key
 #. Click "Add New Key".
 #. Paste in your SSH *public* key (created above) and click "Submit".
 
-Connecting via CLI on Linux/Mac
--------------------------------
+Connecting via CLI (Linux/Mac)
+------------------------------
 
 #. You can now access your Embassy from the command line (Linux and Mac) using:
 
@@ -31,10 +48,10 @@ Connecting via CLI on Linux/Mac
 
 Replacing ``<LAN URL>`` with your Embassy's LAN (``embassy-xxxxxxx.local``) address
 
-Connecting via PuTTY on Windows 
+Connecting via PuTTY on Windows
 -------------------------------
 
-@TODO
+We are in need of a Windows guide!  Please click the link at the top-right of this page to edit or :ref:`Contact us<contact>` if you would like to contribute!
 
 Using SSH Over Tor
 ------------------

site/source/user-manual/updating.rst

@@ -5,7 +5,7 @@ Updating EmbassyOS
 ==================
 
 .. contents::
-  :depth: 2 
+  :depth: 2
   :local:
 
 .. note:: EmbassyOS will **NEVER** update itself without your approval. But we highly recommended keeping EmbassyOS up to date for the latest security and performance patches, as well as to take advantage of new features.
@@ -57,7 +57,5 @@ Manual Update by Re-flashing
 
 #. Assuming you have you fully-intact EmbassyOS data drive plugged in, you will receive a popup declaring that a valid data drive has been detected. Click "Use Drive" from the pop-up. If you don't see the drive, you may get a message asking you to unplug, then plug back in the drive, and refresh the page.
 
-   .. figure:: /_static/images/setup/migrate3.png
+   .. figure:: /_static/images/setup/use-drive.png
       :width: 60%
-
-@TODO get better image ^