@@ -4,7 +4,7 @@

   <info>

     <link type="guide" xref="index" group="#first"/>

-    <desc>Learn what Tor Browser can do to protect your privacy and anonymity.</desc>

+    <desc>Learn what Tor Browser can do to protect your privacy and anonymity</desc>

   </info>

   <title>About Tor Browser</title>

@@ -57,7 +57,7 @@

       in the Tor network. The last relay in the circuit (the “exit relay”)

       then sends the traffic out onto the public Internet.

     </p>

-    <media type="image" src="media/how-tor-works.png" />

+    <media type="image" width="600" src="media/how-tor-works.png" />

     <p>

       The image above illustrates a user browsing to different websites

       over Tor. The green monitors represent relays in the Tor network,

@@ -66,7 +66,7 @@ to obtain bridge addresses in order to use these transports.

  on a separate line.

  </p>

- <media type="image" src="media/tor-launcher-custom-bridges_en-US.png" />

+ <media type="image" width="600" src="media/tor-launcher-custom-bridges_en-US.png" />

  <p>

  Click “Connect”. Using bridges may slow down the connection compared to

@@ -3,7 +3,7 @@

   id="circumvention">

 <info>

-  <desc>What to do if the Tor network is blocked.</desc>

+  <desc>What to do if the Tor network is blocked</desc>

   <link type="guide" xref="index" />

 </info>

@@ -22,20 +22,19 @@ that are currently available.

 <title>Using pluggable transports</title>

 <steps>

  <item>

+  <p>

+  <media type="image" width="600" src="media/circumvention/configure.png" />

+  </p>

   <p>

   To use pluggable transports, click "Configure" in the Tor Launcher

   window that appears when you first run Tor Browser.

   </p>

-  <media type="image" src="media/tor-launcher-configure_en-US.png" />

-

   <p>

   You can also configure pluggable transports while Tor Browser is

   running, by clicking on the Torbutton menu and selecting “Tor Network

   Settings”.

   </p>

-

-  <!-- XXX: insert screenshot of Torbutton menu -->

  </item>

  <item>

@@ -43,22 +42,34 @@ that are currently available.

   Select “yes” when asked if your Internet Service Provider blocks

   connections to the Tor network.

   </p>

-

-  <media type="image" src="media/tor-launcher-wizard_en-US.png" />

  </item>

  <item>

+  <p>

+  <media type="image" width="600" src="media/circumvention/bridges.png" />

+  </p>

   <p>

   Select “Connect with provided bridges”. Tor Browser currently has nine

-  pluggable transport options to choose from. If one fails to get you

-  online, try selecting a different transport.

+  pluggable transport options to choose from. See the section below for

+  advice on which to select.

   </p>

-

-  <!-- XXX: Update this image -->

-  <media type="image" src="media/tor-launcher-provided-bridges_en-US.png" />

  </item>

 </steps>

+</section>

+<section id="which-to-use">

+<title>Which transport should I use?</title>

+<p>

+Each of the transports listed in Tor Launcher’s menu works in a different

+way (for more details, see the <link xref="transports">Pluggable

+Transports</link> page), and their effectiveness depends on your

+individual circumstances.

+</p>

+<p>

+If you are trying to circumvent a blocked connection for the first time,

+you should try the different transports in the following order: obfs3,

+ScrambleSuit, fte-ipv6, fte, meek-azure, meek-google, meek-amazon, obfs4.

+</p>

 <p>

 If you try all of these options, and none of them gets you online,

 you will need to enter bridge addresses manually. Read the <link 

@@ -7,7 +7,7 @@

     <desc>Learn how to use Tor Browser for the first time</desc>

   </info>

-  <title>Running Tor Browser for the First Time</title>

+  <title>Running Tor Browser for the first time</title>

   <p>

   When you run Tor Browser for the first time, you will see the Tor

@@ -18,6 +18,9 @@

   <section id="connect">

     <title>Connect</title>

     <p>

+    <media type="image" width="600" src="media/first-time/connect.png" />

