commit bfc5679ac60504f94b65020d97e9a4286e247aeb Author: emma peel emma.peel@riseup.net Date: Fri Jun 25 17:02:54 2021 +0200

update instructions for preferences, add instructions for windows. will-fix: https://gitlab.torproject.org/tpo/web/manual/-/issues/57. this merge contains work done by GoodieC on https://github.com/torproject/manual/pull/82, https://github.com/torproject/manual/pull/81 and https://github.com/torproject/manual/pull/80. --- content/bridges/contents.lr | 4 ++-- content/circumvention/contents.lr | 2 +- content/plugins/contents.lr | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/bridges/contents.lr b/content/bridges/contents.lr index a94ad62..92ab4ab 100644 --- a/content/bridges/contents.lr +++ b/content/bridges/contents.lr @@ -33,7 +33,7 @@ If you're starting Tor Browser for the first time, click "Configure" to open the After checking the checkbox "Tor is censored in my country," choose "Request a bridge from torproject.org" and click "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" in the hamburger menu and then on "Tor" in the sidebar. +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, check 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.

@@ -47,7 +47,7 @@ If you're starting Tor Browser for the first time, click "Configure" to open the After checking the checkbox "Tor is censored in my country," choose "Provide a bridge I know" 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" in the hamburger menu and then on "Tor" in the sidebar. +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, check the checkbox "Use a bridge," and from the option "Provide a bridge I know," enter each bridge address on a separate line. Your settings will automatically be saved once you close the tab.

diff --git a/content/circumvention/contents.lr b/content/circumvention/contents.lr index 2b98024..d3245e8 100644 --- a/content/circumvention/contents.lr +++ b/content/circumvention/contents.lr @@ -54,7 +54,7 @@ After checking the checkbox "Tor is censored in my country," choose the "Select 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. +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, 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.

diff --git a/content/plugins/contents.lr b/content/plugins/contents.lr index b0379dd..66bae53 100644 --- a/content/plugins/contents.lr +++ b/content/plugins/contents.lr @@ -19,7 +19,7 @@ Some video websites (such as YouTube) offer alternative video delivery methods t

JavaScript is a programming language that websites use to offer interactive elements such as video, animation, audio, and status timelines. Unfortunately, JavaScript can also enable attacks on the security of the browser, which might lead to deanonymization.

-Tor Browser includes an add-on called NoScript. It's accessible through 'Preferences' on hamburger menu (main menu), then select 'Customize' and drag the “S” icon to the top-right of the window. NoScript allows you to control the JavaScript (and other scripts) that runs on individual web pages, or block it entirely. +Tor Browser includes an add-on called NoScript. It's accessible through "Preferences" (or "Options" on Windows) on the [hamburger menu (≡)](https://support.torproject.org/glossary/hamburger-menu/), then select 'Customize' and drag the “S” icon to the top-right of the window. NoScript allows you to control the JavaScript (and other scripts) that runs on individual web pages, or block it entirely.

Users who require a high degree of security in their web browsing should set Tor Browser’s [Security Level](../security-settings/) to “Safer” (which disables JavaScript for non-HTTPS websites) or “Safest” (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browser’s default setting is to allow all websites to run scripts in "Standard" mode.