More updates

source/user-manual/configuration/tor-setup/tor-firefox/index.rst

@@ -1,13 +1,12 @@
 .. _tor-firefox:
 
-********************
+====================
 Using Tor on Firefox
-********************
+====================
 
-.. warning::
-  This guide assumes you are already :ref:`running Tor on your phone or computer<running-tor>`.
+.. caution::  This guide assumes you are already :ref:`running Tor on your phone or computer<running-tor>`.
 
-Once you have completed the above guide, select your device's operating system below:
+Once you have completed native :ref:`Tor Setup<tor-os>`, you can configure :ref:`Firefox<firefox>` to use the Tor Network.  This will allow you to visit both ``.onion`` and "normal" (.com, .net, etc) websites from within the same browser.
 
 .. toctree::
   :maxdepth: 2

source/user-manual/configuration/tor-setup/tor-firefox/torff-android.rst

@@ -1,5 +1,47 @@
 .. _torff-android:
 
-*******
-Android
-*******
+=======
+Android - ***NEEDS UPDATED***
+=======
+
+.. warning::
+  This guide assumes you have completed :ref:`setting up Tor for Android<tor-android>`. Please visit this section before proceeding as it is required for Firefox to properly work with Tor.
+
+Once Tor is setup on your system, you can proceed to setup Firefox:
+
+1. Download `Firefox Beta <https://play.google.com/store/apps/details?id=org.mozilla.firefox_beta>`_ from the Play Store, or `Fennec <https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/>`_ from F-Droid.
+
+2. Next, download a `Proxy Auto Config` file that will use Orbot to resolve `.onion` URLs. We have one hosted `here <https://registry.start9labs.com/sys/proxy.pac>`_.
+
+3. Navigate to ``about:config`` in the Firefox URL bar.
+
+.. figure:: /_static/images/tor/about_config.png
+  :width: 50%
+  :alt: Firefox about config
+
+4. You are going to have to change a few options in here. First, type ``network.proxy.type`` into the search bar, and set the value to ``2``.
+
+.. figure:: /_static/images/tor/network_proxy_type.png
+  :width: 50%
+  :alt: Firefox network proxy type setting screenshot
+
+5. Search for ``network.proxy.autoconfig_url``, and set the value to ``file:///storage/emulated/0/Download/proxy.pac``.
+
+.. figure:: /_static/images/tor/autoconfig_url.png
+  :width: 50%
+  :alt: Firefox autoconfig url setting screenshot
+
+6. Search for ``network.proxy.socks_remote_dns``, and set the value to ``true``.
+
+.. figure:: /_static/images/tor/socks_remote_dns.png
+  :width: 50%
+  :alt: Firefox socks remote dns setting screenshot
+
+7. Search for ``dom.securecontext.whitelist_onions`` and set the value to ``true``.
+
+.. figure:: /_static/images/tor/firefox_whitelist_mobile.png
+  :width: 50%
+  :alt: Firefox whitelist onions screenshot
+
+8. Restart Firefox, and you’re all set! You should now be able to navigate to `.onion` URLs in Firefox. This means you can bookmark Cups Messenger, and use your Bitwarden Tor address in the `Bitwarden Password Manager <https://play.google.com/store/apps/details?id=com.x8bit.bitwarden&hl=en_US&gl=US>`_ native application.
+

source/user-manual/configuration/tor-setup/tor-firefox/torff-ios.rst

@@ -1,5 +1,17 @@
 .. _torff-ios:
 
-***
-iOS
-***
+===
+iOS -***NEEDS UPDATED***
+===
+
+NO TOR FOR YOU
+
+.. _firefox-tor-ios:
+
+**********************************
+Setting up Firefox with Tor on iOS
+**********************************
+
+Unfortunately, Apple does not allow tor to be run natively on iOS.  This means that Firefox cannot be configured to use tor.  This leaves the following options for iOS users:
+
+You can use Start9's own Consulate Browser, which is available `here <https://apps.apple.com/us/app/start9-consulate-browser/id1528124570>`_, or you can select another Tor Browser by searching the `App Store <https://www.apple.com/us/search/onion-browser?src=serp>`_.

source/user-manual/configuration/tor-setup/tor-firefox/torff-linux.rst

@@ -1,5 +1,95 @@
 .. _torff-linux:
 
-*****
-Linux
-*****
+=====
+Linux - ***NEEDS UPDATED***
+=====
+
+
+.. warning::
+  This guide assumes you have completed :ref:`setting up Tor<running-tor>`. Please visit this section first before you proceed as it is required for Firefox to properly work with Tor.
+
+1. Open Firefox.
+
+2. Enter ``about:config`` in the URL bar. Accept any warnings that may appear about accessing advanced settings.
+
+3. Search for ``dom.securecontext.whitelist_onions`` and set the value to ``true``.
+
+   .. figure:: /_static/images/tor/firefox_whitelist.png
+    :width: 80%
+    :alt: Firefox whitelist onions screenshot
+
+4. Download a `Proxy Auto Config` file to inform Firefox how to use the Tor daemon running on your computer. You can get Start9's standard file by following the OS-specific instructions below:
+    Windows:
+
+    Click `here <https://registry.start9labs.com/sys/proxy.pac>`_ to get the file and save the file somewhere you won’t delete it.  Please remember the location you save the file in if you do not use our example location.  For this example:
+
+    .. code-block::
+
+      C:\Program Files\Tor Browser\proxy.pac
+
+    Mac:
+
+    Open the ``Terminal`` App on your Mac. You can find it in your list of Applications.  In the terminal, enter:
+
+    .. code-block::
+
+      brew install wget
+
+    And then:
+
+    .. code-block::
+
+      wget -P /usr/local/etc/tor https://registry.start9labs.com/sys/proxy.pac
+
+    Linux:
+
+    From a terminal, enter:
+
+    .. code-block::
+
+      sudo wget -P /etc/tor https://registry.start9labs.com/sys/proxy.pac
+
+
+5. Now open your Firefox web browser, and select options (Windows), or preferences (Mac/Linux):
+
+   .. figure:: /_static/images/tor/firefox_options_windows.png
+    :width: 80%
+    :alt: Firefox options screenshot
+
+    Select :menuselection:``Settings --> Options``
+
+
+6. Search for the term “proxy” in the search bar in the upper right, then select the button that says ``Settings…``:
+
+   .. figure:: /_static/images/tor/firefox_search.png
+    :width: 80%
+    :alt: Firefox search screenshot
+
+7. This should open a menu that will allow you to configure your proxy settings. Select ``Automatic proxy configuration URL`` and paste in the path to your PAC file from earlier, prefixed with ``file://``. For example:
+    Windows:
+
+    .. code-block::
+
+      file://C:/Program Files/Tor Browser/proxy.pac
+
+    Mac:
+
+    .. code-block::
+
+      file:///usr/local/etc/tor/proxy.pac
+
+    Linux:
+
+    .. code-block::
+
+      file:///etc/tor/proxy.pac
+
+8. Then, check the box labeled ``Proxy DNS when using SOCKS v5``:
+
+   .. figure:: /_static/images/tor/firefox_proxy.png
+    :width: 80%
+    :alt: Firefox proxy settings screenshot
+
+9. Click ``OK`` and then restart Firefox for the changes to take effect.
+
+10. You’re all set! You should now be able to navigate to ``.onion`` URLs in Firefox. This means you can bookmark Cups Messenger, and use your Bitwarden Tor address in the `Bitwarden Firefox Plugin <https://addons.mozilla.org/en-US/firefox/addon/bitwarden-password-manager/>`_.

source/user-manual/configuration/tor-setup/tor-firefox/torff-mac.rst

@@ -1,15 +1,95 @@
 .. _torff-mac:
 
-***
-Mac
-***
+===
+Mac - ***NEEDS UPDATED***
+===
 
-.. _torff-new-mac:
 
-Newer Mac (M1)
-==============
+.. warning::
+  This guide assumes you have completed :ref:`setting up Tor<running-tor>`. Please visit this section first before you proceed as it is required for Firefox to properly work with Tor.
 
-.. _torff-old-mac:
+1. Open Firefox.
 
-Older Mac
-=========
+2. Enter ``about:config`` in the URL bar. Accept any warnings that may appear about accessing advanced settings.
+
+3. Search for ``dom.securecontext.whitelist_onions`` and set the value to ``true``.
+
+   .. figure:: /_static/images/tor/firefox_whitelist.png
+    :width: 80%
+    :alt: Firefox whitelist onions screenshot
+
+4. Download a `Proxy Auto Config` file to inform Firefox how to use the Tor daemon running on your computer. You can get Start9's standard file by following the OS-specific instructions below:
+    Windows:
+
+    Click `here <https://registry.start9labs.com/sys/proxy.pac>`_ to get the file and save the file somewhere you won’t delete it.  Please remember the location you save the file in if you do not use our example location.  For this example:
+
+    .. code-block::
+
+      C:\Program Files\Tor Browser\proxy.pac
+
+    Mac:
+
+    Open the ``Terminal`` App on your Mac. You can find it in your list of Applications.  In the terminal, enter:
+
+    .. code-block::
+
+      brew install wget
+
+    And then:
+
+    .. code-block::
+
+      wget -P /usr/local/etc/tor https://registry.start9labs.com/sys/proxy.pac
+
+    Linux:
+
+    From a terminal, enter:
+
+    .. code-block::
+
+      sudo wget -P /etc/tor https://registry.start9labs.com/sys/proxy.pac
+
+
+5. Now open your Firefox web browser, and select options (Windows), or preferences (Mac/Linux):
+
+   .. figure:: /_static/images/tor/firefox_options_windows.png
+    :width: 80%
+    :alt: Firefox options screenshot
+
+    Select :menuselection:``Settings --> Options``
+
+
+6. Search for the term “proxy” in the search bar in the upper right, then select the button that says ``Settings…``:
+
+   .. figure:: /_static/images/tor/firefox_search.png
+    :width: 80%
+    :alt: Firefox search screenshot
+
+7. This should open a menu that will allow you to configure your proxy settings. Select ``Automatic proxy configuration URL`` and paste in the path to your PAC file from earlier, prefixed with ``file://``. For example:
+    Windows:
+
+    .. code-block::
+
+      file://C:/Program Files/Tor Browser/proxy.pac
+
+    Mac:
+
+    .. code-block::
+
+      file:///usr/local/etc/tor/proxy.pac
+
+    Linux:
+
+    .. code-block::
+
+      file:///etc/tor/proxy.pac
+
+8. Then, check the box labeled ``Proxy DNS when using SOCKS v5``:
+
+   .. figure:: /_static/images/tor/firefox_proxy.png
+    :width: 80%
+    :alt: Firefox proxy settings screenshot
+
+9. Click ``OK`` and then restart Firefox for the changes to take effect.
+
+10. You’re all set! You should now be able to navigate to ``.onion`` URLs in Firefox. This means you can bookmark Cups Messenger, and use your Bitwarden Tor address in the `Bitwarden Firefox Plugin <https://addons.mozilla.org/en-US/firefox/addon/bitwarden-password-manager/>`_.

source/user-manual/configuration/tor-setup/tor-firefox/torff-windows.rst

@@ -1,5 +1,96 @@
 .. _torff-windows:
 
