GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit b254534a authored by emma peel's avatar emma peel

fixed links, also one sentence per line

parent c4a2ee3c
......@@ -49,9 +49,14 @@ meek
### USING PLUGGABLE TRANSPORTS
To use a pluggable transport, click "Configure" when starting Tor Browser for the first time. After checking the checkbox "Tor is censored in my country," choose the "Select a built-in bridge" option. From the dropdown, select whichever pluggable transport you'd like to use. Once you've selected the pluggable transport, click "Connect" to save your settings.
To use a pluggable transport, click "Configure" when starting Tor Browser for the first time.
After checking the checkbox "Tor is censored in my country," choose the "Select a built-in bridge" option.
From the dropdown, select whichever pluggable transport you'd like to use.
Once you've selected the pluggable transport, click "Connect" to save your settings.
Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check 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. Your setting will automatically be saved once you close the tab.
Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar.
In the "Bridges" section, check 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.
Your settings will automatically be saved once you close the tab.
### WHICH TRANSPORT SHOULD I USE?
......@@ -62,4 +67,4 @@ If you are trying to circumvent a blocked connection for the first time, you sho
If you try all of these options, and none of them gets you online, you will need to request a bridge or manually enter bridge addresses.
Read the [Bridges](/en-US/bridges/) section to learn what bridges are and how to obtain them.
Read the [Bridges](../bridges/) section to learn what bridges are and how to obtain them.
......@@ -68,7 +68,7 @@ When you run Tor Browser for the first time, you will see the option to connect
In most cases, choosing "Connect" will allow you to connect to the Tor network without any further configuration.
Once clicked, changing sentences will appear at the bottom of the screen, indicating Tor’s connection progress.
If you are on a relatively fast connection, but this text seems to get stuck at a certain point, see the [Troubleshooting](https://tb-manual.torproject.org/troubleshooting) page for help solving the problem.
If you are on a relatively fast connection, but this text seems to get stuck at a certain point, see the [Troubleshooting](../troubleshooting) page for help solving the problem.
#### Configure
......@@ -78,7 +78,7 @@ If you know that your connection is censored, you should select the settings ico
Tor Browser will take you through a series of configuration options.
The first screen asks if access to the Tor network is blocked or censored on your connection.
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, click the switch.
You will then be taken to the [Circumvention](/mobile-tor/#circumvention) screen to configure a pluggable transport.
You will then be taken to the [Circumvention](../circumvention) screen to configure a pluggable transport.
### CIRCUMVENTION
......@@ -97,7 +97,7 @@ With the "Select a bridge" option, you will have two options: "obfs4" and "meek-
<img style="max-width:300px" class="col-md-6" src="../../static/images/android-selected-a-bridge.png" alt="Selected a bridge on Tor Browser for Android">
If you choose the "Provide a Bridge I know" option, then you have to enter a [bridge address](https://tb-manual.torproject.org/bridges/).
If you choose the "Provide a Bridge I know" option, then you have to enter a [bridge address](../bridges/).
<img style="max-width:300px" class="col-md-6" src="../../static/images/android-provide-a-bridge.png" alt="Provide a bridge on Tor Browser for Android">
......@@ -119,7 +119,7 @@ Selecting it will only change your Tor circuit.
<img style="max-width:300px" class="col-md-6" src="../../static/images/android-security-settings.gif" alt="Security settings and security slider on Tor Browser for Android">
[Security settings](https://tb-manual.torproject.org/security-settings/) disable certain web features that can be used to attack your security and anonymity.
[Security settings](../security-settings/) disable certain web features that can be used to attack your security and anonymity.
Tor Browser for Android provides the same three security levels that are available on desktop.
You can modify the security level by following given steps:
......
......@@ -40,4 +40,6 @@ This will display the [Circumvention](../circumvention) section to configure a p
<img class="col-md-6" src="../../static/images/proxy.png">
The second checkbox asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to check 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”.
The second checkbox asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to check 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”.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment