diff --git a/site/source/_static/images/setup/migrate0.png b/site/source/_static/images/setup/migrate0.png index 0a9430e..ccb937a 100644 Binary files a/site/source/_static/images/setup/migrate0.png and b/site/source/_static/images/setup/migrate0.png differ diff --git a/site/source/_static/images/setup/migrate1.png b/site/source/_static/images/setup/migrate1.png index 65d7e38..c301fc0 100644 Binary files a/site/source/_static/images/setup/migrate1.png and b/site/source/_static/images/setup/migrate1.png differ diff --git a/site/source/_static/images/setup/migrate2.png b/site/source/_static/images/setup/migrate2.png index 3fc1b41..76da863 100644 Binary files a/site/source/_static/images/setup/migrate2.png and b/site/source/_static/images/setup/migrate2.png differ diff --git a/site/source/_static/images/setup/migrate3.png b/site/source/_static/images/setup/migrate3.png index d4b14ca..ea9ac9c 100644 Binary files a/site/source/_static/images/setup/migrate3.png and b/site/source/_static/images/setup/migrate3.png differ diff --git a/site/source/_static/images/setup/migrate4.png b/site/source/_static/images/setup/migrate4.png index 9732e95..b684fd3 100644 Binary files a/site/source/_static/images/setup/migrate4.png and b/site/source/_static/images/setup/migrate4.png differ diff --git a/site/source/_static/images/setup/migrate5.png b/site/source/_static/images/setup/migrate5.png index e8a69b5..052aff7 100644 Binary files a/site/source/_static/images/setup/migrate5.png and b/site/source/_static/images/setup/migrate5.png differ diff --git a/site/source/_static/images/setup/migrate6.png b/site/source/_static/images/setup/migrate6.png index 40bf7a2..199af55 100644 Binary files a/site/source/_static/images/setup/migrate6.png and b/site/source/_static/images/setup/migrate6.png differ diff --git a/site/source/_static/images/setup/setup0.png b/site/source/_static/images/setup/setup0.png index 58df9e5..b9e1c3c 100644 Binary files a/site/source/_static/images/setup/setup0.png and b/site/source/_static/images/setup/setup0.png differ diff --git a/site/source/_static/images/setup/setup1.png b/site/source/_static/images/setup/setup1.png index 5c148bd..ed307ab 100644 Binary files a/site/source/_static/images/setup/setup1.png and b/site/source/_static/images/setup/setup1.png differ diff --git a/site/source/_static/images/setup/setup2.png b/site/source/_static/images/setup/setup2.png index bd1bb30..163d78a 100644 Binary files a/site/source/_static/images/setup/setup2.png and b/site/source/_static/images/setup/setup2.png differ diff --git a/site/source/_static/images/setup/setup3.png b/site/source/_static/images/setup/setup3.png index d471b11..0ad6b82 100644 Binary files a/site/source/_static/images/setup/setup3.png and b/site/source/_static/images/setup/setup3.png differ diff --git a/site/source/_static/images/setup/setup4.png b/site/source/_static/images/setup/setup4.png index 40bf7a2..2543030 100644 Binary files a/site/source/_static/images/setup/setup4.png and b/site/source/_static/images/setup/setup4.png differ diff --git a/site/source/_static/images/setup/use-drive.png b/site/source/_static/images/setup/use-drive.png new file mode 100644 index 0000000..f676c15 Binary files /dev/null and b/site/source/_static/images/setup/use-drive.png differ diff --git a/site/source/contribute/decentralize.rst b/site/source/contribute/decentralize.rst index 4bbde95..15f30b8 100644 --- a/site/source/contribute/decentralize.rst +++ b/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 `_, would like a backup registry, or have for some reason lost trust in :ref:`Start9 `. +<<<<<<< Updated upstream - In order to change to an unofficial Marketplace, you can see our documentation :ref:`here `. - \ No newline at end of file + +======= +- In order to change to an unofficial Marketplace, you can see our documentaion :ref:`here ` + +.. - If you'd like to run your own Marketplace, and help decentralize the ecosystem, please see our guide `here `_. +>>>>>>> Stashed changes diff --git a/site/source/user-manual/ssh.rst b/site/source/user-manual/ssh.rst index b37544a..6cd3c61 100644 --- a/site/source/user-manual/ssh.rst +++ b/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 ```` 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` if you would like to contribute! Using SSH Over Tor ------------------ diff --git a/site/source/user-manual/updating.rst b/site/source/user-manual/updating.rst index cae51be..c0fd1d6 100644 --- a/site/source/user-manual/updating.rst +++ b/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 ^