add instructions for connection assist and new bridges ui

content/bridges/contents.lr

@@ -27,26 +27,25 @@ Because bridge addresses are not public, you will need to request them yourself.
 
 ### USING MOAT
 
-If you're starting Tor Browser for the first time, click "Tor Network Settings" to open the Tor settings window.
-Under the "Bridges" section, select the checkbox "Use a bridge", then choose "Request a bridge from torproject.org" and click "Request a Bridge..." for BridgeDB to provide a bridge.
+If you're starting Tor Browser for the first time, click on "Configure Connection" to open the Tor settings window.
+Under the "Bridges" section, locate "Request a bridge from torproject.org" and click on "Request a Bridge..." for BridgeDB to provide a bridge.
 Complete the Captcha and click "Submit". Click "Connect" to save your settings.
 
-Or, if you have Tor Browser running, click on "Preferences" (or "Options" on Windows) in the [hamburger menu (≡)](https://support.torproject.org/glossary/hamburger-menu/) and then on "Tor" in the sidebar.
-In the "Bridges" section, select the checkbox "Use a bridge", and from the option "Request a bridge from torproject.org", click "Request a New Bridge..." for BridgeDB to provide a bridge.
-Complete the Captcha and click "Submit". Your setting will automatically be saved once you close the tab.
+Or, if you have Tor Browser running, click on "Settings" in the [hamburger menu (≡)](https://support.torproject.org/glossary/hamburger-menu/) and then on "Connection" in the sidebar.
+In the "Bridges" section, locate "Request a bridge from torproject.org" and click on "Request a Bridge..." for BridgeDB to provide a bridge. Complete the Captcha and click "Submit". Your setting will automatically be saved once you close the tab.
 
-<img class="col-md-6" src="../../static/images/request-a-bridge.png" alt="Request a bridge from torproject.org">
+![Request a bridge from torproject.org](/static/images/alpha-request-bridge.png)
 
 ### ENTERING BRIDGE ADDRESSES
 
-If you're starting Tor Browser for the first time, click "Tor Network Settings" to open the Tor settings window.
-Under the "Bridges" section, select the checkbox "Use a bridge", choose "Provide a bridge I know" and enter each bridge address on a separate line.
+If you're starting Tor Browser for the first time, click "Configure Connection" to open the Tor settings window.
+Under the "Bridges" section, from the option "Enter a bridge address you already know" click on "Add a Bridge Manually" and enter each bridge address on a separate line.
 Click "Connect" to save your settings.
 
-Or, if you have Tor Browser running, click on "Preferences" (or "Options" on Windows) in the [hamburger menu (≡)](https://support.torproject.org/glossary/hamburger-menu/) and then on "Tor" in the sidebar.
-In the "Bridges" section, select the checkbox "Use a bridge", and from the option "Provide a bridge I know", enter each bridge address on a separate line.
+Or, if you have Tor Browser running, click on "Settings" in the [hamburger menu (≡)](https://support.torproject.org/glossary/hamburger-menu/) and then on "Connection" in the sidebar.
+In the "Bridges" section, from the option "Enter a bridge address you already know" click on "Add a Bridge Manually" and enter each bridge address on a separate line.
 Your settings will automatically be saved once you close the tab.
 
-<img class="col-md-6" src="../../static/images/tor-launcher-custom-bridges.png" alt="Enter custom bridge addresses">
+![Enter bridge addresses manually](/static/images/alpha-input-bridge.png)
 
 If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again.

content/circumvention/contents.lr

@@ -49,15 +49,18 @@ meek
 
 ### USING PLUGGABLE TRANSPORTS
 
-To use a pluggable transport, click "Tor Network Settings" when starting Tor Browser for the first time.
-Under the "Bridges" section, select the checkbox "Use a bridge" and choose the "Select a built-in bridge" option.
-From the dropdown, select whichever pluggable transport you'd like to use.
+To use a pluggable transport, click "Configure Connection" when starting Tor Browser for the first time.
+Under the "Bridges" section, locate the option "Choose from Tor Browser's one of built-in bridges" and click on "Select a Built-In Bridge" option.
+From the menu, select whichever pluggable transport you'd like to use.
+
 Once you've selected the pluggable transport, scroll up and click "Connect" to save your settings.
 
-Or, if you have Tor Browser running, click on "Preferences" (or "Options" on Windows) in the [hamburger menu (≡)](https://support.torproject.org/glossary/hamburger-menu/) and then on "Tor" in the sidebar.
-In the "Bridges" section, select the checkbox "Use a bridge", and from the option "Select a built-in bridge", choose whichever pluggable transport you'd like to use from the dropdown.
+Or, if you have Tor Browser running, click on "Settings" in the [hamburger menu (≡)](https://support.torproject.org/glossary/hamburger-menu/) and then on "Connection" in the sidebar.
+In the "Bridges" section, locate the option "Choose from Tor Browser's one of built-in bridges" and click on "Select a Built-In Bridge" option. Choose whichever pluggable transport you'd like to use from the menu.
 Your settings will automatically be saved once you close the tab.
 
+![Configure built-in bridges](/static/images/alpha-built-in-bridge.png)
+
 
 ### WHICH TRANSPORT SHOULD I USE?
 

content/running-tor-browser/contents.lr

@@ -21,27 +21,42 @@ There's a checkbox which asks whether you always want to get automatically conne
 In most cases, choosing "Connect" will allow you to connect to the Tor network without any further configuration.
 
 Once clicked, a status bar will appear, showing Tor's connection progress.
-If you are on a relatively fast connection, but this bar seems to get stuck at a certain point, see the [Troubleshooting](../troubleshooting) page for help solving the problem.
+If you are on a relatively fast connection, but this bar seems to get stuck at a certain point, try the 'Connection Assist' or see the [Troubleshooting](../troubleshooting) page for help solving the problem.
 Or, if you know that your connection is censored or uses a proxy, you should click on "Tor Network Settings".
 
 <img class="col-md-6" src="../../static/images/configure.png" alt="Click 'Tor Network Settings' to adjust network settings.">
 
+### CONNECTION ASSIST
+
+If Tor is blocked in your location, trying a bridge may help. Connection Assist can choose one for you using your location.
+
+![Connection Assist automatic](/static/images/alpha-connection-assist-auto.png)
+
+If Connection Assist is unable to determine your location or you want to configure your connection manually instead, you can select your region from the dropdown menu and click on 'Try a Bridge'.
+
+![Connection Assist configuration](/static/images/alpha-connection-assist-select.png)
+
 ### CONFIGURE
 
 Tor Browser will take you through a series of configuration options.
 
-The first checkbox is Quickstart. If selected, every time you open Tor Browser, it will try to connect with your previous network settings.
+The Connection Assist informs you about the state of your internet connection and your connection to the Tor network.
 
-The second checkbox asks if you want to use a bridge. If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, select "Use a bridge".
+![Connection Test success](/static/images/alpha-connection-test-success.png)
+![Connection Test unsuccessful](/static/images/alpha-connection-test-failure.png)
 
-<img class="col-md-6" src="../../static/images/pluggable-transport.png" alt="Configure Tor bridge options">
+The first checkbox is 'Quickstart'. If selected, every time you open Tor Browser, it will try to connect with your previous network settings.
 
-This will display the [Circumvention](../circumvention) section to configure a pluggable transport or to connect using [Bridges](../bridges).
+![Quickstart](/static/images/alpha-quickstart.png)
+
+If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, you can configure Tor Browser to use a pluggable transport. 'Bridges' will display the [Circumvention](../circumvention) section to configure a pluggable transport or to connect using [Bridges](../bridges).
+
+![Configure Tor bridge](/static/images/alpha-bridge.png)
 
 ### OTHER OPTIONS
 
-The third checkbox asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to select this checkbox because the same settings will be used for other browsers on your system.
+If your connection uses a proxy you can configure it by clicking on 'Settings ...' against 'Configure how Tor Browser connects to the internet'. In most cases, this is not necessary. You will usually know if you need to select this checkbox because the same settings will be used for other browsers on your system.
 If possible, ask your network administrator for guidance.
 If your connection does not use a proxy, click "Connect".
 
-<img class="col-md-6" src="../../static/images/proxy.png" alt="Configure proxy options">
+![Proxy settings for Tor Browser](/static/images/alpha-tb-proxy.png)

content/troubleshooting/contents.lr

@@ -35,7 +35,7 @@ In most cases, taking a look at the Tor logs can be helpful in diagnosing the is
 If you’re having trouble connecting, an error message may appear and you can select the option to "copy Tor log to clipboard".
 Then paste the Tor log into a text file or other document.
 
-If you don't see this option and you have Tor Browser open, you can navigate to the hamburger menu ("≡"), then click on "Preferences", and finally on "Tor" in the side bar.
+If you don't see this option and you have Tor Browser open, you can navigate to the hamburger menu ("≡"), then click on "Settings", and finally on "Connection" in the side bar.
 At the bottom of the page, next to the "View the Tor logs" text, click the button "View Logs...".
 
 Alternatively, on GNU/Linux, to view the logs right in the terminal, navigate to the Tor Browser directory and launch the Tor Browser from the command line by running: