clarify lan-tor setup

site/source/user-manual/configuring-ff.rst

@@ -3,13 +3,13 @@
 ===================
 Configuring Firefox 
 ===================
-Firefox is a privacy-focused browser that can be configured to resolve LAN (`.local`) URLs and Tor (`.onion`) URLs without affecting normal browser functionality. We highly recommend using Firefox for connecting to your server and its installed services.
+Firefox is the only browser that can be configured to access both LAN (`.local`) and Tor (`.onion`) URLs, including extensions, without affecting normal browser functionality. We highly recommend using Firefox for connecting to your server and its installed services.
 
-.. note:: For iOS, we recommend Safari instead of Firefox. That is because on iOS, all browsers use Safari under the hood anyway, so it is preferable not to stack unnecessary software on top of it.
+.. note:: For iOS, we recommend using Safari instead of Firefox. That is because on iOS, all browsers must use Safari under the hood, so it is preferable not to stack unnecessary software on top of it.
 
 Select your OS:
 
 - :ref:`Linux <ff-linux>`
 - :ref:`Mac <ff-mac>`
 - :ref:`Windows <ff-windows>`
-- :ref:`Android <ff-android>`
+- :ref:`Android (Firefox Beta) <ff-android>`

site/source/user-manual/connecting-lan.rst

@@ -11,9 +11,20 @@ All clients
 
 #. Follow instructions to :ref:`trust your server's Root CA<trust-ca>`
 
-Windows Only
+If using Firefox (recommended)
+------------------------------
+#. Complete the "Local" portion for your OS. Use Safari for iOS.
+
+- :ref:`Linux <ff-linux>`
+- :ref:`Mac <ff-mac>`
+- :ref:`Windows <ff-windows>`
+- :ref:`Android <ff-android>`
+
+.. _connecting-lan-windows:
+
+Windows only
 ------------
-On Windows, it is currently necessary to install Bonjour Print Services in order to access the `.local` URLs of your installed services. With the release of StartOS v0.4.0, it will no longer be necessary.
+On Windows, it is necessary to install Bonjour Print Services in order to access the `.local` URLs of your installed services. In a future release of StartOS, this will no longer be necessary.
 
 #. Simply install Bonjour Print Services from Apple: https://support.apple.com/kb/DL999
 

site/source/user-manual/connecting-tor.rst

@@ -3,13 +3,12 @@
 ===================
 Connecting Remotely
 ===================
-You can connect to your server from anywhere in the world, privately and anonymously, by using its unique Tor Address (`.onion` URL)
+You can connect to your server and installed services from anywhere in the world, privately and anonymously, by using their unique Tor (`.onion`) URLs
 
 .. note:: It is normal for Tor connections to be slow or unreliable at times
 
 Running Tor on Your Phone/Computer (Recommended)
 ------------------------------------------------
-
 Select your OS:
 
 - :ref:`Linux <tor-linux>`
@@ -18,8 +17,17 @@ Select your OS:
 - :ref:`Android <tor-android>`
 - :ref:`iOS <tor-ios>`
 
-Using a Tor Browser
--------------------
+Using Firefox (recommended)
+------------------------------
+#. Complete the "Tor" portion for your OS. Use Safari for iOS
+
+- :ref:`Linux <ff-linux>`
+- :ref:`Mac <ff-mac>`
+- :ref:`Windows <ff-windows>`
+- :ref:`Android <ff-android>`
+
+Using the Tor Browser
+---------------------
 Using the official Tor Browser allows you to access `.onion` URLs without additional configuration. However, accessing clearnet (`.com`, `.org`, ect) websites will also be routed over Tor, making them slower, and `.local` URLs cannot be accessed at all.
 
 Linux, Mac, Windows, Android

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

@@ -4,9 +4,16 @@
 Initial Setup
 =============
 
+#. If using Firefox (*highly recommended*) to connect to your server, you must complete the "Local" portion for your OS. For iOS, use Safari:
+
+    - :ref:`Linux <ff-linux>`
+    - :ref:`Mac <ff-mac>`
+    - :ref:`Windows <ff-windows>`
+    - :ref:`Android <ff-android>`
+
 #. 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
+#. From a client device (desktop/laptop/phone), open a browser (Firefox recommended) and visit ``http://start.local``. Your client device 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. This is known as "Kiosk mode".
 
@@ -18,8 +25,9 @@ Troubleshooting
 ---------------
 If you are experiencing issues with setup, try the following:
 
-#. Confirm that the server is plugged into both power `and` Ethernet      
+#. Confirm that the server is plugged into both power `and` Ethernet
 #. Confirm your phone/computer is `not` connected to a "Guest" network
+#. If using Firefox (recommended) from Mac, Windows or Android, ensure you have set ``security.enterprise_roots.enable`` to ``true`` in ``about:config`` per the :ref:`instructions<configuring-ff>`
 #. Confirm your phone/computer is not using a VPN, or that if you are, that it allows LAN connections, such as the examples below:
 
     - Mullvad - Go to "Settings -> VPN Settings -> Local Network Sharing"

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

@@ -6,33 +6,42 @@ Trusting Your Root CA
 
 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.
 
+.. warning:: If using Firefox (recommended), ensure you have completed the "Local" portion for your OS:
+	:ref:`Linux <ff-linux>`,
+	:ref:`Mac <ff-mac>`,
+	:ref:`Windows <ff-windows>`,
+	:ref:`Android <ff-android>`
+
 .. _download-root-ca:
 
-Downloading Root CA
-===================
+1. Downloading
+==============
+There are multiple ways to obtain your server's 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.
+a. After Initial Setup
+----------------------
+To download and trust your Root CA following initial setup, simply follow the on-screen instructions
 
 		.. figure:: /_static/images/setup/trust-ca.png
 			:width: 40%
 			:alt: Trust your Root CA
 
-From StartOS-info.html File
-----------------------------
+		.. note:: You can click "SKIP" to forego trusting your Root CA (not recommended) and then manually bypass the browser's security warning.
 
+b. 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
--------------
+c. Sending to yourself
+----------------------
+Once you have downloaded your Root CA on any device, you can simply send the file to yourself using email, messaging app, or other file sharing technique.
 
+d. In StartOS UI
+----------------
 You can find your server's Root CA inside the StartOS dashboard.
 
 	#. Navigate to `System > Root CA` and click `Download Certificate`
@@ -43,9 +52,8 @@ You can find your server's Root CA inside the StartOS dashboard.
 
 .. _trust-root-ca:
 
-Establishing Trust
-==================
-
+2. Trusting
+===========
 To trust your Root CA, select your operating system and follow the guide:
 
 - :ref:`Linux <ca-linux>`