+    </p>

+    <p>

     In most cases, this option 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

@@ -28,11 +31,14 @@

   </section>

   <section id="configure">

    <title>Configure</title>

-    <p>

-    If you know that your connection is censored, or uses a proxy, you should

-    select this option. Tor Launcher will take you through a series of

-    configuration options.

-    </p>

+   <p>

+   <media type="image" width="600" src="media/circumvention/configure.png" />

+   </p>

+   <p>

+   If you know that your connection is censored, or uses a proxy, you should

+   select this option. Tor Launcher will take you through a series of

+   configuration options.

+   </p>

    <steps>

     <item>

      <p>

@@ -51,15 +57,13 @@

      this is not necessary. You will usually know if you need to answer

      “Yes”, as 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, answer “No”.

+     your connection does not use a proxy, click “Connect”.

+     </p>

+     <p>

+     <media type="image" width="600" src="media/first-time/proxy_question.png" />

      </p>

-    </item>

-    <item>

      <p>

-     The final screen asks if your connection is behind a firewall that

-     only allows certain ports. If the answer is “Yes”, enter all the

-     allowed ports, separated by a comma but no spaces. If the answer is

-     “No”, click “Connect”.

+     <media type="image"  width="600" src="media/first-time/proxy.png" />

      </p>

     </item>

    </steps>

@@ -7,7 +7,7 @@

   <link type="guide" xref="index" />

 </info>

-<title>Managing Identities</title>

+<title>Managing identities</title>

 <p>

 When you connect to a website, it is not only the operators

@@ -41,6 +41,14 @@ made over the same Tor circuit, meaning you can browse different pages

 of a single website in separate tabs or windows, without any loss of

 functionality.

 </p>

+

+<p>

+<media type="image" width="600" src="media/managing-identities/circuit_full.png" />

+</p>

+<p>

+You can see a diagram of the circuit that Tor Browser is using for the

+current tab in the onion menu.

+</p>

 </section>

 <section id="logins">

@@ -92,10 +100,12 @@ should bear in mind:

 <section id="new-identity">

 <title>Changing identities and circuits</title>

 <p>

+<media type="image" width="600" src="media/managing-identities/new_identity.png" /> 

+</p>

+<p>

 Tor Browser features “New Identity” and “New Tor Circuit for this Site”

 options, located in the Torbutton menu.

 </p>

- 

 <terms>

  <item>

   <title>New Identity</title>

@@ -104,10 +114,9 @@ options, located in the Torbutton menu.

   activity from being linkable to what you

   were doing before. Selecting it will close all your open tabs and

   windows, clear all private information such as cookies and browsing

-  history, and use new Tor circuits for all connections. Make sure you

-  have completely finished all activity and downloads before clicking

-  “New Identity”, as you will not be able to resume them in the new

-  browser window without starting all over again.

+  history, and use new Tor circuits for all connections. Tor Browser

+  will warn you that all activity and downloads will be stopped, so

+  take this into account before clicking “New Identity”.

   </p>

  </item>

  <item>

new file mode 100644

Binary files /dev/null and b/C/media/circumvention/bridges.png differ

new file mode 100644

Binary files /dev/null and b/C/media/circumvention/configure.png differ

new file mode 100644

Binary files /dev/null and b/C/media/circumvention/start_window.png differ

new file mode 100644

Binary files /dev/null and b/C/media/first-time/connect.png differ

new file mode 100644

Binary files /dev/null and b/C/media/first-time/proxy.png differ

new file mode 100644

Binary files /dev/null and b/C/media/first-time/proxy_question.png differ

new file mode 100644

Binary files /dev/null and b/C/media/managing-identities/circuit.png differ

new file mode 100644

Binary files /dev/null and b/C/media/managing-identities/circuit_full.png differ

new file mode 100644

Binary files /dev/null and b/C/media/managing-identities/new_identity.png differ

new file mode 100644

Binary files /dev/null and b/C/media/onionsites/onion_url.png differ

