commit 6b72c63a6a9ee7b675a6d83113308b0c704dbdf5
Author: kulsoomzahra <[email protected]>
Date: Wed Jul 7 11:46:35 2021 +0530
Tor Browser launcher removal
---
assets/static/images/configure.png | Bin 19559 -> 242075 bytes
assets/static/images/connect.png | Bin 19565 -> 244088 bytes
assets/static/images/pluggable-transport.png | Bin 17010 -> 288263 bytes
assets/static/images/proxy.png | Bin 17987 -> 270622 bytes
assets/static/images/proxy_question.png | Bin 9105 -> 0 bytes
assets/static/images/request-a-bridge.png | Bin 17195 -> 320144 bytes
.../static/images/tor-launcher-custom-bridges.png | Bin 19072 -> 329884 bytes
content/bridges/contents.lr | 14 ++++++--------
content/circumvention/contents.lr | 8 ++++----
content/running-tor-browser/contents.lr | 16 ++++++++--------
10 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/assets/static/images/configure.png
b/assets/static/images/configure.png
index f29b8b9..53a108c 100644
Binary files a/assets/static/images/configure.png and
b/assets/static/images/configure.png differ
diff --git a/assets/static/images/connect.png b/assets/static/images/connect.png
index a93939c..2db3f93 100644
Binary files a/assets/static/images/connect.png and
b/assets/static/images/connect.png differ
diff --git a/assets/static/images/pluggable-transport.png
b/assets/static/images/pluggable-transport.png
index ff44ba8..0cb2cbf 100644
Binary files a/assets/static/images/pluggable-transport.png and
b/assets/static/images/pluggable-transport.png differ
diff --git a/assets/static/images/proxy.png b/assets/static/images/proxy.png
index 9e234c7..f905dbb 100644
Binary files a/assets/static/images/proxy.png and
b/assets/static/images/proxy.png differ
diff --git a/assets/static/images/proxy_question.png
b/assets/static/images/proxy_question.png
deleted file mode 100644
index ec45f1c..0000000
Binary files a/assets/static/images/proxy_question.png and /dev/null differ
diff --git a/assets/static/images/request-a-bridge.png
b/assets/static/images/request-a-bridge.png
index 21bcd53..dc4728b 100644
Binary files a/assets/static/images/request-a-bridge.png and
b/assets/static/images/request-a-bridge.png differ
diff --git a/assets/static/images/tor-launcher-custom-bridges.png
b/assets/static/images/tor-launcher-custom-bridges.png
index f1ef64b..354665f 100644
Binary files a/assets/static/images/tor-launcher-custom-bridges.png and
b/assets/static/images/tor-launcher-custom-bridges.png differ
diff --git a/content/bridges/contents.lr b/content/bridges/contents.lr
index 92ab4ab..45235f5 100644
--- a/content/bridges/contents.lr
+++ b/content/bridges/contents.lr
@@ -29,26 +29,24 @@ Because bridge addresses are not public, you will need to
request them yourself.
<img class="col-md-6" align="right" hspace="5"
src="../../static/images/request-a-bridge.png" alt="Request a bridge from
torproject.org">
-If you're starting Tor Browser for the first time, click "Configure" to open
the Tor Network Settings window.
-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.
+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.
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, 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.
+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.
### ENTERING BRIDGE ADDRESSES
<img class="col-md-6" align="right" hspace="5"
src="../../static/images/tor-launcher-custom-bridges.png" alt="Enter custom
bridge addresses">
-Once you have obtained some bridge addresses, you will need to enter them into
Tor Launcher.
-
-If you're starting Tor Browser for the first time, click "Configure" to open
the Tor Network Settings window.
-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.
+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.
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, check the checkbox "Use a bridge," and from the
option "Provide a bridge I know," enter each bridge address on a separate line.
+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.
Your settings will automatically be saved once you close the tab.
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.
diff --git a/content/circumvention/contents.lr
b/content/circumvention/contents.lr
index d3245e8..84a9d00 100644
--- a/content/circumvention/contents.lr
+++ b/content/circumvention/contents.lr
@@ -49,13 +49,13 @@ 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.
+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.
-Once you've selected the pluggable transport, click "Connect" to save your
settings.
+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, 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.
+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.
Your settings will automatically be saved once you close the tab.
diff --git a/content/running-tor-browser/contents.lr
b/content/running-tor-browser/contents.lr
index 708d277..cdf167b 100644
--- a/content/running-tor-browser/contents.lr
+++ b/content/running-tor-browser/contents.lr
@@ -11,7 +11,8 @@ key: 4
body:
When you run Tor Browser for the first time, you will see the Tor Network
Settings window.
-This offers you the option to connect directly to the Tor network, or to
configure Tor Browser for your connection.
+This offers you the option to either connect directly to the Tor network, or
to configure Tor Browser for your connection. There's a checkbox which asks
whether you always want to get automatically connected to the Tor network, if
this is the case, check the box.
+
### CONNECT
@@ -23,9 +24,9 @@ If you are on a relatively fast connection, but this bar
seems to get stuck at a
### CONFIGURE
-<img class="col-md-6" src="../../static/images/configure.png" alt="Click
'configure' to adjust network settings.">
+<img class="col-md-6" src="../../static/images/configure.png" alt="Click 'Tor
Network Settings' to adjust network settings.">
-If you know that your connection is censored or uses a proxy, you should
select this option.
+If you know that your connection is censored or uses a proxy, you should
select "Tor Network Settings".
<img class="col-md-6" src="../../static/images/proxy_question.png" alt="Select
options for censored connection or proxy use.">
@@ -33,13 +34,12 @@ Tor Browser will take you through a series of configuration
options.
<img class="col-md-6" src="../../static/images/pluggable-transport.png"
alt="Configure Tor bridge options">
-The first checkbox asks if access to the Tor network is blocked or censored on
your connection.
-If you do not believe this is the case, leave this unchecked.
-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, check the
checkbox.
+The first checkbox is Quickstart. Every time you open Tor Browser, it will try
to connect with your previous network settings.
+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, check the checkbox.
This will display the [Circumvention](../circumvention) section to configure a
pluggable transport.
<img class="col-md-6" src="../../static/images/proxy.png" alt="Configure proxy
options">
-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.
+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 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â.
+If your connection does not use a proxy, click âConnectâ.
\ No newline at end of file
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