-*******
-Windows
-*******
+=======
+Windows - *** NEEDS UPDATED***
+=======
+
+
+.. warning::
+  This guide assumes you have completed :ref:`setting up Tor<running-tor>`. Please visit this section first before you proceed as it is required for Firefox to properly work with Tor.
+
+1. Open Firefox.
+
+2. Enter ``about:config`` in the URL bar. Accept any warnings that may appear about accessing advanced settings.
+
+3. Search for ``dom.securecontext.whitelist_onions`` and set the value to ``true``.
+
+   .. figure:: /_static/images/tor/firefox_whitelist.png
+    :width: 80%
+    :alt: Firefox whitelist onions screenshot
+
+4. Download a `Proxy Auto Config` file to inform Firefox how to use the Tor daemon running on your computer. You can get Start9's standard file by following the OS-specific instructions below:
+    Windows:
+
+    Click `here <https://registry.start9labs.com/sys/proxy.pac>`_ to get the file and save the file somewhere you won’t delete it.  Please remember the location you save the file in if you do not use our example location.  For this example:
+
+    .. code-block::
+
+      C:\Program Files\Tor Browser\proxy.pac
+
+    Mac:
+
+    Open the ``Terminal`` App on your Mac. You can find it in your list of Applications.  In the terminal, enter:
+
+    .. code-block::
+
+      brew install wget
+
+    And then:
+
+    .. code-block::
+
+      wget -P /usr/local/etc/tor https://registry.start9labs.com/sys/proxy.pac
+
+    Linux:
+
+    From a terminal, enter:
+
+    .. code-block::
+
+      sudo wget -P /etc/tor https://registry.start9labs.com/sys/proxy.pac
+
+
+5. Now open your Firefox web browser, and select options (Windows), or preferences (Mac/Linux):
+
+   .. figure:: /_static/images/tor/firefox_options_windows.png
+    :width: 80%
+    :alt: Firefox options screenshot
+
+    Select :menuselection:``Settings --> Options``
+
+
+6. Search for the term “proxy” in the search bar in the upper right, then select the button that says ``Settings…``:
+
+   .. figure:: /_static/images/tor/firefox_search.png
+    :width: 80%
+    :alt: Firefox search screenshot
+
+7. This should open a menu that will allow you to configure your proxy settings. Select ``Automatic proxy configuration URL`` and paste in the path to your PAC file from earlier, prefixed with ``file://``. For example:
+    Windows:
+
+    .. code-block::
+
+      file://C:/Program Files/Tor Browser/proxy.pac
+
+    Mac:
+
+    .. code-block::
+
+      file:///usr/local/etc/tor/proxy.pac
+
+    Linux:
+
+    .. code-block::
+
+      file:///etc/tor/proxy.pac
+
+8. Then, check the box labeled ``Proxy DNS when using SOCKS v5``:
+
+   .. figure:: /_static/images/tor/firefox_proxy.png
+    :width: 80%
+    :alt: Firefox proxy settings screenshot
+
+9. Click ``OK`` and then restart Firefox for the changes to take effect.
+
+10. You’re all set! You should now be able to navigate to ``.onion`` URLs in Firefox. This means you can bookmark Cups Messenger, and use your Bitwarden Tor address in the `Bitwarden Firefox Plugin <https://addons.mozilla.org/en-US/firefox/addon/bitwarden-password-manager/>`_.
+

source/user-manual/configuration/tor-setup/tor-os/tor-linux.rst

@@ -9,15 +9,12 @@ Debian / Ubuntu
 
 For Debian and Debian-based systems, such as Mint, PopOS etc.
 
-#. Install the Tor proxy service to your system. To do so, open your terminal and run the following command:
+Install the Tor proxy service to your system. To do so, open your terminal and run the following command:
 
-   .. code-block:: bash
+.. code-block:: bash
 
     sudo apt update && sudo apt install tor
 
-#. That's it! Your Linux machine is now setup to natively use Tor.
-
-
 Arch
 ----
 

source/user-manual/tuning/advanced-config/alt-marketplace.rst

@@ -1,6 +1,6 @@
-***********************
-Alternative Marketplace
-***********************
+=======================
+Alternative Marketplace - ***NEEDS UPDATED***
+=======================
 
 EmbassyOS supports accessing alternative marketplaces by configuring a system file. Start9 is not responsible for issues encountered by downloading services from alternative marketplaces.
 
@@ -18,4 +18,4 @@ To revert this change, simply delete the file::
 
     sudo systemctl stop agent
     sudo rm /root/agent/alt_registry_url.txt
-    sudo systemctl start agent
+    sudo systemctl start agent

source/user-manual/tuning/diy.rst

@@ -1,8 +1,8 @@
 .. _diy:
 
-*********
+=========
 DIY Guide
-*********
+=========
 
 .. figure:: /_static/images/diy/pi.png
   :width: 40%
@@ -13,7 +13,7 @@ DIY Guide
 By popular demand, we are pleased to present this "Do it Yourself" (DIY) guide for the Start9 Embassy personal server!
 
 Motivation
-==========
+----------
 
 There are four reasons you might prefer to build your own Embassy instead of purchasing one from us.
 
@@ -28,10 +28,10 @@ There are four reasons you might prefer to build your own Embassy instead of pur
 #. You just like building things.
 
 Building an Embassy
-===================
+-------------------
 
 Hardware: Components
---------------------
+....................
 
 #. `Raspberry Pi 4B (8GB) <https://raspberrypi.org/products/raspberry-pi-4-model-b/?variant=raspberry-pi-4-model-b-8gb>`_
 #. `Power supply for Raspberry Pi 4B <https://raspberrypi.org/products/type-c-power-supply/>`_ Make sure this is at minimum 15w and 3.5a.
