[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [webwml/master] bridges: update screenshots (#25218)



commit 8f83e72cabd40cf2a68fa2f27c4d396d2d605439
Author: traumschule <traumschuleriebau@xxxxxxxxxx>
Date:   Sat Nov 3 06:11:28 2018 +0100

    bridges: update screenshots (#25218)
---
 docs/en/bridges.wml                                | 152 ++++++++++++++-------
 .../tb-tor-launcher-bootstrap-failed-obfs.png      | Bin 0 -> 18988 bytes
 .../bridges/tb-tor-launcher-bootstrap-failed.png   | Bin 0 -> 28650 bytes
 images/bridges/tb-tor-launcher-bootstrap.png       | Bin 0 -> 20534 bytes
 images/bridges/tb-tor-launcher-bridges-options.png | Bin 0 -> 37996 bytes
 .../bridges/tb-tor-launcher-bridges-provided.png   | Bin 0 -> 29757 bytes
 images/bridges/tb-tor-launcher-bridges.png         | Bin 0 -> 25193 bytes
 .../bridges/tb-tor-launcher-network-settings.png   | Bin 0 -> 14463 bytes
 images/bridges/tb-tor-launcher-obfs4.png           | Bin 0 -> 25469 bytes
 images/bridges/tb-tor-launcher-provide-bridge.png  | Bin 0 -> 27856 bytes
 images/bridges/tb-tor-launcher-proxy.png           | Bin 0 -> 29185 bytes
 .../tb-tor-launcher-request-bridges-captcha.png    | Bin 0 -> 152798 bytes
 .../tb-tor-launcher-request-bridges-connect.png    | Bin 0 -> 38885 bytes
 .../tb-tor-launcher-request-bridges-success.png    | Bin 0 -> 37151 bytes
 images/bridges/tb-tor-launcher-request-bridges.png | Bin 0 -> 26623 bytes
 images/bridges/tb-tor-launcher-startup.png         | Bin 0 -> 27362 bytes
 images/tb-bridge-networksettings.png               | Bin 86129 -> 0 bytes
 images/tb-bridges-custom-from-browser.png          | Bin 107151 -> 0 bytes
 images/tb-bridges-options-from-browser.png         | Bin 66972 -> 0 bytes
 images/tb-bridges-provided-from-browser.png        | Bin 84736 -> 0 bytes
 images/tb-frontpage.png                            | Bin 36890 -> 11075 bytes
 images/tb-tor-button-menu.png                      | Bin 58398 -> 21300 bytes
 images/tb-tor-launcher-bridges-custom.png          | Bin 88827 -> 0 bytes
 images/tb-tor-launcher-bridges-options.png         | Bin 83439 -> 0 bytes
 images/tb-tor-launcher-bridges-provided.png        | Bin 75365 -> 0 bytes
 images/tb-tor-launcher-isp-interference.png        | Bin 89171 -> 0 bytes
 images/tb-tor-launcher-no-proxy.png                | Bin 74714 -> 0 bytes
 images/tb-tor-launcher-startup.png                 | Bin 89215 -> 0 bytes
 28 files changed, 105 insertions(+), 47 deletions(-)

diff --git a/docs/en/bridges.wml b/docs/en/bridges.wml
index 33c0ad6c..12009954 100644
--- a/docs/en/bridges.wml
+++ b/docs/en/bridges.wml
@@ -4,7 +4,6 @@
 
 #include "head.wmi" TITLE="Tor Project: Bridges" CHARSET="UTF-8"
 
-<!-- TODO: update screenshots -->
 <!-- TODO: rewrite "running a bridge" section -->
 <!-- TODO: add obfs4 how-tos -->
 
@@ -151,7 +150,8 @@
     </ul>
 
     <a id="AddTorNotWorks"></a>
-    <h3><a href="#AddTorNotWorks">Adding bridges in Tor Browser when Tor <em>does not</em> work:</a></h3>
+    <h3><a href="#AddTorNotWorks">Adding bridges in Tor Browser when Tor
+    <em>does not</em> work:</a></h3>
     <hr>
 
     <p>First, you should read <a href="<page docs/faq>#DoesntWork">the
@@ -164,44 +164,59 @@
         "Configure" button.
     </h3>
     <br/>
-    <img src="$(IMGROOT)/tb-tor-launcher-startup.png" alt="Tor Browser's Initial Configuration page">
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-startup.png"
+      alt="Tor Browser's Initial Configuration page">
     <br><br><br>
-    <h3>2) If you must configure a proxy then select "Yes" and enter the
-        details on the following page.
-        <br/>If you do not use a proxy then select "No" and click "Next".
-        <br/>If you do not know if you must configure a proxy then you likely
-        do not need to do it.
+    <h3>2) Proxy and Censorship prevention settings are now on one page. If
+        your Internet Service Provider (ISP) blocks or otherwise censors
+        connections to the Tor Network, tick this checkbox.
     </h3>
     <br/>
-    <img src="$(IMGROOT)/tb-tor-launcher-no-proxy.png" alt="Tor Browser's Proxy page">
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-network-settings.png"
+       alt="Tor Browser's Network settings page">
     <br><br><br>
-    <h3>3) After you configure a proxy or skip over that configuration page,
-        the following page asks "Does your Internet Service Provider (ISP)
-        block or otherwise censor connections to the Tor Network?". Select
-        "Yes" and then click "Next".</h3>
+    <h3>3) If you must configure a proxy then, activate the second checkbox and enter the details.
+    </h3>
+    <br/>
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-proxy.png"
+      alt="Tor Browser's Proxy settings">
+    <br><br><br>
+    <h3>4) Now you have three configuration options. You can use bridges which are
+        preconfigured and provided with Tor Browser, you can specify your own bridge(s), or request bridges.</h3>
     <br/>