new file mode 100644

Binary files /dev/null and b/C/media/plugins/noscript_menu.png differ

new file mode 100644

Binary files /dev/null and b/C/media/secure-connections/https.png differ

new file mode 100644

Binary files /dev/null and b/C/media/security-slider/slider.png differ

new file mode 100644

Binary files /dev/null and b/C/media/security-slider/slider_window.png differ

new file mode 100644

Binary files /dev/null and b/C/media/troubleshooting/copy_tor_log1.png differ

new file mode 100644

Binary files /dev/null and b/C/media/troubleshooting/copy_tor_log2.png differ

new file mode 100644

Binary files /dev/null and b/C/media/troubleshooting/copy_tor_log_network_security.png differ

new file mode 100644

Binary files /dev/null and b/C/media/troubleshooting/network_security_menu.png differ

new file mode 100644

Binary files /dev/null and b/C/media/updating/update1.png differ

new file mode 100644

Binary files /dev/null and b/C/media/updating/update2.png differ

new file mode 100644

Binary files /dev/null and b/C/media/updating/update3.png differ

new file mode 100644

Binary files /dev/null and b/C/media/updating/update4.png differ

@@ -45,6 +45,9 @@ non-private web:

 <section id="access">

 <title>How to access an onionsite</title>

 <p>

+<media type="image" width="600" src="media/onionsites/onion_url.png" />

+</p>

+<p>

 Just like any other website, you will need to know the address of an

 onionsite in order to connect to it. An onion address is a string of

 sixteen mostly random letters and numbers, followed by “.onion”.

@@ -40,15 +40,16 @@ Tor Browser includes an add-on called NoScript, accessed through the

 “S” icon at the top-left of the window, which allows you to control the

 JavaScript that runs on individual web pages, or to block it entirely.

 </p>

- 

+<p>

+<media type="image" width="400" src="media/plugins/noscript_menu.png" />

+</p>

 <p>

 Users who require a high degree of security in their web browsing should

-select “Forbid Scripts Globally” from the NoScript drop-down menu. This

-setting is also activated by default when Tor Browser’s <link

-xref='security-slider'>Security Slider</link> is set to “Medium-High”

