Lan/tor fixes (#265)

* fix mac lan pictures and instructions, fix brave instructions

* remove number

* fix windows firefox tor proxy settings image

* fix mac system-wide tor proxy instructions

* replace screenshot, remove note about using sudo to install homebrew

* ventura system-wide instructions

* better system-prefs picture

* better applyproxy image

* better applyproxy image still

* forgot highlights in one picture

* better explain about two different interfaces

* typo

* change 'options' to 'settings' in windows firefox instructions and update picture

* remove k0gen's name

* remove family from pics

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

@@ -11,13 +11,6 @@ Whenever you are connected the same Local Area Network (LAN) as your Embassy (i.
 Download Root CA
 ----------------
 
-Video Guide:
-
-  .. youtube:: aZYGVFBicbs
-    :width: 100%
-
-
-
 First, download your Embassy's Root CA. There are two way to accomplish this:
 
 Option 1

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

@@ -8,7 +8,7 @@ Trust Embassy CA in Brave
 
 .. tabs::
 
-    .. group-tab:: Linux / macOS
+    .. group-tab:: Linux
 
         #. Open a new tab in Brave and open to "Settings" from the top-right hamburger menu.
 
@@ -116,3 +116,7 @@ Trust Embassy CA in Brave
             .. figure:: /_static/images/ssl/windows/windows_certificates_caimport_step9.jpg
               :width: 40%
               :alt: Windows Certificates CA Cert Import Step 9
+
+    .. group-tab:: Mac
+
+       No additional setup is required for Brave on MacOS

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

@@ -4,19 +4,20 @@
 Trusting Embassy CA on Mac
 ==========================
 
-Video Guide:
-   .. youtube:: sErA23Ii5To 
-    :width: 100%
+#. In your Embassy, head to *System* -> *Lan* -> click *Download Certificate* and save it to your Mac.
 
-#. Locate your Embassy's Root CA, right click, then click *Open with > Keychain Access*.
-
-    .. figure:: /_static/images/ssl/embassy_lan_setup1.png
+    .. figure:: /_static/images/ssl/macos/mac-lan-setup0.png
         :width: 60%
         :alt: LAN setup prompt
 
+#. Locate the certificate and double click it.
+
+    .. figure:: /_static/images/ssl/macos/mac-lan-setup1.png
+        :width: 60%
+
 #. In the resulting  box, choose "System" from the "Keychain" dropdown menu.  Then click "Add."
 
-    .. figure:: /_static/images/ssl/macos/mac-lan-setup0.png
+    .. figure:: /_static/images/ssl/macos/mac-lan-setup2.png
         :width: 60%
         :alt: System Keychain
 

site/source/user-manual/connecting/connecting-tor/tor-firefox/torff-windows.rst

@@ -22,7 +22,7 @@ Configuring Firefox for Tor on Windows
 
       C:\Program Files\Tor Browser\proxy.pac
 
-#. Now, back in your Firefox web browser, select "Options" from the right-hand hamburger menu:
+#. Now, back in your Firefox web browser, select "Settings" from the right-hand hamburger menu:
 
     .. figure:: /_static/images/tor/firefox_options_windows.png
       :width: 60%
@@ -42,7 +42,7 @@ Configuring Firefox for Tor on Windows
 
 #. Then, check the box labeled "Proxy DNS when using SOCKS v5":
 
-    .. figure:: /_static/images/tor/firefox_proxy.png
+    .. figure:: /_static/images/tor/firefox_proxy_windows.png
       :width: 60%
       :alt: Firefox proxy settings screenshot
 

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

@@ -13,8 +13,6 @@ Install Homebrew
 
         /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
 
-    .. note:: On new (M1) Macs, you might need to be root for this in which case add ``sudo`` at the front of the command, with a space before ``/bin/bash``
-
 #. You will be prompted for your system password before installation; proceed with entering your password.  You may be asked more than once.
 
     .. figure:: /_static/images/tor/install_homebrew.png
@@ -56,11 +54,9 @@ This will start Tor and ensure that it is always running, even after a restart.
 Enable Tor System-wide
 ----------------------
 
-#. Now enable apache service:
+.. tabs::
 
-    .. code-block::
-
-        sudo launchctl load -w /System/Library/LaunchDaemons/org.apache.httpd.plist
+    .. group-tab:: Ventura
 
         #. Enable proxy autoconfig file (This will download the Start9 standard proxy config file. You can use your own if you prefer):
 
@@ -68,7 +64,45 @@ Enable Tor System-wide
 
                 sudo curl https://registry.start9labs.com/sys/proxy.pac --output /Library/WebServer/Documents/proxy.pac
 
-#. Go to system preferences:
+        #. Go to System Settings:
+
+            .. figure:: /_static/images/tor/systemSettings.png
+                :width: 40%
+                :alt: System Preferences
+
+        #. Click on *Network* and then select the interface on which you wish to enable Tor system-wide (both Ethernet and WiFi advised - do one then the other):
+
+            .. figure:: /_static/images/tor/ventura-settings.png
+                :width: 80%
+                :alt: Select Network
+
+        #. Click *Details*:
+
+            .. figure:: /_static/images/tor/ventura-network-advanced.png
+                :width: 80%
+                :alt: Click Advanced
+
+        #. Select *Proxies*, toggle *Automatic proxy configuration* and enter **file:////Library/WebServer/Documents/proxy.pac** then click *OK*:
+
+            .. figure:: /_static/images/tor/ventura-proxies.png
+                :width: 80%
+                :alt: Select Proxys
+
+        Done! You have now enabled system-wide Tor potential.
+
+        We advise going back to step three and repeating this for Wifi/Ethernet depending on which interface you haven't done yet.
+
+        If you'd like to setup Firefox to use Tor you can follow  :ref:`this guide<torff-mac>`.
+
+    .. group-tab:: Pre-Ventura
+
+        #. Enable proxy autoconfig file (This will download the Start9 standard proxy config file. You can use your own if you prefer):
+
+            .. code-block::
+
+                sudo curl https://registry.start9labs.com/sys/proxy.pac --output /Library/WebServer/Documents/proxy.pac
+
+        #. Go to System Preferences:
 
             .. figure:: /_static/images/tor/systemprefs.png
                 :width: 40%
@@ -80,7 +114,7 @@ Enable Tor System-wide
                 :width: 80%
                 :alt: Select Network
 
-#. In this example, we'll select WiFi on the left panel. If you're using Ethernet, click that instead. Next click "Advanced":
+        #. In this example, we'll select WiFi on the left panel. If you're using Ethernet, click that instead. Next click "Advanced" (We suggest returning to this step in order to do both Ethernet AND WiFi):
 
             .. figure:: /_static/images/tor/wifi_click_advanced.png
                 :width: 80%
@@ -92,7 +126,7 @@ Enable Tor System-wide
                 :width: 80%
                 :alt: Select Proxys
 
-#. Select "Automatic Proxy Configuration", add this URL: http://localhost/proxy.pac then click "OK"
+        #. Select "Automatic Proxy Configuration", add this URL: **file:////Library/WebServer/Documents/proxy.pac** then click "OK"
 
             .. figure:: /_static/images/tor/entertorproxyURL.png
                 :width: 80%
@@ -106,4 +140,6 @@ Enable Tor System-wide
 
         Done! You have now enabled system-wide Tor potential.
 
+        We suggest heading back to Step 4 and enabling Tor system-wide on Ethernet/WiFi now - whichever you did not do already.
+
         If you'd like to setup Firefox to use Tor you can follow  :ref:`this guide<torff-mac>`.