-    <img src="$(IMGROOT)/tb-tor-launcher-isp-interference.png" alt="Tor Browser's Bridge page">
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-bridges.png"
+      alt="Tor Browser's Bridge Configuration page">
     <br><br><br>
-    <h3>4) Now you have two configuration options. You can use bridges which are
-        preconfigured and provided with Tor Browser, or you can specify your
-        own bridge(s).</h3>
+    <h3>5a) If you want to use one of the provided bridges, then choose one of
+        the offered transport types. obfs4 is currently recommend, but
+        depending on where you are located another one may work better for you.
+        If you have any questions, please
+        <a href="<page about/contact>#support">contact us</a>.</h3>
     <br/>
-    <img src="$(IMGROOT)/tb-tor-launcher-bridges-options.png" alt="Tor Browser's Bridge Configuration page">
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-bridges-provided.png"
+      alt="Tor Browser's Bridge Configuration page - provided bridges">
     <br><br><br>
-    <h3>5a) If you want to use one of the provided bridges, then choose the
-    transport type you want to use. obfs4 is currently the recommend
-    type, but depending on where you are located another type may work better
-    for you. If you have any questions, please <a href="<page about/contact>#support">contact
-    us.</a></h3>
+    <h3>5b) If none of the provided bridges works for you, try to request one:
+    </h3>
+    <br/>
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-request-bridges.png"
+      alt="Tor Browser's Bridge Configuration page - request bridges">
+    <br/>
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-request-bridges-connect.png"
+      alt="Tor Browser's Bridge Configuration page - connect to request bridges">
+    <br/>
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-request-bridges-captcha.png"
+      alt="Tor Browser's Bridge Configuration page - enter captcha to request bridges">
     <br/>
-    <img src="$(IMGROOT)/tb-tor-launcher-bridges-provided.png" alt="Tor Browser's Bridge Configuration page - provided bridges">
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-request-bridges-success.png"
+      alt="Tor Browser's Bridge Configuration page - received bridges">
     <br><br><br>
-    <h3>5b) Alternatively, if you want to use a <a href="#FindingMore">custom
-    bridge</a>, then select "Enter custom bridges" and copy-and-paste the
-    bridge information into the textbox.
+    <h3>5c) To use a <a href="#FindingMore">custom bridge</a> select
+        "Provide a bridge I know".
     </h3>
     <br/>
-    <img src="$(IMGROOT)/tb-tor-launcher-bridges-custom.png" alt="Tor Browser's Bridge Configuration page - provided bridges">
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-provide-bridge.png"
+      alt="Tor Browser's Bridge Configuration page - provide bridges">
     <br><br><br>
     <h3>6) After you decide which bridges you want to use, click "Connect".
     Tor should now be able to load successfully and the browser window