@@ -45,7 +45,7 @@ Hardware: Components
 `*` If you use a fan, **DO NOT** use the official Raspberry Pi fan, as it requires the same GPIO pins as the audio speaker. Instead, we recommend `this fan <https://www.amazon.com/Raspberry-iUniker-30x30x7mm-Brushless-RetroFlag/dp/B076H3TKBP/>`_.
 
 Hardware: Assembly Instructions
--------------------------------
+...............................
 
 #. Insert mini speaker/buzzer into GPIO pins 6/8/10/12 with the word "speaker" facing out, `away from the board`.
 
@@ -56,15 +56,18 @@ Hardware: Assembly Instructions
 #. Place the Raspberry Pi 4 board (with speaker attached), into its case.
 #. Plug in the external drive to one of the USB 3.0 (blue) slots
 
+Getting EmbassyOS
+-----------------
+
 Getting EmbassyOS: Purchasing
------------------------------
+.............................
 
 You can purchase EmbassyOS `here <https://store.start9.com/collections/embassy/products/embassyos-software-download>`_. This is by far the easiest path to get up and running.
 
 Depending on your Internet speed, the download should take between 5 and 30 minutes.
 
-Getting EmbassyOS: Building from Source
----------------------------------------
+Getting EmbassyOS: Building from Source
+.......................................
 
 ***Placehodler for build guide - either link to GH or duplicate here.  Probably duplicate to keep all docs centralized to this repo - https://github.com/Start9Labs/embassy-os/tree/integration/0.3.0/build***
 

source/user-manual/tuning/embassy-os.rst

@@ -1,6 +1,15 @@
 .. _tune-embassy-os:
 
-*********************
+=====================
 Customizing EmbassyOS
-*********************
+=====================
 
+Rename Device
+-------------
+
+Duplicate in walkthrough, probably move to here
+
+Reorder Service Page
+--------------------
+
+Customize Services layout

source/user-manual/tuning/index.rst

@@ -1,8 +1,8 @@
-******
+======
 Tuning
-******
+======
 
-An overview of EmbassyOS general capabilities.
+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

source/user-manual/tuning/migrating.rst

@@ -1,8 +1,10 @@
 .. _migrating:
 
-********************
+====================
 Migrating To Embassy
-********************
+====================
 
 From Umbrel
-===========
+-----------
+
+Dreadlocked

source/user-manual/tuning/service-guides/bitcoin.rst

@@ -1,15 +1,15 @@
 .. _bitcoin:
 
-*******
+=======
 Bitcoin
-*******
+=======
 
 Here you will find guides on how to connect different kinds of Bitcoin wallets (hardware and software) to your Embassy node, to complete your sovereign Bitcoin stack!
 
 .. _bitcoin-cli:
 
 Using Bitcoin-Cli
-=================
+-----------------
 
 Instructions for accessing the bitcoind service in order to issue commands directly.
 
@@ -35,14 +35,14 @@ and then enter ``bitcoin-cli`` commands.  When you are finished, simply type ``e
 .. _fully-noded:
 
 FullyNoded
-==========
+----------
 
 .. _sparrow:
 
 Sparrow
-=======
+-------
 
 .. _specter:
 
 Specter
-=======
+-------

source/user-manual/tuning/service-guides/index.rst

@@ -1,8 +1,8 @@
-***********************
+=======================
 Service-Specific Guides
-***********************
+=======================
 
-An overview of EmbassyOS general capabilities.
+These guides will help you to setup external tools to connect or interact with specific :ref:`Services<services>`, such as a chat client or :ref:`Bitcoin<bitcoin>` wallet.
 
 .. toctree::
   :maxdepth: 2

source/user-manual/tuning/service-guides/matrix.rst

@@ -1,6 +1,7 @@
 .. _matrix:
 
-******
+======
 Matrix
-******
+======
 
+https://www.youtube.com/watch?v=PtwQsybFapo

source/user-manual/tuning/service-guides/vaultwarden.rst

@@ -1,6 +1,7 @@
 .. _vaultwarden:
 
-***********
+===========
 Vaultwarden
-***********
+===========
 
+https://www.youtube.com/watch?v=YcxxVHpm9j0