-(for non-HTTPS websites) or “High” (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.

+set Tor Browser’s <link xref='security-slider'>Security Slider</link> to

+“Medium-High” (which disables JavaScript for non-HTTPS websites) or “High”

+(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.

 </p>

 </section>

@@ -20,7 +20,9 @@

   connection is encrypted, the address will begin with “https://”, rather

   than “http://”.

   </p>

-   

+  <p>

+  <media type="image" width="700" src="media/secure-connections/https.png" />

+  </p>  

   <p>

   The following visualization shows what information is visible to

   eavesdroppers with and without Tor Browser and HTTPS encryption:

@@ -20,6 +20,9 @@ you require.

 <section id="access">

 <title>Accessing the Security Slider</title>

 <p>

+<media type="image" width="400" src="media/security-slider/slider.png" />

+</p>

+<p>

 The Security Slider is located in Torbutton’s “Privacy and Security

 Settings” menu.

 </p>

@@ -28,25 +31,22 @@ Settings” menu.

 <section id="levels">

 <title>Security Levels</title>

 <p>

+<media type="image" width="600" src="media/security-slider/slider_window.png" />

+</p>

+<p>

 Increasing the level of the Security Slider will disable or partially

 disable certain browser features to protect against possible attacks.

 </p>

-

 <terms>

  <item>

-  <title>Low</title>

-  <p>

-  At this level, all browser features are enabled. This is the most

-  usable option.

-  </p>

- </item>

- <item>

-  <title>Medium-Low</title>

+  <title>High</title>

   <p>

   At this level, HTML5 video and audio media become click-to-play via

-  NoScript; some <link xref='plugins'>JavaScript</link> performance

-  optimizations are disabled, causing some websites to run more slowly;

-  and some mathematical equations may not display properly.

+  NoScript; all JavaScript performance optimizations are disabled; some

+  mathematical equations may not display properly; some font rendering

+  features are disabled; some types of image are disabled; Javascript

+  is disabled by default on all sites; most video and audio formats are

+  disabled; and some fonts and icons may not display correctly.

   </p>

  </item>

  <item>

@@ -61,14 +61,19 @@ disable certain browser features to protect against possible attacks.

   </p>

  </item>

  <item>

-  <title>High</title>

+  <title>Medium-Low</title>

   <p>

   At this level, HTML5 video and audio media become click-to-play via

-  NoScript; all JavaScript performance optimizations are disabled; some

-  mathematical equations may not display properly; some font rendering

-  features are disabled; some types of image are disabled; Javascript

-  is disabled by default on all sites; most video and audio formats are

-  disabled; and some fonts and icons may not display correctly.

+  NoScript; some <link xref='plugins'>JavaScript</link> performance

+  optimizations are disabled, causing some websites to run more slowly;

+  and some mathematical equations may not display properly.

+  </p>

+ </item>

+ <item>

+  <title>Low</title>

+  <p>

+  At this level, all browser features are enabled. This is the most

+  usable option.

   </p>

  </item>

 </terms>

@@ -26,27 +26,28 @@ being developed.

   <tr>

     <td>

       <p>

-      obfs2

-      </p> 

+      obfs3

+      </p>

     </td>

     <td>

       <p>

-      Censors have learned how to identify obfs2 bridges. This transport 

-      is deprecated, and you should not use it.

+      obfs3 makes Tor traffic look random, so that it does not look

+      like Tor or any other protocol. obfs3 bridges will work in most

+      places.

       </p>

     </td>

   </tr>

   <tr>

     <td>

       <p>

-      obfs3

+      obfs4

       </p>

     </td>

     <td>

       <p>

-      obfs3 disguises Tor traffic as random noise. obfs3 bridges work 

-      almost everywhere, though some may have been identified and

-      blocked by censors.

+      obfs4 makes Tor traffic look random like obfs3, and also prevents

+      censors from finding bridges by Internet scanning. obfs4 bridges

+      are less likely to be blocked than obfs3 bridges.

       </p>

     </td>

   </tr>

@@ -58,52 +59,53 @@ being developed.

     </td>

     <td>

       <p>

-      Scramblesuit is an additional tool for the obfs3 transport that

-      tries to stop censors from identifying bridges through active

-      probing.

+      ScrambleSuit is similar to obfs4 but has a different set

+      of bridges.

       </p>

     </td>

   </tr>

   <tr>

     <td>

       <p>

-      obfs4

+      FTE

       </p>

     </td>

     <td>

       <p>

-      obfs4 offers the same features as Scramblesuit, but uses different

-      cryptographic and authentication methods that result in improved

-      speed.

+      FTE (format-transforming encryption) disguises Tor traffic as

+      ordinary web (HTTP) traffic.

       </p>

     </td>

   </tr>

   <tr>

-   <td>

-    <p>

-    meek

-    </p>

-   </td>

-   <td>

-    <p>

-    Rather than using bridges, meek works by making your Tor traffic

-    seem as though it is destined for a major website that a censor

-    cannot block without disrupting a lot of other activity on the

-    network.

-    </p>

-   </td>

+    <td>

+      <p>

+      meek

+      </p>

+    </td>

+    <td>

+      <p>

+      These transports all make it look

+      like you are browsing a major web site instead of using Tor.

+      meek-amazon makes it look like you are using Amazon Web

+      Services; meek-azure makes it look like you are using a

+      Microsoft web site; and meek-google makes it look like you are

+      using Google search.

+      </p>

+    </td>

   </tr>

   <tr>

     <td>

       <p>

-      FTE

+      Flashproxy

       </p>

     </td>

     <td>

       <p>

-      Format-Transforming Encryption disguises Tor traffic as web (HTTP) 

-      traffic or other types of internet traffic. FTE bridges are 

-      effective, but in limited supply. 

+      Flashproxy is for advanced users. It sends your traffic

+      through other peoples’ web browsers. To set it up, you need to

+      read the <a href="https://trac.torproject.org/projects/tor/wiki/FlashProxyHowto">flash

+      proxy how-to</a>.

       </p>

     </td>

   </tr>

@@ -3,7 +3,7 @@

   id="troubleshooting">

 <info>

-  <desc>What to do if Tor Browser doesn’t work.</desc>

+  <desc>What to do if Tor Browser doesn’t work</desc>

   <link type="guide" xref="index" group="#last" />

 </info>

@@ -15,7 +15,7 @@ after running the program, and clicking the “Connect” button if you are

 using it for the first time.

 </p>

-<media type="image" src="media/tor-launcher-connect_en-US.png" />

+<media type="image" width="600" src="media/first-time/connect.png" />

 <section id="no-connection">

 <title>Quick fixes</title>

@@ -99,21 +99,31 @@ the problem. To copy the Tor log, either:

  <item>

   <p>

   click the button labelled “Copy Tor Log To Clipboard” that appears in

-  the dialog window while Tor Browser is connecting to the network, or

+  the Tor Launcher window, or

+  </p>

+  <p>

+  <media type="image" width="600" src="media/troubleshooting/copy_tor_log1.png" />

   </p>

  </item>

  <item>

   <p>

   if Tor Browser is already open, click on the Torbutton icon (the small

-  green onion at the top left of the screen), then “Open Network

+  green onion at the top left of the screen), then “Tor Network

   Settings”, then “Copy Tor Log To Clipboard”.

   </p>

+  <p>

+  <media type="image" width="600" src="media/troubleshooting/network_security_menu.png" />

+  </p>

+ </item>

+ <item>

+  <p>

+  You can now paste the Tor log into your support request.

+  </p>

+  <p>

+  <media type="image" width="600" src="media/troubleshooting/copy_tor_log2.png" />

+  </p>

  </item>

 </list>

-<p>

-You can now paste the Tor log into your support request.

-</p>

-<!-- XXX: Include a screenshot of this -->

 </section>

 </page>

@@ -3,7 +3,7 @@

   id="uninstalling">

 <info>

-  <desc>How to remove Tor Browser from your system.</desc>

+  <desc>How to remove Tor Browser from your system</desc>

   <link type="guide" xref="index" group="#last" />

 </info>

@@ -21,8 +21,10 @@ Removing Tor Browser from your system is simple:

 <steps>

   <item>

-    <p>Locate your Tor Browser folder. The default location is your Desktop.</p>

-    <!-- is that true? -->

+    <p>

+    Locate your Tor Browser folder. The default location on Windows is the Desktop;

+    on Mac OS X it is the Applications folder.

+    </p>

   </item>

   <item>

     <p>Delete the Tor Browser folder.</p>

@@ -22,26 +22,34 @@ and you may see a written update indicator when Tor Browser opens. You

 can update either automatically or manually.

 </p>

-<!-- XXX: Screenshot of update warning, plus screenshots for all the steps below -->

-

 <section id="automatic">

 <title>Updating Tor Browser automatically</title>

 <steps>

  <item>

+  <p>

+  <media type="image" width="400" src="media/updating/update1.png" />

+  </p>

   <p>

   When you are prompted to update Tor Browser, click on the Torbutton

   icon, then select “Check for Tor Browser Update”.

   </p>

  </item>

  <item>

+  <p>

+  <media type="image" width="600" src="media/updating/update3.png" />

+  </p>

   <p>

   When Tor Browser has finished checking for updates, click on the

-  “Update” button and wait for the update to download and install.

+  “Update” button.

   </p>

  </item>

  <item>

   <p>

-  Restart Tor Browser. You will now be running the latest version.

+  <media type="image" width="600" src="media/updating/update4.png" />

+  </p>

+  <p>

+  Wait for the update to download and install, then restart Tor

+  Browser. You will now be running the latest version.

   </p>

  </item>

 </steps>