@@ -210,6 +225,28 @@
     <img src="$(IMGROOT)/tb-frontpage.png" alt="Tor Browser's Front Page">
     <br><br><br><br>
 
+    <a id="Troubleshooting"></a>
+    <h2><a class="anchor" href="#Troubleshooting">Troubleshooting</a></h2>
+    <hr>
+    <br><br>
+    <h3>Sometimes the bootstrapping gets stuck at some point, for example when
+        a bridge went offline, the connection is blocked, or when the
+        Pluggable Transport is hit by a bug.
+    </h3>
+    <br/>
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-bootstrap.png"
+      alt="Tor Browser's Bootstrapping">
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-bootstrap-failed.png"
+      alt="Tor Browser's Bootstrapping">
+
+    <p>
+    Ideally it works after some tries, using a different bridge, or
+    restarting the browser. If not, remove the Tor Browser folder and extract
+    the archive again. It should work now.
+    If it still fails, we want to
+    <a href="<page about/contact>#support">hear from you</a>!
+    </p>
+
     <a id="AddTorWorks"></a>
     <h3><a href="#AddTorWorks">Adding bridges in Tor Browser when Tor <em>does</em> work:</a></h3>
     <hr>
@@ -228,30 +265,52 @@
     <br>
     <img src="$(IMGROOT)/tb-tor-button-menu.png" alt="Tor Browser's TorButton Menu">
     <br><br><br>
-    <h3>3) Select "My Internet Service Provider (ISP) blocks connections to the Tor network":</h3>
+    <h3>3) Select "My Internet Service Provider (ISP) blocks connections to the 
+        Tor network":</h3>
     <br>
-    <img src="$(IMGROOT)/tb-bridge-networksettings.png" alt="Tor Browser's Network Settings page">
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-bridges.png"
+      alt="Tor Browser's Network settings" />
     <br><br><br>
-    <h3>4) Now you have two configuration options. You can use bridges which are
-        preconfigured and provided with Tor Browser, or you can specify your
-        own bridge(s).</h3>
+    <h3>4) Now you have three configuration options. You can use bridges which
+        are preconfigured and provided with Tor Browser, you can request new
+        bridges, or specify your own bridge(s).</h3>
     <br>
-    <img src="$(IMGROOT)/tb-bridges-options-from-browser.png" alt="Tor Browser's TorButton Menu">
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-bridges.png"
+      alt="Tor Browser's Bridge Configuration page">
     <br><br><br>
-    <h3>5a) If you want to use one of the provided bridges, then choose the
-    transport type you want to use. obfs4 is currently the recommend
-    type, but depending on where you are located another type may work better
-    for you. If you have any questions, please <a href="<page about/contact>#support">contact
-    us.</a></h3>
-    <br>
-    <img src="$(IMGROOT)/tb-bridges-provided-from-browser.png" alt="My Internet Service Provider (ISP) blocks connections to the Tor network">
+    <h3>5a) If you want to use one of the provided bridges, then choose one of
+        the offered transport types. obfs4 is currently recommend, but
+        depending on where you are located another one may work better for you.
+        If you have any questions, please
+        <a href="<page about/contact>#support">contact us</a>.</h3>
+    <br/>
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-bridges-provided.png"
+      alt="Tor Browser's Bridge Configuration page - provided bridges">
+    <img src="$(IMGROOT)/tb-tor-launcher-provide-bridge.png"
+      alt="Tor Browser's Bridge Configuration page - custom bridges">
     <br><br><br>
-    <h3>5b) Alternatively, if you want to use a <a href="#FindingMore">custom
-    bridge</a>, then select "Enter custom bridges" and copy-and-paste the
-    bridge information into the textbox.
+    <h3>5b) If none of the provided bridges works for you, try
+        "Request a bridge from torproject.org"
     </h3>
-    <br>
-    <img src="$(IMGROOT)/tb-bridges-custom-from-browser.png" alt="Add bridges in the custom bridges textbox">
+    <br/>
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-request-bridges.png"
+      alt="Tor Browser's Bridge Configuration page - request bridges">
+    <br/>
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-request-bridges-connect.png"
+      alt="Tor Browser's Bridge Configuration page - connect to request bridges">
+    <br/>
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-request-bridges-captcha.png"
+      alt="Tor Browser's Bridge Configuration page - enter captcha to request bridges">
+    <br/>
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-request-bridges-success.png"
+      alt="Tor Browser's Bridge Configuration page - received bridges">
+    <br><br><br>
+    <h3>5c) To use a <a href="#FindingMore">custom bridge</a> select
+        "Provide a bridge I know".
+    </h3>
+    <br/>
+    <img src="$(IMGROOT)/bridges/tb-tor-launcher-provide-bridge.png"
+      alt="Tor Browser's Bridge Configuration page - provide bridges">
     <br><br><br>
 
     <p>
@@ -261,7 +320,6 @@
     </p>
     <br><br>
 
-
     <a id="FindingMore"></a>
     <h2><a class="anchor" href="#FindingMore">Finding more bridges for Tor</a></h2>
     <hr>
diff --git a/images/bridges/tb-tor-launcher-bootstrap-failed-obfs.png b/images/bridges/tb-tor-launcher-bootstrap-failed-obfs.png
new file mode 100644
index 00000000..dcc82afc
Binary files /dev/null and b/images/bridges/tb-tor-launcher-bootstrap-failed-obfs.png differ
diff --git a/images/bridges/tb-tor-launcher-bootstrap-failed.png b/images/bridges/tb-tor-launcher-bootstrap-failed.png
new file mode 100644
index 00000000..335d27f3
Binary files /dev/null and b/images/bridges/tb-tor-launcher-bootstrap-failed.png differ
diff --git a/images/bridges/tb-tor-launcher-bootstrap.png b/images/bridges/tb-tor-launcher-bootstrap.png
new file mode 100644
index 00000000..23d1956a
Binary files /dev/null and b/images/bridges/tb-tor-launcher-bootstrap.png differ
diff --git a/images/bridges/tb-tor-launcher-bridges-options.png b/images/bridges/tb-tor-launcher-bridges-options.png
new file mode 100644
index 00000000..7d70ca36
Binary files /dev/null and b/images/bridges/tb-tor-launcher-bridges-options.png differ
diff --git a/images/bridges/tb-tor-launcher-bridges-provided.png b/images/bridges/tb-tor-launcher-bridges-provided.png
new file mode 100644
index 00000000..eb06fc62
Binary files /dev/null and b/images/bridges/tb-tor-launcher-bridges-provided.png differ
diff --git a/images/bridges/tb-tor-launcher-bridges.png b/images/bridges/tb-tor-launcher-bridges.png
new file mode 100644
index 00000000..8b3f1aa5
Binary files /dev/null and b/images/bridges/tb-tor-launcher-bridges.png differ
diff --git a/images/bridges/tb-tor-launcher-network-settings.png b/images/bridges/tb-tor-launcher-network-settings.png
new file mode 100644
index 00000000..e3bb5e70
Binary files /dev/null and b/images/bridges/tb-tor-launcher-network-settings.png differ
diff --git a/images/bridges/tb-tor-launcher-obfs4.png b/images/bridges/tb-tor-launcher-obfs4.png
new file mode 100644
index 00000000..edcf04fe
Binary files /dev/null and b/images/bridges/tb-tor-launcher-obfs4.png differ
diff --git a/images/bridges/tb-tor-launcher-provide-bridge.png b/images/bridges/tb-tor-launcher-provide-bridge.png
new file mode 100644
index 00000000..ff53faec
Binary files /dev/null and b/images/bridges/tb-tor-launcher-provide-bridge.png differ
diff --git a/images/bridges/tb-tor-launcher-proxy.png b/images/bridges/tb-tor-launcher-proxy.png
new file mode 100644
index 00000000..01d436e6
Binary files /dev/null and b/images/bridges/tb-tor-launcher-proxy.png differ
diff --git a/images/bridges/tb-tor-launcher-request-bridges-captcha.png b/images/bridges/tb-tor-launcher-request-bridges-captcha.png
new file mode 100644
index 00000000..98e2badd
Binary files /dev/null and b/images/bridges/tb-tor-launcher-request-bridges-captcha.png differ
diff --git a/images/bridges/tb-tor-launcher-request-bridges-connect.png b/images/bridges/tb-tor-launcher-request-bridges-connect.png
new file mode 100644
index 00000000..e2acb0ad
Binary files /dev/null and b/images/bridges/tb-tor-launcher-request-bridges-connect.png differ
diff --git a/images/bridges/tb-tor-launcher-request-bridges-success.png b/images/bridges/tb-tor-launcher-request-bridges-success.png
new file mode 100644
index 00000000..48dd3946
Binary files /dev/null and b/images/bridges/tb-tor-launcher-request-bridges-success.png differ
diff --git a/images/bridges/tb-tor-launcher-request-bridges.png b/images/bridges/tb-tor-launcher-request-bridges.png
new file mode 100644
index 00000000..19bdf715
Binary files /dev/null and b/images/bridges/tb-tor-launcher-request-bridges.png differ
diff --git a/images/bridges/tb-tor-launcher-startup.png b/images/bridges/tb-tor-launcher-startup.png
new file mode 100644
index 00000000..d62925db
Binary files /dev/null and b/images/bridges/tb-tor-launcher-startup.png differ
diff --git a/images/tb-bridge-networksettings.png b/images/tb-bridge-networksettings.png
deleted file mode 100644
index 15101c9c..00000000
Binary files a/images/tb-bridge-networksettings.png and /dev/null differ
diff --git a/images/tb-bridges-custom-from-browser.png b/images/tb-bridges-custom-from-browser.png
deleted file mode 100644
index d18279f7..00000000
Binary files a/images/tb-bridges-custom-from-browser.png and /dev/null differ
diff --git a/images/tb-bridges-options-from-browser.png b/images/tb-bridges-options-from-browser.png
deleted file mode 100644
index 884a8c86..00000000
Binary files a/images/tb-bridges-options-from-browser.png and /dev/null differ
diff --git a/images/tb-bridges-provided-from-browser.png b/images/tb-bridges-provided-from-browser.png
deleted file mode 100644
index adcb309e..00000000
Binary files a/images/tb-bridges-provided-from-browser.png and /dev/null differ
diff --git a/images/tb-frontpage.png b/images/tb-frontpage.png
index b7d0a10d..ffc3291d 100644
Binary files a/images/tb-frontpage.png and b/images/tb-frontpage.png differ
diff --git a/images/tb-tor-button-menu.png b/images/tb-tor-button-menu.png
index c6037532..080c6a80 100644
Binary files a/images/tb-tor-button-menu.png and b/images/tb-tor-button-menu.png differ
diff --git a/images/tb-tor-launcher-bridges-custom.png b/images/tb-tor-launcher-bridges-custom.png
deleted file mode 100644
index af98f120..00000000
Binary files a/images/tb-tor-launcher-bridges-custom.png and /dev/null differ
diff --git a/images/tb-tor-launcher-bridges-options.png b/images/tb-tor-launcher-bridges-options.png
deleted file mode 100644
index 58683e27..00000000
Binary files a/images/tb-tor-launcher-bridges-options.png and /dev/null differ
diff --git a/images/tb-tor-launcher-bridges-provided.png b/images/tb-tor-launcher-bridges-provided.png
deleted file mode 100644
index e66f708f..00000000
Binary files a/images/tb-tor-launcher-bridges-provided.png and /dev/null differ
diff --git a/images/tb-tor-launcher-isp-interference.png b/images/tb-tor-launcher-isp-interference.png
deleted file mode 100644
index a0ebe949..00000000
Binary files a/images/tb-tor-launcher-isp-interference.png and /dev/null differ
diff --git a/images/tb-tor-launcher-no-proxy.png b/images/tb-tor-launcher-no-proxy.png
deleted file mode 100644
index 4e8bd6b4..00000000
Binary files a/images/tb-tor-launcher-no-proxy.png and /dev/null differ
diff --git a/images/tb-tor-launcher-startup.png b/images/tb-tor-launcher-startup.png
deleted file mode 100644
index 0f9d4b14..00000000
Binary files a/images/tb-tor-launcher-startup.png and /dev/null differ



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits