.. raw:: html
@@ -22,22 +23,22 @@
.. topic-box::
- :title: Purchasing
- :link: https://store.start9.com
+ :title: Purchase
+ :link: https://store.start9.com
:icon: scylla-icon scylla-icon--bitcoin
:class: large-4
:anchor: Buy now
- Learn about how you can purchase Start9 products
+ Buy an Embassy from Start9.
.. topic-box::
- :title: Build your own
- :link: support/user-manual/tuning/diy
+ :title: DIY
+ :link: user-manual/misc-guides/diy
:icon: scylla-icon scylla-icon--integrations
:class: large-4
:anchor: Get started
- Build from source with our DIY guide
+ Build your own Embassy.
.. topic-box::
:title: Service Marketplace
@@ -50,7 +51,7 @@
.. topic-box::
:title: User Manual
- :link: support/user-manual
+ :link: user-manual
:icon: scylla-icon scylla-icon--knowledge-base
:class: large-6
:anchor: View
@@ -76,8 +77,8 @@
Read our FAQ and learn about platform concepts
.. topic-box::
- :title: SDK
- :link: service-packaging
+ :title: Developer Docs
+ :link: developer-docs
:icon: scylla-icon scylla-icon--open-source
:class: large-3
:anchor: View
@@ -112,14 +113,15 @@
.. This is for the side navigation display
.. toctree::
- :maxdepth: 2
+ :maxdepth: 3
:hidden:
+ user-manual/index
support/index
learn/index
contribute/index
about/index
- service-packaging/index
+ developer-docs/index
.. raw:: html
diff --git a/site/source/learn/concepts/open-source.rst b/site/source/learn/concepts/open-source.rst
index c2d39b8..047de81 100644
--- a/site/source/learn/concepts/open-source.rst
+++ b/site/source/learn/concepts/open-source.rst
@@ -23,6 +23,6 @@ Some software has dependencies on other software. Software may even require its
Traditionally, managing dependencies was a massive headache and a huge barrier to running a personal server. But no more! The Embassy's revolutionary dependency management system makes the process transparent and simple.
-If a :ref:`service
` has one or more dependencies, or a dependency needs to be configured in a particular way, your Embassy will inform you and offer solutions.
+If a service has one or more dependencies, or a dependency needs to be configured in a particular way, your Embassy will inform you and offer solutions.
Sometimes, a dependency can be satisfied in multiple ways. For example, Lightning has a dependency on Bitcoin. But that does not necessarily mean you need to have Bitcoin installed on your Embassy. You could just as easily configure Lightning to use another Bitcoin node located somewhere else!
diff --git a/site/source/about/contact.rst b/site/source/support/contact.rst
similarity index 100%
rename from site/source/about/contact.rst
rename to site/source/support/contact.rst
diff --git a/site/source/support/faq/faq-basic-use.rst b/site/source/support/faq/faq-basic-use.rst
index 8dded4d..b43c575 100644
--- a/site/source/support/faq/faq-basic-use.rst
+++ b/site/source/support/faq/faq-basic-use.rst
@@ -23,7 +23,7 @@ Check out the `docs ` for some details on your Embassy. You can now access your Embassy and find the Services you want from the "Marketplace" tab, then clicking "Install." The Service will let you know if you need any "dependencies," or pre-requisite Services, first. After you have a Service installed, don't forget to "Start" the service. Check out :ref:`Services` for more info.
+Check out the :ref:`Dashboard Overview` for some details on your Embassy. You can now access your Embassy and find the Services you want from the "Marketplace" tab, then clicking "Install." The Service will let you know if you need any "dependencies," or pre-requisite Services, first. After you have a Service installed, don't forget to "Start" the service.
Can I move my Embassy to another location? What happens when I do this?
------------------------------------------------------------------------
diff --git a/site/source/support/faq/faq-general.rst b/site/source/support/faq/faq-general.rst
index f3f7efe..bfc658e 100644
--- a/site/source/support/faq/faq-general.rst
+++ b/site/source/support/faq/faq-general.rst
@@ -69,7 +69,7 @@ The .s9pk extension is Start9's custom package format based on tar. It encompass
What are EmbassyOS Services?
----------------------------
-A Service can be any piece of software added to the Marketplace. All services are "self-hosted," meaning that you are in complete control of your data. This means you can run your own "cloud!" Learn more about managing services :ref:`here ` and see our currently :ref:`Available Services `.
+A Service can be any piece of software added to the Marketplace. All services are "self-hosted," meaning that you are in complete control of your data. This means you can run your own "cloud!" Learn more about managing services :ref:`here ` and see our currently `Available Services `_.
Does the Embassy ship worldwide?
--------------------------------
diff --git a/site/source/support/faq/faq-services.rst b/site/source/support/faq/faq-services.rst
index d81af4e..ef0105f 100644
--- a/site/source/support/faq/faq-services.rst
+++ b/site/source/support/faq/faq-services.rst
@@ -33,7 +33,7 @@ To get a general idea of what is required of an app, answer these questions:
If all answers are yes, then it can run on EmbassyOS.
-Packing up a service for the Embassy does not require extensive development skills. If you are interested in doing do, please see our :ref:`Service Packaging Overview `.
+Packing up a service for the Embassy does not require extensive development skills. If you are interested in doing do, please see our :ref:`Developer Docs `.
We are aggressively moving away from service development in favor of a more community driven approach. Meaning you, an app development team, or anyone else on Earth, can bring the Service they want to an Embassy Marketplace. You don't need our permission.
diff --git a/site/source/support/index.rst b/site/source/support/index.rst
index 8d0df2b..1dc0a95 100644
--- a/site/source/support/index.rst
+++ b/site/source/support/index.rst
@@ -4,7 +4,7 @@
Support
=======
- Here you will find help on how to use your devices, answers to frequently asked questions, and documentation for developers.
+ View frequently asked questions, troubleshoot common issues, or contact support.
.. raw:: html
@@ -12,41 +12,32 @@ Support
-.. topic-box::
- :title: User Manual
- :link: user-manual
- :icon: scylla-icon scylla-icon--docs
- :class: large-4
- :anchor: View
-
- All you need to be the owner/operator of your own self-hosted software
-
.. topic-box::
:title: FAQ
:link: faq
:icon: scylla-icon scylla-icon--monitoring
- :class: large-4
- :anchor: Get Answers
+ :class: large-5
+ :anchor: View
Answers to Frequently Asked Questions from Embassy users
.. topic-box::
- :title: Service Packaging
- :link: ../service-packaging
- :icon: scylla-icon scylla-icon--open-source
- :class: large-4
- :anchor: Build
+ :title: Troubleshooting
+ :link: troubleshooting
+ :icon: scylla-icon scylla-icon--monitoring
+ :class: large-5
+ :anchor: View
- Tools and guides for service packagers
+ Explore common problems and their solutions
.. topic-box::
- :title: Community Channels
- :link: ../about/contact
+ :title: Contact
+ :link: contact
:icon: scylla-icon scylla-icon--networking
- :class: large-4
- :anchor: Join us
+ :class: large-5
+ :anchor: Get help
- Network with the community to get help and offer your skills and insights to the cause!
+ Get help from Start9 and the community directly
.. raw:: html
@@ -57,5 +48,6 @@ Support
:maxdepth: 1
:hidden:
- user-manual/index
- faq/index
\ No newline at end of file
+ faq/index
+ troubleshooting/index
+ contact
diff --git a/site/source/support/user-manual/troubleshooting/index.rst b/site/source/support/troubleshooting/index.rst
similarity index 100%
rename from site/source/support/user-manual/troubleshooting/index.rst
rename to site/source/support/troubleshooting/index.rst
diff --git a/site/source/support/user-manual/troubleshooting/shoot-connection.rst b/site/source/support/troubleshooting/shoot-connection.rst
similarity index 100%
rename from site/source/support/user-manual/troubleshooting/shoot-connection.rst
rename to site/source/support/troubleshooting/shoot-connection.rst
diff --git a/site/source/support/user-manual/troubleshooting/shoot-embassy.rst b/site/source/support/troubleshooting/shoot-embassy.rst
similarity index 74%
rename from site/source/support/user-manual/troubleshooting/shoot-embassy.rst
rename to site/source/support/troubleshooting/shoot-embassy.rst
index d42b613..b5b0a76 100644
--- a/site/source/support/user-manual/troubleshooting/shoot-embassy.rst
+++ b/site/source/support/troubleshooting/shoot-embassy.rst
@@ -26,4 +26,4 @@ Software
I'm having an issue with a particular Service
=============================================
-If a Service is crashing or acting up in some way, check the `Documentation
` and `FAQ` for that particular Service. You can also check the `Logs` of a service, which might tell you what the problem is. If that is not helpful, try to restart the service to see if that clears up the issue. If you are still having issues, please reach out in one of our `Community Channels` for immediate assistance, or email support@start9labs.com for help during business hours.
+If a Service is crashing or acting up in some way, check the `Documentation` and `FAQ` for that particular Service. You can also check the `Logs` of a service, which might tell you what the problem is. If that is not helpful, try to restart the service to see if that clears up the issue. If you are still having issues, please reach out in one of our `Community Channels` for immediate assistance, or email support@start9labs.com for help during business hours.
diff --git a/site/source/support/user-manual/configuration/backup-setup/backup-mac.rst b/site/source/support/user-manual/configuration/backup-setup/backup-mac.rst
deleted file mode 100644
index e8da408..0000000
--- a/site/source/support/user-manual/configuration/backup-setup/backup-mac.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-.. _backup-mac:
-
-===
-Mac
-===
-
-There are 2 options for backing up your Embassy and all its service data. You can setup a shared folder on a remote machine, such as a laptop or desktop, or you can backup to a local drive, which must be externally powered or plugged into a powered USB hub before plugging into Embassy.
-
-Remote Backups
---------------
-
-#. Go to system settings
-#. Click sharing
-#. Click file sharing
-#. Click the + under shared folders
-#. Add a folder
-#. Click options
-#. Enable Windows file sharing for the user you would like to use to authenticate
-#. Click done
-#. Enter the name of your macbook, as shown in the computer name field at the top of the sharing page into the hostname field in embassy ui
-#. Enter the name of the folder as shown in the shared folders section as the path
-#. Enter your macbook username and password for the user that you enabled windows file sharing for
-
-Local Backups
--------------
-
-#. With Embassy powered down, plug in your external drive to the powered hub if you are using one, or directly into Embassy's available USB 3.0 (blue) slot if it is externally powered.
-#. Plug in power to your hub or drive
-#. Boot Embassy and go to ``Embassy`` -> ``Create Backup``
-
diff --git a/site/source/support/user-manual/configuration/backup-setup/backup-win.rst b/site/source/support/user-manual/configuration/backup-setup/backup-win.rst
deleted file mode 100644
index 0b51940..0000000
--- a/site/source/support/user-manual/configuration/backup-setup/backup-win.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-.. _backups-win:
-
-=======
-Windows
-=======
-
-There are 2 options for backing up your Embassy and all its service data. You can setup a shared folder on a remote machine, such as a laptop or desktop, or you can backup to a local drive, which must be externally powered or plugged into a powered USB hub before plugging into Embassy.
-
-Remote Backups
---------------
-
-#. Create a folder
-#. Right click the folder
-#. Select "properties"
-#. Click the share tab
-#. Click share...
-#. Select a user you want to use for login, or select everyone
-#. Click share
-#. Enter your computer name into the hostname field in embassy ui (the name is shown after a \\ in the windows ui)
-#. Enter the path that is shown after the hostname in the windows ui into the path field
-#. Enter your username for the windows computer
-#. Enter the password for the windows computer
-
-Local Backups
--------------
-
-#. With Embassy powered down, plug in your external drive to the powered hub if you are using one, or directly into Embassy's available USB 3.0 (blue) slot if it is externally powered.
-#. Plug in power to your hub or drive
-#. Boot Embassy and go to ``Embassy`` -> ``Create Backup``
-
diff --git a/site/source/support/user-manual/configuration/backup-setup/index.rst b/site/source/support/user-manual/configuration/backup-setup/index.rst
deleted file mode 100644
index fd45126..0000000
--- a/site/source/support/user-manual/configuration/backup-setup/index.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. _backup-setup:
-
-=======
-Backups
-=======
-
-In addition to safekeeping of a good master password, maintaining good backups are among the few major responsibilities required to keep the benefits and freedom that come with self-hosting.
-
-.. toctree::
- :maxdepth: 2
-
- backup-lin
- backup-mac
- backup-win
diff --git a/site/source/support/user-manual/configuration/basic-config.rst b/site/source/support/user-manual/configuration/basic-config.rst
deleted file mode 100644
index 56d7c67..0000000
--- a/site/source/support/user-manual/configuration/basic-config.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-.. _basic-config:
-
-===================
-Basic Configuration
-===================
-
-.. .. _auto-reporting:
-
-.. Automatically Report Bugs
-.. -------------------------
-
-.. You are asked at first setup if you would like to provide bug reports to Start9. You can edit that setting here if you change your mind. This data is anonymous and you can see exactly what is collected :ref:`here`.
-
-.. #. As in the :ref:`Set Device Name` steps above, go to the ``Embasssy`` tab, then under ``Settings``, click ``Preferences``
-
-.. #. Click ``Auto Report Bugs`` and either ``Enable`` or ``Disable``
-
-.. .. figure:: /_static/images/config/basic-config3.png
-.. :width: 60%
-.. :alt: Automatically Report Bugs
-
-.. _auto-update:
-
-Automatically Check for Updates
--------------------------------
-
-Automatic check for updates enables you to choose whether you want to be informed of EmbassyOS updates. Enabling this feature makes a request to the Start9 Marketplace to see if a new OS version has been released, and notifies you if so. This request is only made when you log into a new session or refresh your current session.
-
-#. Go to the ``Embasssy`` tab, then under ``Settings``, click ``Preferences``
-
-#. Click ``Automatically Check for Updates`` and either ``Enable`` or ``Disable``
-
- .. figure:: /_static/images/config/basic-config4.png
- :width: 60%
- :alt: Automatically Report Bugs
diff --git a/site/source/support/user-manual/configuration/index.rst b/site/source/support/user-manual/configuration/index.rst
deleted file mode 100644
index 42453b5..0000000
--- a/site/source/support/user-manual/configuration/index.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-.. _config:
-
-=============
-Configuration
-=============
-
-Configuration, setup guides, and known limitations are provided here by device.
-
-.. toctree::
- :maxdepth: 2
-
- basic-config
- backup-setup/index
- tor-setup/index
- lan-setup/index
- wifi
- limitations/index
diff --git a/site/source/support/user-manual/getting-started/device-guides/dg-android.rst b/site/source/support/user-manual/getting-started/device-guides/dg-android.rst
deleted file mode 100644
index 233cf3a..0000000
--- a/site/source/support/user-manual/getting-started/device-guides/dg-android.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-.. _dg-android:
-
-=======
-Android
-=======
-
-.. tip:: Please see Android's :ref:`Known Limitations` to understand what is currently not possible on these devices
-
-
-.. topic-box::
- :title: LAN Setup (Connectivity, Performance)
- :link: https://start9.com/latest/support/user-manual/configuration/lan-setup/lan-android
- :anchor: Setup
-
- For a fast and secure connection while on your Embassy's local network
-
-.. topic-box::
- :title: Tor Setup (Connectivity)
- :link: https://start9.com/latest/support/user-manual/configuration/tor-setup/tor-os/tor-android
- :anchor: Setup
-
- Run Tor natively (in the background) on your device. This will allow you to use applications on your Windows machine via the Tor Network so they can communicate with your Embassy.
-
-.. topic-box::
- :title: Tor Firefox Config (Connectivity)
- :link: https://start9.com/latest/support/user-manual/configuration/tor-setup/tor-firefox/torff-android
- :anchor: Configure
-
- Configure Firefox to use the Tor Network so that you can reach ``.onion`` sites without needing to change browsers.
diff --git a/site/source/support/user-manual/getting-started/device-guides/dg-ios.rst b/site/source/support/user-manual/getting-started/device-guides/dg-ios.rst
deleted file mode 100644
index 91053c1..0000000
--- a/site/source/support/user-manual/getting-started/device-guides/dg-ios.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. _dg-ios:
-
-===
-iOS
-===
-
-.. tip:: Please see iOS's :ref:`Known Limitations` to understand what is currently not possible on these devices
-
-.. topic-box::
- :title: LAN Setup (Connectivity, Performance)
- :link: https://start9.com/latest/support/user-manual/configuration/lan-setup/lan-ios
- :anchor: Setup
-
- For a fast and secure connection while on your Embassy's local network
diff --git a/site/source/support/user-manual/getting-started/device-guides/dg-linux.rst b/site/source/support/user-manual/getting-started/device-guides/dg-linux.rst
deleted file mode 100644
index 5f89d68..0000000
--- a/site/source/support/user-manual/getting-started/device-guides/dg-linux.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-.. _dg-linux:
-
-=====
-Linux
-=====
-
-.. tip:: Please see Linux's :ref:`Known Limitations` to understand what is currently not possible on these devices
-
-.. topic-box::
- :title: LAN Setup (Connectivity, Performance)
- :link: https://start9.com/latest/support/user-manual/configuration/lan-setup/lan-linux
- :anchor: Setup
-
- For a fast and secure connection while on your Embassy's local network
-
-.. topic-box::
- :title: Tor Setup (Connectivity)
- :link: https://start9.com/latest/support/user-manual/configuration/tor-setup/tor-os/tor-linux
- :anchor: Setup
-
- Run Tor natively (in the background) on your device. This will allow you to use applications on your Windows machine via the Tor Network so they can communicate with your Embassy.
-
-.. topic-box::
- :title: Tor Firefox Config (Connectivity)
- :link: https://start9.com/latest/support/user-manual/configuration/tor-setup/tor-firefox/torff-linux
- :anchor: Configure
-
- Configure Firefox to use the Tor Network so that you can reach ``.onion`` sites without needing to change browsers.
-
-.. topic-box::
- :title: Embassy Backups (Resilience)
- :link: https://start9.com/latest/support/user-manual/walkthrough/backup/backup-lin
- :anchor: Backup
-
- Configure remote backups of your Embassy to your Windows machine. **Backups are supremely important** as they ensure redundancy of your data for convenience, as well as preventing loss in case of disaster.
diff --git a/site/source/support/user-manual/getting-started/device-guides/dg-mac.rst b/site/source/support/user-manual/getting-started/device-guides/dg-mac.rst
deleted file mode 100644
index ce53647..0000000
--- a/site/source/support/user-manual/getting-started/device-guides/dg-mac.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-.. _dg-mac:
-
-===
-Mac
-===
-
-.. tip:: Please see Mac's :ref:`Known Limitations` to understand what is currently not possible on these devices
-
-.. topic-box::
- :title: LAN Setup (Connectivity, Performance)
- :link: https://start9.com/latest/support/user-manual/configuration/lan-setup/lan-mac
- :anchor: Setup
-
- For a fast and secure connection while on your Embassy's local network
-
-.. topic-box::
- :title: Tor Setup (Connectivity)
- :link: https://start9.com/latest/support/user-manual/configuration/tor-setup/tor-os/tor-mac
- :anchor: Setup
-
- Run Tor natively (in the background) on your device. This will allow you to use applications on your Windows machine via the Tor Network so they can communicate with your Embassy.
-
-.. topic-box::
- :title: Tor Firefox Config (Connectivity)
- :link: https://start9.com/latest/support/user-manual/configuration/tor-setup/tor-firefox/torff-mac
- :anchor: Configure
-
- Configure Firefox to use the Tor Network so that you can reach ``.onion`` sites without needing to change browsers.
-
-.. topic-box::
- :title: Embassy Backups (Resilience)
- :link: https://start9.com/latest/support/user-manual/walkthrough/backup/backup-mac
- :anchor: Backup
-
- Configure remote backups of your Embassy to your Windows machine. **Backups are supremely important** as they ensure redundancy of your data for convenience, as well as preventing loss in case of disaster.
diff --git a/site/source/support/user-manual/getting-started/device-guides/dg-windows.rst b/site/source/support/user-manual/getting-started/device-guides/dg-windows.rst
deleted file mode 100644
index bd8e9a4..0000000
--- a/site/source/support/user-manual/getting-started/device-guides/dg-windows.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-.. _dg-windows:
-
-=======
-Windows
-=======
-
-.. tip:: Please see Window's :ref:`Known Limitations` to understand what is currently not possible on these devices.
-
-.. topic-box::
- :title: LAN Setup (Connectivity, Performance)
- :link: https://start9.com/latest/support/user-manual/configuration/lan-setup/lan-windows
- :anchor: Setup
-
- For a fast and secure connection while on your Embassy's local network
-
-.. topic-box::
- :title: Tor Setup (Connectivity)
- :link: https://start9.com/latest/support/user-manual/configuration/tor-setup/tor-os/tor-windows
- :anchor: Setup
-
- Run Tor natively (in the background) on your device. This will allow you to use applications on your Windows machine via the Tor Network so they can communicate with your Embassy.
-
-.. topic-box::
- :title: Tor Firefox Config (Connectivity)
- :link: https://start9.com/latest/support/user-manual/configuration/tor-setup/tor-firefox/torff-windows
- :anchor: Configure
-
- Configure Firefox to use the Tor Network so that you can reach ``.onion`` sites without needing to change browsers.
-
-.. topic-box::
- :title: Embassy Backups (Resilience)
- :link: https://start9.com/latest/support/user-manual/walkthrough/backup/backup-win
- :anchor: Backup
-
- Configure remote backups of your Embassy to your Windows machine. **Backups are supremely important** as they ensure redundancy of your data for convenience, as well as preventing loss in case of disaster.
diff --git a/site/source/support/user-manual/getting-started/index.rst b/site/source/support/user-manual/getting-started/index.rst
deleted file mode 100644
index d2b12d1..0000000
--- a/site/source/support/user-manual/getting-started/index.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-.. _getting-started:
-
-===============
-Getting Started
-===============
-
-Take your first steps! If you are setting up your device for the first time, you can also skip straight to :ref:`Initial Setup `.
-
-.. toctree::
- :maxdepth: 2
-
- introduction
- purchasing
- initial-setup
- recover-02
- recover-03
- device-guides/index
diff --git a/site/source/support/user-manual/getting-started/introduction.rst b/site/source/support/user-manual/getting-started/introduction.rst
deleted file mode 100644
index fd9369c..0000000
--- a/site/source/support/user-manual/getting-started/introduction.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-.. _introduction:
-
-============
-Introduction
-============
-
-:ref:`Embassy` is a new kind of personal computer - one that sits quietly on your shelf and runs all day and night. It has no screen and no keyboard. You access your Embassy from anywhere in the world in total, trustless privacy, simply by visiting its unique Tor address (.onion URL) right from the browser.
-
-Embassy is composed of commonly available hardware components that can be sourced and assembled by anyone, anywhere, for a marginal fee. Embassy is powered by :ref:`EmbassyOS`, the open-source operating system by :ref:`Start9`.
-
-So, what do you do with your Embassy? You use it to run services: Bitcoin, Lightning, personal cloud storage, P2P messaging, password management, etc. The list of available services is growing quickly and will eventually encompass the entirety of open-source, self-hosted software.
-
-Every communication between you and your Embassy is end-to-end encrypted and onion routed over the :ref:`Tor network`. All services are open-source and self-hosted, meaning there are no trusted third parties of any kind.
-
-To get an Embassy, you can :ref:`purchase` one directly from Start9, or you can :ref:`build one yourself`.
diff --git a/site/source/support/user-manual/getting-started/purchasing.rst b/site/source/support/user-manual/getting-started/purchasing.rst
deleted file mode 100644
index 574e110..0000000
--- a/site/source/support/user-manual/getting-started/purchasing.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. _purchasing:
-
-==========
-Purchasing
-==========
-
-For maximum convenience, you can purchase an Embassy device, or EmbassyOS, directly from Start9 through our `Shopify Store `_. The device comes in a beautiful box, fully-assembled, and pre-installed with the latest version of :ref:`EmbassyOS`. We do our own hardware assembly and fulfillment, and we only collect the minimal information necessary to fulfill your order. And yes, we accept Bitcoin, as well as Lightning payments.
-
-If you prefer to build your own Embassy, you can follow the :ref:`DIY Guide `.
diff --git a/site/source/support/user-manual/getting-started/recover-03.rst b/site/source/support/user-manual/getting-started/recover-03.rst
deleted file mode 100644
index 0486019..0000000
--- a/site/source/support/user-manual/getting-started/recover-03.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-.. _recover-03x:
-
-===================
-Recover v0.3.x Data
-===================
-
-Recover Embassy Series 0.3.x Data
----------------------------------
-
-This guide will cover how to recover existing EmbassyOS version 0.3.x data.
-
-Recover From Remote Backup
-==========================
-
-
-Recover From Local (External Drive) Backup
-==========================================
diff --git a/site/source/support/user-manual/index.rst b/site/source/support/user-manual/index.rst
deleted file mode 100644
index 4eeca1d..0000000
--- a/site/source/support/user-manual/index.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-.. _user-manual:
-
-===========
-User Manual
-===========
-
-.. toctree::
- :maxdepth: 1
- :hidden:
-
- getting-started/index
- walkthrough/index
- configuration/index
- tuning/index
- services/index
- troubleshooting/index
-
-.. panel-box::
- :title: Overview
- :id: "getting-started"
- :class: my-panel
-
- EmbassyOS is designed to work out of the box with a minimal setup and immediate practicality. That said, there are many use-cases and utilities that can be added and tweaked at your convenience, which are covered extensively in this manual. You can get started right away with :ref:`Initial Setup `, head to our :doc:`Walkthrough ` for a guided tour, or learn about :doc:`Services ` and how to use them. In the :doc:`Configuration ` and :doc:`Tuning ` chapters, you can put your Embassy to work, and make it unique. Finally, you can cure common issues with :doc:`Troubleshooting ` or find answers in our :ref:`FAQ`.
-
- For further information, check out our :ref:`Knowledge Base ` to learn about the technologies behind Embassy. If you want to build your own Embassy, check out the :ref:`DIY Guide`. When you're ready to build, please check out our :ref:`Service Packaging Overview `. Please don't hestitate to :ref:`Contact Us ` if you have any issues, questions, or suggestions.
-
- * :doc:`Getting Started ` - Initial setup and device-specific guides to connect with your Embassy.
- * :doc:`Walkthrough ` - A guided tour of EmbassyOS.
- * :doc:`Services ` - Overview of featured Services and general usage on EmbassyOS.
- * :doc:`Configuration ` - Configure your Embassy to your preference.
- * :doc:`Tuning ` - Customize your Embassy with advanced configuration and external service integrations.
- * :doc:`Troubleshooting ` - Resolve any common issues you may encounter.
diff --git a/site/source/support/user-manual/services/index.rst b/site/source/support/user-manual/services/index.rst
deleted file mode 100644
index 355ff63..0000000
--- a/site/source/support/user-manual/services/index.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-.. _services:
-
-========
-Services
-========
-
-An overview of Services and Marketplaces on EmbassyOS.
-
-.. toctree::
- :maxdepth: 2
-
- marketplace
- managing-services/index
diff --git a/site/source/support/user-manual/services/managing-services/service-donate.rst b/site/source/support/user-manual/services/managing-services/service-donate.rst
deleted file mode 100644
index 705849a..0000000
--- a/site/source/support/user-manual/services/managing-services/service-donate.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-.. _service-donate:
-
-======
-Donate
-======
-
-Currently, this is a link provided by the service package developer so that you may donate to them or the developer of the service they packaged directly. If this is not provided, a pop-up message will let you know this, and you will need to find the devs on their own platforms in order to donate.
-
- .. figure:: /_static/images/services/donate.png
- :width: 60%
-
-.. topic-box::
- :title: Looking Forward
-
- We intend to leverage the power of Embassy's Lightning Network options to create the choice for a user to immediately send sats to a developer. Ideally, this will have a percentage breakdown for the service developer, service packager, and Start9, for the user to delegate their donation as they choose. We are serious about helping to incentivize :ref:`Open Source` development.
diff --git a/site/source/support/user-manual/services/managing-services/service-overview.rst b/site/source/support/user-manual/services/managing-services/service-overview.rst
deleted file mode 100644
index f0299cb..0000000
--- a/site/source/support/user-manual/services/managing-services/service-overview.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-.. _service-overview:
-
-========
-Overview
-========
-
-Services are very similar to Applications on a mobile device. The biggest differences are that they are often designed to run constantly, with 24/7 availability for when a user requires them. This is why they are called :ref:`Services`, they are always ready to serve users!
-
-.. _service-page:
-
-The Service Page
-----------------
-
-.. figure:: /_static/images/services/service8.png
- :width: 60%
-
- The Service Page
-
-In the image above, we see an example of a Service's homescreen, where you can access all the information and utilities of a particular service.
-
-Below, we highlight the quick, need-to-know information of a Service that a user will want to see right away.
-
-.. figure:: /_static/images/services/service00.png
- :width: 60%
-
-.. _service-status:
-
-We can see the Service (Embassy Pages in this case), its ``Status``, ``Health Checks`` (if it has any), ``Dependencies`` (if it has any), and the ability to ``Start`` or ``Stop`` the Service, as well as ``Launch UI`` if it has a :ref:`Web Interface `. Here's a breakdown of what each of these means:
-
- - Status:
- - Needs Config: The Service needs your attention in making a configuration decision. There will always be default options available to you.
- - Stopping... : Service is being stopped
- - Stopped: Service is installed and configured, but not currently running.
- - Starting... : Service is booting up
- - Running: Service is running
- - Health Checks: This is a critical feature of EmbassyOS. Health Checks are configured by the service packager in order to quickly convey to the user what is happening with their service, and possible actions they may want to take. Learn more about :ref:`Health Checks `.
- - Dependencies: A service may require another service, called a dependency, in order to work. These may be optional, or required. Learn more about :ref:`Dependencies `.
- - Start / Stop: Self-explanatory, use these buttons to start or stop a service.
- - Launch UI: If available, this will open the User Interface (UI) for the service in a new browser tab. Learn more about :ref:`Web UIs`.
diff --git a/site/source/support/user-manual/services/marketplace.rst b/site/source/support/user-manual/services/marketplace.rst
deleted file mode 100644
index c42fb0e..0000000
--- a/site/source/support/user-manual/services/marketplace.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-.. _service-marketplace:
-
-===========
-Marketplace
-===========
-
-Embassy Marketplace
--------------------
-
-We now have a fully interactive, live `Marketplace `_!! Visit now to see currently available services and get a feel for the ecosystem!
-
-Community Wishlist
-------------------
-
-You can visit the `Embassy: Voice `_ unofficial feedback forum to see what the Community are asking for and make your own suggestions!
-
-You can also make suggestions on our `Github Discussions `_ forum.
diff --git a/site/source/support/user-manual/tuning/advanced-config/index.rst b/site/source/support/user-manual/tuning/advanced-config/index.rst
deleted file mode 100644
index e16b6a8..0000000
--- a/site/source/support/user-manual/tuning/advanced-config/index.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. _advanced-config:
-
-===============
-Advanced Config
-===============
-
-Custom options for folks that "know what they're doing."
-
-.. toctree::
- :maxdepth: 2
-
- ssh-setup
- ssh-tor
- alt-marketplace
diff --git a/site/source/support/user-manual/tuning/index.rst b/site/source/support/user-manual/tuning/index.rst
deleted file mode 100644
index 292f470..0000000
--- a/site/source/support/user-manual/tuning/index.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-.. _tuning:
-
-======
-Tuning
-======
-
-Here, you can customize your Embassy with advanced configuration, setup external tools, migrate from old projects, or build your own Embassy from scratch.
-
-.. toctree::
- :maxdepth: 2
-
- diy
- advanced-config/index
- tune-embassy-os
- service-guides/index
diff --git a/site/source/support/user-manual/walkthrough/index.rst b/site/source/support/user-manual/walkthrough/index.rst
deleted file mode 100644
index ca410cd..0000000
--- a/site/source/support/user-manual/walkthrough/index.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-.. _walkthrough:
-
-===========
-Walkthrough
-===========
-
-An overview of EmbassyOS general capabilities.
-
-.. toctree::
- :maxdepth: 2
-
- overview
- updates
- backups
- password
- sessions
-
-
diff --git a/site/source/support/user-manual/tuning/advanced-config/alt-marketplace.rst b/site/source/user-manual/alt-marketplaces.rst
similarity index 91%
rename from site/source/support/user-manual/tuning/advanced-config/alt-marketplace.rst
rename to site/source/user-manual/alt-marketplaces.rst
index 1ca47f0..99ffe43 100644
--- a/site/source/support/user-manual/tuning/advanced-config/alt-marketplace.rst
+++ b/site/source/user-manual/alt-marketplaces.rst
@@ -1,8 +1,8 @@
-.. _alt-marketplace:
+.. _alt-marketplaces:
-===============
-Alt Marketplace
-===============
+================
+Alt Marketplaces
+================
EmbassyOS supports accessing alternative marketplaces.
diff --git a/site/source/support/user-manual/walkthrough/backups.rst b/site/source/user-manual/backups/backup-create.rst
similarity index 63%
rename from site/source/support/user-manual/walkthrough/backups.rst
rename to site/source/user-manual/backups/backup-create.rst
index 2884dec..9e0f415 100644
--- a/site/source/support/user-manual/walkthrough/backups.rst
+++ b/site/source/user-manual/backups/backup-create.rst
@@ -1,15 +1,20 @@
-.. _backups:
+.. _backup-create:
-==============
-Making Backups
-==============
+================
+Creating Backups
+================
-There are 2 options for backing up your Embassy and all its service data. You can setup a shared folder on a remote machine, such as a laptop, desktop, or external drive on your network, or you can backup to a local drive, which must be externally powered or plugged into a powered USB hub before plugging into Embassy.
+There are 2 options for backing up your Embassy and service data:
-.. note:: For remote backups, you will first need to configure the machine you want to backup to. Check our :ref:`Backup Setup` guide for your OS first.
+1. Use a Shared Network Folder (recommended) on another device that connected to the same network as your Embassy, such as a laptop/desktop or external drive that is plugged into your laptop/desktop.
+2. Use a physical drive, which must be externally powered or plugged into a powered USB hub.
-Remote Backups
---------------
+Shared Network Folder
+---------------------
+
+This is the recommended approach for creating backups.
+
+#. Follow instructions for creating a :ref:`Shared Network Folder` on your laptop/desktop.
#. Go to the :ref:`Embassy tab`, then click on ``Create Backup``.
@@ -48,13 +53,11 @@ Remote Backups
.. figure:: /_static/images/config/embassy_backup4.png
:width: 60%
-Local Backups
--------------
+Physical Drive
+--------------
-#. With Embassy powered down, plug in your external drive to the powered hub if you are using one, or directly into Embassy's available USB 3.0 (blue) slot if it is externally powered.
+#. If your drive is self-powered, you can plug it directly into your Embassy USB 3.0 (blue) slot. If not, first plug the drive into a powered USB hub, then plug the hub into your Embassy USB 3.0 slot.
-#. Plug in power to your hub or drive
+#. Go to ``Embassy`` -> ``Create Backup``
-#. Boot Embassy and go to ``Embassy`` -> ``Create Backup``
-
-#.
+#. Select the drive
diff --git a/site/source/user-manual/backups/backup-restore.rst b/site/source/user-manual/backups/backup-restore.rst
new file mode 100644
index 0000000..b59e49a
--- /dev/null
+++ b/site/source/user-manual/backups/backup-restore.rst
@@ -0,0 +1,5 @@
+.. _backup-restore:
+
+===================
+Restore From Backup
+===================
\ No newline at end of file
diff --git a/site/source/support/user-manual/configuration/backup-setup/backup-lin.rst b/site/source/user-manual/backups/cifs-setup/cifs-linux.rst
similarity index 96%
rename from site/source/support/user-manual/configuration/backup-setup/backup-lin.rst
rename to site/source/user-manual/backups/cifs-setup/cifs-linux.rst
index 8ff66d5..eec7e4a 100644
--- a/site/source/support/user-manual/configuration/backup-setup/backup-lin.rst
+++ b/site/source/user-manual/backups/cifs-setup/cifs-linux.rst
@@ -1,12 +1,9 @@
-.. _backup-lin:
+.. _cifs-lin:
=====
Linux
=====
-Remote Backups
---------------
-
The following will guide you through the prerequisite configuration to backup to a Linux machine or an external drive that is attached to a Linux machine.
.. tabs::
diff --git a/site/source/user-manual/backups/cifs-setup/cifs-mac.rst b/site/source/user-manual/backups/cifs-setup/cifs-mac.rst
new file mode 100644
index 0000000..e11e128
--- /dev/null
+++ b/site/source/user-manual/backups/cifs-setup/cifs-mac.rst
@@ -0,0 +1,20 @@
+.. _cifs-mac:
+
+===
+Mac
+===
+
+The following will guide you through the prerequisite configuration to backup to a Mac machine or an external drive that is attached to a Mac machine.
+
+#. Go to system settings
+#. Click sharing
+#. Click file sharing
+#. Click the + under shared folders
+#. Add a folder
+#. Click options
+#. Enable Windows file sharing for the user you would like to use to authenticate
+#. Click done
+#. Enter the name of your macbook, as shown in the computer name field at the top of the sharing page into the hostname field in embassy ui
+#. Enter the name of the folder as shown in the shared folders section as the path
+#. Enter your macbook username and password for the user that you enabled windows file sharing for
+
diff --git a/site/source/user-manual/backups/cifs-setup/cifs-windows.rst b/site/source/user-manual/backups/cifs-setup/cifs-windows.rst
new file mode 100644
index 0000000..f6657f9
--- /dev/null
+++ b/site/source/user-manual/backups/cifs-setup/cifs-windows.rst
@@ -0,0 +1,19 @@
+.. _cifs-win:
+
+=======
+Windows
+=======
+
+The following will guide you through the prerequisite configuration to backup to a Windows machine or an external drive that is attached to a Windows machine.
+
+#. Create a folder
+#. Right click the folder
+#. Select "properties"
+#. Click the share tab
+#. Click share...
+#. Select a user you want to use for login, or select everyone
+#. Click share
+#. Enter your computer name into the hostname field in embassy ui (the name is shown after a \\ in the windows ui)
+#. Enter the path that is shown after the hostname in the windows ui into the path field
+#. Enter your username for the windows computer
+#. Enter the password for the windows computer
diff --git a/site/source/user-manual/backups/cifs-setup/index.rst b/site/source/user-manual/backups/cifs-setup/index.rst
new file mode 100644
index 0000000..44d104f
--- /dev/null
+++ b/site/source/user-manual/backups/cifs-setup/index.rst
@@ -0,0 +1,14 @@
+.. _cifs-setup:
+
+===========================
+Shared Network Folder Setup
+===========================
+
+Click your platform for detailed instructions on how to create a Shared Network Folder.
+
+.. toctree::
+ :maxdepth: 2
+
+ cifs-linux
+ cifs-mac
+ cifs-windows
diff --git a/site/source/user-manual/backups/index.rst b/site/source/user-manual/backups/index.rst
new file mode 100644
index 0000000..9900659
--- /dev/null
+++ b/site/source/user-manual/backups/index.rst
@@ -0,0 +1,52 @@
+.. _backups:
+
+=======
+Backups
+=======
+
+In addition to safekeeping of a good master password, maintaining good backups are among the few major responsibilities required to keep the benefits and freedom that come with self-hosting.
+
+.. raw:: html
+
+
+
+
+
+.. topic-box::
+ :title: Create
+ :link: backup-create
+ :icon: scylla-icon scylla-icon--memory-management
+ :class: large-5
+ :anchor: View
+
+ Create an encrypted backup of Embassy.
+
+.. topic-box::
+ :title: Restore
+ :link: backup-restore
+ :icon: scylla-icon scylla-icon--comparison
+ :class: large-5
+ :anchor: View
+
+ Restore Embassy from a previous backup.
+
+.. topic-box::
+ :title: SNF Setup
+ :link: cifs-setup/index
+ :icon: scylla-icon scylla-icon--networking
+ :class: large-5
+ :anchor: Setup
+
+ Setup a Shared Network Folder on your laptop/desktop.
+
+.. raw:: html
+
+
+
+
+
+.. topic-box::
+ :title: LAN
+ :link: lan-setup
+ :icon: scylla-icon scylla-icon--home
+ :class: large-5
+ :anchor: Setup
+
+ Connect to Embassy over your Local Area Network.
+
+.. topic-box::
+ :title: Tor
+ :link: tor-setup
+ :icon: scylla-icon scylla-icon--tor
+ :class: large-5
+ :anchor: Setup
+
+ Connect to Embassy over the Tor network.
+
+.. raw:: html
+
+