Include updated manual text
Harmony

Harmony commited on 2015-04-07 15:45:57
Zeige 15 geänderte Dateien mit 949 Einfügungen und 379 Löschungen.

... ...
@@ -0,0 +1,68 @@
1
+<page xmlns="http://projectmallard.org/1.0/"
2
+      type="topic"
3
+      id="about-tor-browser">
4
+
5
+  <info>
6
+    <link type="guide" xref="index" group="#first"/>
7
+    <desc>Learn what Tor Browser can do to protect your privacy and anonymity.</desc>
8
+  </info>
9
+
10
+  <title>About Tor Browser</title>
11
+
12
+    <p>
13
+      Tor Browser uses the Tor network to protect your privacy and
14
+      anonymity. Using the Tor network has two main properties:
15
+    </p>
16
+    <list>
17
+      <item>
18
+        <p>
19
+          Your internet activity, including the names and addresses of
20
+          the websites you visit, will be hidden from your Internet
21
+          service provider and from anyone watching your connection
22
+          locally.
23
+        </p>
24
+      </item>
25
+      <item>
26
+        <p>
27
+          The operators of the websites and services that you use, and
28
+          anyone watching them, will see a connection coming from the
29
+          Tor network instead of your real Internet (IP) address, and
30
+          will not know who you are unless you explicitly identify
31
+          yourself.
32
+        </p>
33
+      </item>
34
+    </list>
35
+    <p>
36
+      In addition, Tor Browser is designed to prevent websites from
37
+      “fingerprinting” or identifying you based on your browser
38
+      configuration.
39
+    </p>
40
+    <p>
41
+      By default, Tor Browser does not keep any browsing history.
42
+      Cookies are only valid for a single session (until Tor Browser
43
+      is exited or a <link xref='managing-identities#new-identity'>New
44
+      Identity</link> is requested).
45
+    </p>
46
+    
47
+    <!-- XXX: ask Tor Browser team/mikeperry about things that are worth
48
+    adding here. -->
49
+
50
+  <section id="how-tor-works">
51
+    <title>How Tor works</title>
52
+
53
+    <p>
54
+      Tor is a network of virtual tunnels that allows you to improve your
55
+      privacy and security on the Internet. Tor works by sending your
56
+      traffic through three random servers (also known as <em>relays</em>)
57
+      in the Tor network. The last relay in the circuit (the “exit relay”)
58
+      then sends the traffic out onto the public Internet.
59
+    </p>
60
+    <media type="image" src="media/how-tor-works.png" />
61
+    <p>
62
+      The image above illustrates a user browsing to different websites
63
+      over Tor. The green monitors represent relays in the Tor network,
64
+      while the three keys represent the layers of encryption between the
65
+      user and each relay.
66
+    </p>
67
+  </section>
68
+</page>
... ...
@@ -4,148 +3,76 @@
4 3
   id="bridges">
5 4
 
6 5
 <info>
7
-  <desc>What bridges are and how to use them.</desc>
8
-  <link type="guide" xref="index" />
6
+  <desc>Learn what bridges are and how to get them</desc>
7
+  <link type="topic" xref="circumvention" />
9 8
 </info>
10 9
 
11 10
 <title>Bridges</title>
12 11
 
13 12
 <p>
14
-Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run
15
-by volunteers. Unlike relays, they are not listed publicly. Using bridges
16
-disguise the fact that one is using Tor.  
17
-</p>
18
-
19
-<p>
20
-Currently there are five bridge types, or transports, available. More are 
21
-being developed. 
22
-</p>
23
-<table frame='all' rules='all'>
24
-  <tr>
25
-    <td>
26
-      <p>
27
-      ORPort
28
-      </p>
29
-    </td>
30
-    <td>
31
-      <p>
32
-      Requesting 'bridges' without specifying the bridge type, will return 
33
-      ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT 
34
-      reliable for circumventing censorship or national firewalls. ORPort 
35
-      bridges can be useful as trusted entry points into the Tor network. 
36
-      </p>
37
-    </td>
38
-  </tr>
39
-  <tr>
40
-    <td>
41
-      <p>
42
-      obfs2
43
-      </p> 
44
-    </td>
45
-    <td>
46
-      <p>
47
-      Censors have learned how to identify obfs2 bridges. This transport 
48
-      is being deprecated.
49
-      </p>
50
-    </td>
51
-  </tr>
52
-  <tr>
53
-    <td>
54
-      <p>
55
-      obfs3
56
-      </p>
57
-    </td>
58
-    <td>
59
-      <p>
60
-      Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work 
61
-      almost everywhere. A few obfs3 bridges have been blocked. 
62
-      </p>
63
-    </td>
64
-  </tr>
65
-  <tr>
66
-    <td>
67
-      <p>
68
-      Scramblesuit
69
-      </p>
70
-    </td>
71
-    <td>
72
-      <p>
73
-      Scramblesuit is an additional tool for the obfsproxy transport. 
74
-      Scramblesuit bridges are designed to be hard to identify and hard to 
75
-      block. 
76
-      </p>
77
-    </td>
78
-  </tr>
79
-  <tr>
80
-    <td>
81
-      <p>
82
-      FTE
13
+ Most <link xref='transports'>Pluggable Transports</link>, such as obfs3
14
+ and obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges
15
+ are run by volunteers; unlike ordinary relays, however, they are not listed
16
+ publicly, so an adversary cannot identify them easily. Using bridges in
17
+ combination with pluggable transports helps to disguise the fact that you
18
+ are using Tor.
83 19
 </p>
84
-    </td>
85
-    <td>
86
-      <p>
87
-      Format-Transforming Encryption disguises Tor traffic as web (HTTP) 
88
-      traffic or other types of internet traffic. FTE bridges are 
89
-      effective, but in limited supply. 
90
-      </p>
91
-    </td>
92
-  </tr>
93
-</table>
94 20
 
95 21
 <p>
96
-(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)
22
+Other pluggable transports, like meek and Flashproxy, use different
23
+anti-censorship techniques that do not rely on bridges. You do not need
24
+to obtain bridge addresses in order to use these transports.
97 25
 </p>
98 26
 
27
+<section id="getting-bridges">
28
+ <title>Getting bridge addresses</title>
99 29
  <p>
100
-There are four ways to get a bridge. 
30
+ Because bridge addresses are not public, you will need to request them
31
+ yourself. You have three options:
101 32
  </p>
102 33
 
103
-<steps>
34
+<list>
104 35
   <item>
105 36
     <p>
106
-    Visit <link href='https://bridges.torproject.org/'>https://bridges.torproject.org/</link> and follow the instructions.
37
+    Visit <link href='https://bridges.torproject.org/'>https://bridges.torproject.org/</link>
38
+    and follow the instructions, or
107 39
     </p>
108 40
   </item>
109 41
   <item>
110 42
     <p>
111
-    Email bridges@bridges.torproject.org from a gmail or yahoo 
112
-    email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges 
113
-    or <cmd>transport=obfs3</cmd> for obfs3 bridges. 
43
+    Email bridges@torproject.org from a Gmail, Yahoo, or Riseup email
44
+    address, or
114 45
     </p>
115 46
   </item>
116 47
   <item>
117 48
     <p>
118
-    Politely ask a human at help@rt.torproject.org if you cannot access 
119
-    either of the first two methods. 
49
+    Politely ask a human at help@rt.torproject.org if neither of the first
50
+    two methods works for you.
120 51
     </p>
121 52
   </item>
122
-  <item>
123
-    <p>
124
-    Install and configure a Tor instance to be bridge  
125
-    for yourself. The computer acting as a bridge must have uncensored internet 
126
-    access to the Tor network. A full installation guide can be found at
127
-    <link href='https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en'>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>
128
-    </p>
129
-  </item>
130
-</steps>
53
+</list>
54
+</section>
131 55
 
56
+<section id="entering-bridges">
57
+ <title>Entering bridge addresses</title>
132 58
  <p>
133
-Enter the bridge information you get from any of the above steps in 
134
-Tor-launcher.
59
+ Once you have obtained some bridge addresses, you will need to enter them
60
+ into Tor Launcher.
135 61
  </p>
136 62
 
137 63
  <p>
138
-Choose yes when asked if your Internet Service Provider blocks connections to 
139
-the Tor network. Select 'Use custom bridges' and enter each bridge identifier 
140
-on its own line.
64
+ Choose “yes” when asked if your Internet Service Provider blocks connections to 
65
+ the Tor network. Select “Use custom bridges” and enter each bridge address
66
+ on a separate line.
141 67
  </p>
142 68
 
143 69
  <media type="image" src="media/tor-launcher-custom-bridges_en-US.png" />
144 70
 
145 71
  <p>
146
-Click Connect. Using bridges slow down the connection. If the connection fails,
147
-the bridges you received may be down. Get more and try again. 
72
+ Click “Connect”. Using bridges may slow down the connection compared to
73
+ using ordinary Tor relays. If the connection fails, the bridges you
74
+ received may be down. Please use one of the above methods to obtain
75
+ more bridge addresses, and try again.
148 76
  </p>
149
-
77
+</section>
150 78
 </page>
151
-
... ...
@@ -11,35 +10,61 @@
11 10
 <title>Circumvention</title>
12 11
 
13 12
 <p>
14
-Some firewalls can detect and block connections to Tor. The Tor Browser 
15
-includes some circumvention tools for getting around blocking firewalls. 
16
-These circumvention tools are called Pluggable Transports. To turn them on, 
17
-click "Configure" in the Tor launcher window. 
13
+Direct access to the Tor network may sometimes be blocked by your Internet
14
+Service Provider or by a government. Tor Browser includes some
15
+circumvention tools for getting around these blocks. These tools are called
16
+“pluggable transports”. See the <link xref='transports'>Pluggable
17
+Transports</link> page for more  information on the types of transport
18
+that are currently available.
19
+</p>
20
+
21
+<section id="using-transports">
22
+<title>Using pluggable transports</title>
23
+<steps>
24
+ <item>
25
+  <p>
26
+  To use pluggable transports, click "Configure" in the Tor Launcher
27
+  window that appears when you first run Tor Browser.
18 28
   </p>
19 29
 
20 30
   <media type="image" src="media/tor-launcher-configure_en-US.png" />
21 31
 
22 32
   <p>
23
-Select yes when asked if your internet service provider blocks connections 
24
-to Tor." 
33
+  You can also configure pluggable transports while Tor Browser is
34
+  running, by clicking on the Torbutton menu and selecting “Tor Network
35
+  Settings”.
36
+  </p>
37
+
38
+  <!-- XXX: insert screenshot of Torbutton menu -->
39
+ </item>
40
+
41
+ <item>
42
+  <p>
43
+  Select “yes” when asked if your Internet Service Provider blocks
44
+  connections to the Tor network.
25 45
   </p>
26 46
 
27 47
   <media type="image" src="media/tor-launcher-wizard_en-US.png" />
48
+ </item>
28 49
 
50
+ <item>
29 51
   <p>
30
-Select "Connect with provided bridges". Tor Browser has three Pluggable 
31
-Transports to choose from. If one fails to get you online, try selecting a 
32
-different transport. 
52
+  Select “Connect with provided bridges”. Tor Browser currently has nine
53
+  pluggable transport options to choose from. If one fails to get you
54
+  online, try selecting a different transport.
33 55
   </p>
34 56
 
57
+  <!-- XXX: Update this image -->
35 58
   <media type="image" src="media/tor-launcher-provided-bridges_en-US.png" />
59
+ </item>
60
+</steps>
36 61
 
37 62
 <p>
38
-If you try all three transports, and none of them get you online, select 
39
-"Enter custom bridges", and enter bridges manually. Read the <link 
40
-xref='bridges'>Getting Bridges</link> section for instructions on getting 
41
-custom bridges. 
63
+If you try all of these options, and none of them gets you online,
64
+you will need to enter bridge addresses manually. Read the <link 
65
+xref='bridges'>Bridges</link> section to learn what bridges are and how
66
+to obtain them.
42 67
 </p>
68
+</section>
43 69
 
44 70
 </page>
45
-
... ...
@@ -0,0 +1,68 @@
1
+<page xmlns="http://projectmallard.org/1.0/"
2
+      type="topic"
3
+      id="first-time">
4
+
5
+  <info>
6
+    <link type="guide" xref="index" group="#first" />
7
+    <desc>Learn how to use Tor Browser for the first time</desc>
8
+  </info>
9
+
10
+  <title>Running Tor Browser for the First Time</title>
11
+  
12
+  <p>
13
+  When you run Tor Browser for the first time, you will see the Tor
14
+  Launcher window. This offers you the option to connect directly to the
15
+  Tor network, or to configure Tor Browser for your connection.
16
+  </p>
17
+  
18
+  <section id="connect">
19
+    <title>Connect</title>
20
+    <p>
21
+    In most cases, this option will allow you to connect to the Tor network
22
+    without any further configuration. Once clicked, a status bar will
23
+    appear, showing Tor’s connection progress. If you are on a relatively
24
+    fast connection, but this bar seems to get stuck at a certain point,
25
+    see the <link xref='troubleshooting'>Troubleshooting</link> page for
26
+    help solving the problem.
27
+    </p>
28
+  </section>
29
+  <section id="configure">
30
+   <title>Configure</title>
31
+    <p>
32
+    If you know that your connection is censored, or uses a proxy, you should
33
+    select this option. Tor Launcher will take you through a series of
34
+    configuration options.
35
+    </p>
36
+   <steps>
37
+    <item>
38
+     <p>
39
+     The first screen asks if access to the Tor network is blocked or
40
+     censored on your connection. If you do not believe this is the case,
41
+     select “No”. If you know your connection is censored, or you have
42
+     tried and failed to connect to the Tor network and no other solutions
43
+     have worked, select “Yes”. You will then be taken to the <link
44
+     xref='circumvention'>Circumvention</link> screen to configure
45
+     a pluggable transport.
46
+     </p>
47
+    </item>
48
+    <item>
49
+     <p>
50
+     The next screen asks if your connection uses a proxy. In most cases,
51
+     this is not necessary. You will usually know if you need to answer
52
+     “Yes”, as the same settings will be used for other browsers on your
53
+     system. If possible, ask your network administrator for guidance. If
54
+     your connection does not use a proxy, answer “No”.
55
+     </p>
56
+    </item>
57
+    <item>
58
+     <p>
59
+     The final screen asks if your connection is behind a firewall that
60
+     only allows certain ports. If the answer is “Yes”, enter all the
61
+     allowed ports, separated by a comma but no spaces. If the answer is
62
+     “No”, click “Connect”.
63
+     </p>
64
+    </item>
65
+   </steps>
66
+  </section>
67
+
68
+</page>
... ...
@@ -5,7 +4,7 @@
5 4
 
6 5
 <info>
7 6
   <desc>A list of known issues.</desc>
8
-  <link type="guide" xref="index" group="#last" />
7
+  <link type="topic" xref="troubleshooting" />
9 8
 </info>
10 9
 
11 10
 <title>Known Issues</title>
... ...
@@ -67,9 +66,4 @@
67 66
     </p>
68 67
   </item>
69 68
 </list>
70
-<p>
71
-If you have an issue with Tor Browser that isn't on this list, feel free to 
72
-email help@rt.torproject.org. 
73
-</p>
74 69
 </page>
75
-
... ...
@@ -0,0 +1,129 @@
1
+<page xmlns="http://projectmallard.org/1.0/"
2
+  type="topic"
3
+  id="managing-identities">
4
+
5
+<info>
6
+  <desc>Learn how to control personally-identifying information in Tor Browser</desc>
7
+  <link type="guide" xref="index" />
8
+</info>
9
+
10
+<title>Managing Identities</title>
11
+ 
12
+<p>
13
+When you connect to a website, it is not only the operators
14
+of that website who can record information about your visit. Most
15
+websites now use numerous third-party services, including social networking
16
+“Like” buttons, analytics trackers, and advertising beacons, all of which
17
+can link your activity across different sites.
18
+</p>
19
+ 
20
+<p>
21
+Using the Tor network stops observers from being able to
22
+discover your exact location and IP address, but even without this
23
+information they might be able to link different areas of
24
+your activity together. For this reason, Tor Browser includes some additional
25
+features that help you control what information can be tied to your identity.
26
+</p>
27
+
28
+<section id="url-bar">
29
+<title>The URL bar</title>
30
+<p>
31
+Tor Browser centers your web experience around your relationship with
32
+the website in the URL bar. Even if you connect to two different sites
33
+that use the same third-party tracking service, Tor Browser will force
34
+the content to be served over two different Tor circuits, so the tracker will
35
+not know that both connections originate from your browser.
36
+</p>
37
+ 
38
+<p>
39
+On the other hand, all connections to a single website address will be
40
+made over the same Tor circuit, meaning you can browse different pages
41
+of a single website in separate tabs or windows, without any loss of
42
+functionality.
43
+</p>
44
+</section>
45
+
46
+<section id="logins">
47
+<title>Logging in over Tor</title>
48
+<p>
49
+Although Tor Browser is designed to enable total user anonymity on the web,
50
+there may be situations in which it makes sense to use Tor with websites
51
+that require usernames, passwords, or other identifying information.
52
+</p>
53
+ 
54
+<p>
55
+If you log into a website using a regular browser, you also reveal your
56
+IP address and geographical location in the process. The same is often
57
+true when you send an email. Logging into your social networking or
58
+email accounts using Tor Browser allows you to choose exactly which
59
+information you reveal to the websites you browse. Logging in using Tor
60
+Browser is also useful if the website you are trying to reach is
61
+censored on your network.
62
+</p>
63
+ 
64
+<p>
65
+When you log in to a website over Tor, there are several points you
66
+should bear in mind:
67
+</p>
68
+ 
69
+<list>
70
+ <item>
71
+  <p>
72
+  See the <link
73
+  xref='secure-connections'>Secure Connections</link> page
74
+  for important information on how to secure your connection when
75
+  logging in.
76
+  </p>
77
+ </item>
78
+ <item>
79
+  <p>
80
+  Tor Browser often makes your connection appear as though it is coming
81
+  from an entirely different part of the world. Some websites, such as
82
+  banks or email providers, might interpret this as a sign that your
83
+  account has been hacked or compromised, and lock you out. The only
84
+  way to resolve this is by following the site’s recommended procedure
85
+  for account recovery, or contacting the operators and explaining the
86
+  situation.
87
+  </p>
88
+ </item>
89
+</list>
90
+</section>
91
+
92
+<section id="new-identity">
93
+<title>Changing identities and circuits</title>
94
+<p>
95
+Tor Browser features “New Identity” and “New Tor Circuit for this Site”
96
+options, located in the Torbutton menu.
97
+</p>
98
+ 
99
+<terms>
100
+ <item>
101
+  <title>New Identity</title>
102
+  <p>
103
+  This option is useful if you want to prevent your subsequent browser
104
+  activity from being linkable to what you
105
+  were doing before. Selecting it will close all your open tabs and
106
+  windows, clear all private information such as cookies and browsing
107
+  history, and use new Tor circuits for all connections. Make sure you
108
+  have completely finished all activity and downloads before clicking
109
+  “New Identity”, as you will not be able to resume them in the new
110
+  browser window without starting all over again.
111
+  </p>
112
+ </item>
113
+ <item>
114
+  <title>New Tor Circuit for this Site</title>
115
+  <p>
116
+  This option is useful if the <link
117
+  xref='about-tor-browser#how-tor-works'>exit relay</link> you are
118
+  using is unable to connect to the website you require, or is not
119
+  loading it properly. Selecting it will cause the currently-active
120
+  tab or window to be reloaded over a new Tor circuit. Other open tabs
121
+  and windows from the same website will use the new circuit as well
122
+  once they are reloaded. This option does not clear any private
123
+  information or unlink your activity, nor does it affect your current
124
+  connections to other websites.
125
+  </p>
126
+  </item>
127
+ </terms>
128
+</section>
129
+</page>
... ...
@@ -0,0 +1,67 @@
1
+<page xmlns="http://projectmallard.org/1.0/"
2
+  type="topic"
3
+  id="onionsites">
4
+
5
+<info>
6
+  <desc>Websites hosted in the Tor network</desc>
7
+  <link type="guide" xref="index" />
8
+</info>
9
+
10
+<title>Onionsites</title>
11
+<p>
12
+Onionsites (also known as “hidden services”) are websites that are only
13
+accessible through the Tor network.
14
+</p>
15
+
16
+<p>
17
+Onionsites offer several advantages over ordinary sites on the
18
+non-private web:
19
+</p>
20
+
21
+<list>
22
+ <item>
23
+  <p>
24
+  An onionsite’s location and IP address are hidden, making it difficult
25
+  for adversaries to censor it or identify its operators.
26
+  </p>
27
+ </item>
28
+ <item>
29
+  <p>
30
+  All traffic between Tor users and onionsites is end-to-end encrypted,
31
+  so you do not need to worry about <link
32
+  xref='secure-connections'>connecting over HTTPS</link>.
33
+  </p>
34
+ </item>
35
+ <item>
36
+  <p>
37
+  The address of an onionsite is automatically generated, so the
38
+  operators do not need to purchase a domain name; the .onion URL also
39
+  helps Tor ensure that it is connecting to the right location and that
40
+  the connection is not being tampered with.
41
+  </p>
42
+ </item>
43
+</list>
44
+
45
+<section id="access">
46
+<title>How to access an onionsite</title>
47
+<p>
48
+Just like any other website, you will need to know the address of an
49
+onionsite in order to connect to it. An onion address is a string of
50
+sixteen mostly random letters and numbers, followed by “.onion”.
51
+</p>
52
+</section>
53
+
54
+<section id="troubleshooting">
55
+<title>Troubleshooting</title>
56
+<p>
57
+If you cannot reach the onionsite you require, make sure that you have
58
+entered the 16-character onion address correctly: even a small mistake
59
+will stop Tor Browser from being able to reach the site.
60
+</p>
61
+<p>
62
+If you are still unable to connect to the onionsite, please try again
63
+later. There may be a temporary connection issue, or the site operators
64
+may have allowed it to go offline without warning.
65
+</p>
66
+</section>
67
+</page>
... ...
@@ -0,0 +1,70 @@
1
+<page xmlns="http://projectmallard.org/1.0/"
2
+  type="topic"
3
+  id="plugins">
4
+
5
+<info>
6
+  <desc>How Tor Browser handles browser plugins and add-ons</desc>
7
+  <link type="guide" xref="index" group="#last" />
8
+</info>
9
+
10
+<title>Flash, JavaScript, and other add-ons</title>
11
+
12
+<section id="flash">
13
+<title>Flash Player</title>
14
+ <p>
15
+ Video websites, such as YouTube and Vimeo, make use of the
16
+ Flash Player plugin to display video content. Unfortunately, this
17
+ software operates independently of Tor Browser and cannot easily be
18
+ made to obey Tor Browser’s proxy settings. It can therefore reveal your
19
+ real location and IP address to the website operators, or to an outside
20
+ observer. For this reason, Flash is disabled by default in Tor Browser,
21
+ and enabling it is not recommended.
22
+ </p>
23
+ <p>
24
+ Some video websites offer alternative video delivery methods that do
25
+ not use Flash. These methods may be compatible with Tor Browser.
26
+ </p>
27
+</section>
28
+
29
+<section id="javascript">
30
+<title>JavaScript</title>
31
+<p>
32
+JavaScript is a programming language that websites use to offer
33
+interactive elements such as video, animation, audio, and status
34
+timelines. Unfortunately, JavaScript can also enable attacks on the
35
+security of the browser, which might lead to deanonymization.
36
+</p>
37
+ 
38
+<p>
39
+Tor Browser includes an add-on called NoScript, accessed through the
40
+“S” icon at the top-left of the window, which allows you to control the
41
+JavaScript that runs on individual web pages, or to block it entirely.
42
+</p>
43
+ 
44
+<p>
45
+Users who require a high degree of security in their web browsing should
46
+select “Forbid Scripts Globally” from the NoScript drop-down menu. This
47
+setting is also activated by default when Tor Browser’s <link
48
+xref='security-slider'>Security Slider</link> is set to “Medium-High”
49
+(for non-HTTPS websites) or “High” (for all websites). However, disabling
50
+JavaScript will prevent many websites from displaying correctly, so Tor
51
+Browser’s default setting is to allow all websites to run scripts.
52
+</p>
53
+</section>
54
+
55
+<section id="add-ons">
56
+<title>Browser Add-ons</title>
57
+<p>
58
+Tor Browser is based on Firefox, and any browser add-ons or themes that
59
+are compatible with Firefox can also be installed in Tor Browser.
60
+</p>
61
+ 
62
+<p>
63
+However, the only add-ons that have been tested for use with Tor Browser
64
+are those included by default. Installing any other browser
65
+add-ons may break functionality in Tor Browser or cause more serious
66
+problems that affect your privacy and security, and is done at your own
67
+risk.
68
+</p>
69
+</section>
70
+</page>
... ...
@@ -0,0 +1,118 @@
1
+<page xmlns="http://projectmallard.org/1.0/"
2
+      xmlns:its="http://www.w3.org/2005/11/its"
3
+      xmlns:xi="http://www.w3.org/2001/XInclude"
4
+  type="topic"
5
+  id="secure-connections">
6
+
7
+  <info>
8
+    <desc>Learn how to protect your data using Tor Browser and HTTPS</desc>
9
+    <link type="guide" xref="index" />
10
+  </info>
11
+
12
+  <title>Secure Connections</title>
13
+
14
+  <p>
15
+  If personal information such as a login password travels
16
+  unencrypted over the Internet, it can very easily be intercepted by an
17
+  eavesdropper. If you are logging into any website, you should
18
+  make sure that the site offers HTTPS encryption, which protects against
19
+  this kind of eavesdropping. You can verify this in the URL bar: if your
20
+  connection is encrypted, the address will begin with “https://”, rather
21
+  than “http://”.
22
+  </p>
23
+   
24
+  <p>
25
+  The following visualization shows what information is visible to
26
+  eavesdroppers with and without Tor Browser and HTTPS encryption:
27
+  </p>
28
+
29
+    <xi:include href="media/tor-and-https.svg" />
30
+
31
+    <list>
32
+      <item>
33
+        <p>
34
+          Click the “Tor” button to see what data is visible to
35
+          observers when you're using Tor. The button will turn green to
36
+          indicate that Tor is on.
37
+        </p>
38
+      </item>
39
+      <item>
40
+        <p>
41
+          Click the “HTTPS” button to see what data is visible to
42
+          observers when you're using HTTPS. The button will turn green to
43
+          indicate that HTTPS is on.
44
+        </p>
45
+      </item>
46
+      <item>
47
+        <p>
48
+          When both buttons are green, you see the data that is visible to
49
+          observers when you are using both tools.
50
+        </p>
51
+      </item>
52
+      <item>
53
+        <p>
54
+          When both buttons are grey, you see the data that is visible
55
+          to observers when you don't use either tool.
56
+        </p>
57
+      </item>
58
+    </list>
59
+    <terms>
60
+      <title>Potentially visible data</title>
61
+      <item>
62
+        <title its:translate="no">
63
+          <xi:include href="media/tor-and-https.svg" parse="xml"
64
+                      xpointer="xpointer(//*[@id='string-site']/text())">
65
+             <xi:fallback>site.com</xi:fallback>
66
+          </xi:include>
67
+        </title>
68
+        <p>
69
+          The site being visited.
70
+        </p>
71
+      </item>
72
+      <item>
73
+        <title its:translate="no">
74
+          <xi:include href="media/tor-and-https.svg" parse="xml"
75
+                      xpointer="xpointer(//*[@id='string-login']/text())">
76
+            <xi:fallback>user / pw</xi:fallback>
77
+          </xi:include>
78
+        </title>
79
+        <p>
80
+          Username and password used for authentication.
81
+        </p>
82
+      </item>
83
+      <item>
84
+        <title its:translate="no">
85
+          <xi:include href="media/tor-and-https.svg" parse="xml"
86
+                      xpointer="xpointer(//*[@id='string-data']/text())">
87
+            <xi:fallback>data</xi:fallback>-->
88
+          </xi:include>
89
+        </title>
90
+        <p>
91
+          Data being transmitted.
92
+        </p>
93
+      </item>
94
+      <item>
95
+        <title its:translate="no">
96
+          <xi:include href="media/tor-and-https.svg" parse="xml"
97
+                      xpointer="xpointer(//*[@id='string-location']/text())">
98
+            <xi:fallback>location</xi:fallback>
99
+          </xi:include>
100
+        </title>
101
+        <p>
102
+          Network location of the computer used to visit the website (the public
103
+          IP address).
104
+        </p>
105
+      </item>
106
+      <item>
107
+        <title its:translate="no">
108
+          <xi:include href="media/tor-and-https.svg" parse="xml"
109
+                      xpointer="xpointer(//*[@id='string-tor']/text())">
110
+            <xi:fallback>Tor</xi:fallback>
111
+          </xi:include>
112
+        </title>
113
+        <p>
114
+         Whether or not Tor is being used.
115
+        </p>
116
+      </item>
117
+    </terms>
118
+</page>
... ...
@@ -0,0 +1,76 @@
1
+<page xmlns="http://projectmallard.org/1.0/"
2
+  type="topic"
3
+  id="security-slider">
4
+
5
+<info>
6
+  <desc>Configuring Tor Browser for security and usability</desc>
7
+  <link type="guide" xref="index" />
8
+</info>
9
+
10
+<title>Security Slider</title>
11
+<p>
12
+Tor Browser includes a “Security Slider” that lets you
13
+increase your security by disabling certain web features that can be
14
+used to attack your security and anonymity. Increasing Tor Browser’s
15
+security level will stop some web pages from functioning properly, so
16
+you should weigh your security needs against the degree of usability
17
+you require.
18
+</p>
19
+ 
20
+<section id="access">
21
+<title>Accessing the Security Slider</title>
22
+<p>
23
+The Security Slider is located in Torbutton’s “Privacy and Security
24
+Settings” menu.
25
+</p>
26
+</section>
27
+
28
+<section id="levels">
29
+<title>Security Levels</title>
30
+<p>
31
+Increasing the level of the Security Slider will disable or partially
32
+disable certain browser features to protect against possible attacks.
33
+</p>
34
+
35
+<terms>
36
+ <item>
37
+  <title>Low</title>
38
+  <p>
39
+  At this level, all browser features are enabled. This is the most
40
+  usable option.
41
+  </p>
42
+ </item>
43
+ <item>
44
+  <title>Medium-Low</title>
45
+  <p>
46
+  At this level, HTML5 video and audio media become click-to-play via
47
+  NoScript; some <link xref='plugins'>JavaScript</link> performance
48
+  optimizations are disabled, causing some websites to run more slowly;
49
+  and some mathematical equations may not display properly.
50
+  </p>
51
+ </item>
52
+ <item>
53
+  <title>Medium-High</title>
54
+  <p>
55
+  At this level, HTML5 video and audio media become click-to-play via
56
+  NoScript; all JavaScript performance optimizations are disabled; some
57
+  mathematical equations may not display properly; some font rendering
58
+  features are disabled; some types of image are disabled; and
59
+  JavaScript is disabled by default on all non-<link
60
+  xref='secure-connections'>HTTPS</link> sites.
61
+  </p>
62
+ </item>
63
+ <item>
64
+  <title>High</title>
65
+  <p>
66
+  At this level, HTML5 video and audio media become click-to-play via
67
+  NoScript; all JavaScript performance optimizations are disabled; some
68
+  mathematical equations may not display properly; some font rendering
69
+  features are disabled; some types of image are disabled; Javascript
70
+  is disabled by default on all sites; most video and audio formats are
71
+  disabled; and some fonts and icons may not display correctly.
72
+  </p>
73
+ </item>
74
+</terms>
75
+</section>
76
+</page>
... ...
@@ -1,228 +0,0 @@
1
-<page xmlns="http://projectmallard.org/1.0/"
2
-      xmlns:its="http://www.w3.org/2005/11/its"
3
-      xmlns:xi="http://www.w3.org/2001/XInclude"
4
-      type="topic"
5
-      id="tor">
6
-
7
-  <info>
8
-    <link type="guide" xref="index" group="#first"/>
9
-    <desc>Learn what Tor can do to protect your privacy and anonymity.</desc>
10
-  </info>
11
-
12
-  <title>Tor</title>
13
-
14
-  <section id="what-tor-will-do">
15
-    <title>What Tor will do</title>
16
-
17
-    <p>
18
-      The <app its:translate="no">Tor Browser</app> uses the <app
19
-      its:translate="no">Tor</app> network to protect your privacy
20
-      and anonymity. Using the <app its:translate="no">Tor</app> network has two
21
-      main properties:
22
-    </p>
23
-
24
-    <list>
25
-      <item>
26
-        <p>
27
-          The Internet access provider will not be able to learn the sites
28
-          being visited and will not be able to monitor the content of
29
-          the communication.
30
-        </p>
31
-      </item>
32
-      <item>
33
-        <p>
34
-          The sites will see a connection coming from the <app
35
-          its:translate="no">Tor</app> network and will not learn
36
-          the actual Internet connection used to visit them.
37
-        </p>
38
-      </item>
39
-    </list>
40
-
41
-    <p>
42
-      On top of that, the <app its:translate="no">Tor Browser</app> is designed
43
-      to minimize the ability of websites to fingerprint the browser.
44
-    </p>
45
-    <p>
46
-      The Tor Browser does not keep any browsing history. <em>Cookies</em>
47
-      are only valid for a single session: until the <app its:translate="no">Tor
48
-      Browser</app> is exited or a <!-- XXX: add link --><gui>New Identity</gui>
49
-      is requested.
50
-    </p>
51
-
52
-    <!-- XXX: add Tor Browser team/mikeperry about things that are worth
53
-    adding here. -->
54
-  </section>
55
-
56
-  <section id="what-tor-will-not-do">
57
-    <title>What Tor will <em>not</em> do</title>
58
-
59
-    <p>
60
-      <app its:translate="no">Tor</app> and the <app its:translate="no">Tor
61
-      Browser</app> will protect your privacy and anonymity only if used
62
-      appropriately.
63
-    </p>
64
-
65
-    <list>
66
-      <item>
67
-        <p>
68
-          <app its:translate="no">Tor</app> will not encrypt the whole
69
-          communication. What is sent to the <app its:translate="no">Tor</app>
70
-          network is what leaves the <app its:translate="no">Tor</app> network.
71
-          For web browsing, this means that any confidential information
72
-          should be sent using the HTTPS protocol.
73
-          <!-- XXX: add a link to another topic page / document HTTPS Everywhere
74
-          -->
75
-          <!-- XXX: mention hidden services? -->
76
-        </p>
77
-      </item>
78
-      <item>
79
-        <p>
80
-          If you give a website identifying information (e.g. a name, a
81
-          <em>login</em>), you will no longer be an anonymous visitor of this
82
-          website.
83
-        </p>
84
-      </item>
85
-      <item>
86
-        <p>
87
-          If you transfer files, they can contain identifying information in their
88
-          metadata, like the camera serial number.
89
-        </p>
90
-      </item>
91
-      <item>
92
-        <p>
93
-          Only connections made through the <app its:translate="no">Tor
94
-          Browser</app> will go through the <app its:translate="no">Tor</app>
95
-          network. Unless specific steps are taken, other applications on your
96
-          computer will continue to do direct Internet connections and can
97
-          reveal your location.
98
-          <!-- XXX: add topic page on how to deal with external documents? /
99
-          mention Tails? -->
100
-        </p>
101
-      </item>
102
-    </list>
103
-
104
-    <p>
105
-      If loosing control over some information might have problematic
106
-      consequences, it is sometimes better to leave it off computers entirely.
107
-    </p>
108
-  </section>
109
-
110
-  <section id="how-tor-works">
111
-    <title>How Tor works</title>
112
-
113
-    <p>
114
-      Tor is a network of virtual tunnels that allows you to improve your
115
-      privacy and security on the Internet. Tor works by sending your
116
-      traffic through three random servers (also known as <em>relays</em>)
117
-      in the Tor network, before the traffic is sent out onto the public
118
-      Internet
119
-    </p>
120
-    <media type="image" src="media/how-tor-works.png" />
121
-    <p>
122
-      The image above illustrates a user browsing to different websites
123
-      over Tor. The green monitors represent relays in the Tor network,
124
-      while the three keys represent the layers of encryption between the
125
-      user and each relay.
126
-    </p>
127
-  </section>
128
-
129
-  <section id="tor-and-https">
130
-    <title>Tor and HTTPS</title>
131
-
132
-    <p>
133
-      The following visualization helps understanding what data are visible to
134
-      eavesdroppers with or without the <app its:translate="no">Tor Browser</app>
135
-      and when encrypted connections (HTTPS) or not:
136
-    </p>
137
-
138
-    <xi:include href="media/tor-and-https.svg" />
139
-
140
-    <list>
141
-      <item>
142
-        <p>
143
-          Click the <gui>Tor</gui> button to see what data is visible to
144
-          eavesdroppers when you're using Tor. The button will turn green to
145
-          indicate that Tor is on.
146
-        </p>
147
-      </item>
148
-      <item>
149
-        <p>
150
-          Click the <gui>HTTPS</gui> button to see what data is visible to
151
-          eavesdroppers when you're using HTTPS. The button will turn green to
152
-          indicate that HTTPS is on.
153
-        </p>
154
-      </item>
155
-      <item>
156
-        <p>
157
-          When both buttons are green, you see the data that is visible to
158
-          eavesdroppers when you are using both tools.
159
-        </p>
160
-      </item>
161
-      <item>
162
-        <p>
163
-          When both buttons are grey, you see the data that is visible
164
-          to eavesdroppers when you don't use either tool.
165
-        </p>
166
-      </item>
167
-    </list>
168
-    <terms>
169
-      <title>Potentially visible data</title>
170
-      <item>
171
-        <title its:translate="no">
172
-          <xi:include href="media/tor-and-https.svg" parse="xml"
173
-                      xpointer="xpointer(//*[@id='string-site']/text())">
174
-             <xi:fallback>site.com</xi:fallback>
175
-          </xi:include>
176
-        </title>
177
-        <p>
178
-          The site being visited.
179
-        </p>
180
-      </item>
181
-      <item>
182
-        <title its:translate="no">
183
-          <xi:include href="media/tor-and-https.svg" parse="xml"
184
-                      xpointer="xpointer(//*[@id='string-login']/text())">
185
-            <xi:fallback>user / pw</xi:fallback>
186
-          </xi:include>
187
-        </title>
188
-        <p>
189
-          Username and password used for authentication.
190
-        </p>
191
-      </item>
192
-      <item>
193
-        <title its:translate="no">
194
-          <xi:include href="media/tor-and-https.svg" parse="xml"
195
-                      xpointer="xpointer(//*[@id='string-data']/text())">
196
-            <xi:fallback>data</xi:fallback>-->
197
-          </xi:include>
198
-        </title>
199
-        <p>
200
-          Data being transmited.
201
-        </p>
202
-      </item>
203
-      <item>
204
-        <title its:translate="no">
205
-          <xi:include href="media/tor-and-https.svg" parse="xml"
206
-                      xpointer="xpointer(//*[@id='string-location']/text())">
207
-            <xi:fallback>location</xi:fallback>
208
-          </xi:include>
209
-        </title>
210
-        <p>
211
-          Network location of the computer used to visit the website (the public
212
-          IP address).
213
-        </p>
214
-      </item>
215
-      <item>
216
-        <title its:translate="no">
217
-          <xi:include href="media/tor-and-https.svg" parse="xml"
218
-                      xpointer="xpointer(//*[@id='string-tor']/text())">
219
-            <xi:fallback>Tor</xi:fallback>
220
-          </xi:include>
221
-        </title>
222
-        <p>
223
-         Whether or not Tor is being used.
224
-        </p>
225
-      </item>
226
-    </terms>
227
-  </section>
228
-</page>
... ...
@@ -0,0 +1,112 @@
1
+<page xmlns="http://projectmallard.org/1.0/"
2
+  type="topic"
3
+  id="transports">
4
+
5
+<info>
6
+  <desc>Types of pluggable transport</desc>
7
+  <link type="topic" xref="circumvention" />
8
+</info>
9
+
10
+<title>Pluggable Transports</title>
11
+
12
+<p>
13
+Pluggable transports are tools that Tor can use to disguise the
14
+traffic it sends out. This can be useful in situations where an Internet
15
+Service Provider or other authority is actively blocking connections to
16
+the Tor network.
17
+</p>
18
+
19
+<section id="types">
20
+<title>Types of pluggable transport</title>
21
+<p>
22
+Currently there are six pluggable transports available, but more are
23
+being developed.
24
+</p>
25
+<table frame='all' rules='all'>
26
+  <tr>
27
+    <td>
28
+      <p>
29
+      obfs2
30
+      </p> 
31
+    </td>
32
+    <td>
33
+      <p>
34
+      Censors have learned how to identify obfs2 bridges. This transport 
35
+      is deprecated, and you should not use it.
36
+      </p>
37
+    </td>
38
+  </tr>
39
+  <tr>
40
+    <td>
41
+      <p>
42
+      obfs3
43
+      </p>
44
+    </td>
45
+    <td>
46
+      <p>
47
+      obfs3 disguises Tor traffic as random noise. obfs3 bridges work 
48
+      almost everywhere, though some may have been identified and
49
+      blocked by censors.
50
+      </p>
51
+    </td>
52
+  </tr>
53
+  <tr>
54
+    <td>
55
+      <p>
56
+      Scramblesuit
57
+      </p>
58
+    </td>
59
+    <td>
60
+      <p>
61
+      Scramblesuit is an additional tool for the obfs3 transport that
62
+      tries to stop censors from identifying bridges through active
63
+      probing.
64
+      </p>
65
+    </td>
66
+  </tr>
67
+  <tr>
68
+    <td>
69
+      <p>
70
+      obfs4
71
+      </p>
72
+    </td>
73
+    <td>
74
+      <p>
75
+      obfs4 offers the same features as Scramblesuit, but uses different
76
+      cryptographic and authentication methods that result in improved
77
+      speed.
78
+      </p>
79
+    </td>
80
+  </tr>
81
+  <tr>
82
+   <td>
83
+    <p>
84
+    meek
85
+    </p>
86
+   </td>
87
+   <td>
88
+    <p>
89
+    Rather than using bridges, meek works by making your Tor traffic
90
+    seem as though it is destined for a major website that a censor
91
+    cannot block without disrupting a lot of other activity on the
92
+    network.
93
+    </p>
94
+   </td>
95
+  </tr>
96
+  <tr>
97
+    <td>
98
+      <p>
99
+      FTE
100
+      </p>
101
+    </td>
102
+    <td>
103
+      <p>
104
+      Format-Transforming Encryption disguises Tor traffic as web (HTTP) 
105
+      traffic or other types of internet traffic. FTE bridges are 
106
+      effective, but in limited supply. 
107
+      </p>
108
+    </td>
109
+  </tr>
110
+</table>
111
+</section>
112
+</page>
... ...
@@ -4,51 +3,117 @@
4 3
   id="troubleshooting">
5 4
 
6 5
 <info>
7
-  <desc>What to do if Tor Browser doesn't work.</desc>
6
+  <desc>What to do if Tor Browser doesn’t work.</desc>
8 7
   <link type="guide" xref="index" group="#last" />
9 8
 </info>
10 9
 
11 10
 <title>Troubleshooting</title>
12 11
 
13 12
 <p>
14
-The Tor Browser should get you online automatically after clicking the 
15
-"Connect" button on the start up screen. 
13
+You should be able to start browsing the web using Tor Browser shortly
14
+after running the program, and clicking the “Connect” button if you are
15
+using it for the first time.
16 16
 </p>
17 17
 
18 18
 <media type="image" src="media/tor-launcher-connect_en-US.png" />
19 19
 
20
+<section id="no-connection">
21
+<title>Quick fixes</title>
20 22
 <p>
21
-If it doesn't connect, there may be a simple fix. Try each of the following: 
23
+If Tor Browser doesn’t connect, there may be a simple solution. Try each
24
+of the following:
22 25
 </p>
23 26
 
24 27
 <list>
25 28
   <item>
26
-    <p>Make sure another Tor Browser is not already running. If you're 
27
-       not sure if Tor Browser is running, restart your computer.</p>
29
+    <p>
30
+    Your computer’s system clock must be set correctly, or Tor will not
31
+    be able to connect.
32
+    </p>
33
+  </item>
34
+  <item>
35
+    <p>
36
+    Make sure another Tor Browser is not already running. If you’re 
37
+    not sure if Tor Browser is running, restart your computer.
38
+    </p>
28 39
   </item>
29 40
   <item>
30
-    <p>'Allow' Tor in your antivirus program.</p>
41
+    <p>
42
+    Make sure that any antivirus program you have installed is not
43
+    preventing Tor from running. You may need to consult the
44
+    documentation for your antivirus software if you do not know how to
45
+    do this.
46
+    </p>
31 47
   </item>
32 48
   <item>
33
-    <p>Temporarily disable your firewall.</p>
49
+    <p>
50
+    Temporarily disable your firewall.
51
+    </p>
34 52
   </item>
35 53
   <item>
36
-    <p>Delete Tor Browser and install it again. If updating, do not overwrite 
37
-       your previous Tor Browser files.</p>
54
+    <p>
55
+    Delete Tor Browser and install it again. If updating, do not just
56
+    overwrite your previous Tor Browser files; ensure they are fully
57
+    deleted beforehand.
58
+    </p>
38 59
   </item>
39 60
 </list>
61
+</section>
40 62
 
63
+<section id="blocked">
64
+<title>Is your connection censored?</title>
41 65
 <p>
42
-If you still can't connect, your internet service provider might be censoring 
43
-connections to Tor. Follow the instructions in the <link 
44
-xref='circumvention'>Circumvention</link> section.
66
+If you still can’t connect, your Internet Service Provider might be
67
+censoring connections to the Tor network. Read the <link
68
+xref='circumvention'>Circumvention</link> section for possible
69
+solutions.
45 70
 </p>
71
+</section>
46 72
 
73
+<section id="known-issues">
74
+<title>Known issues</title>
47 75
 <p>
48
-If the above steps do not address your problem, email help@rt.torproject.org 
49
-with your operating system, the details of your problem, and what you've 
50
-already tried.
76
+Tor Browser is under constant development, and some issues are known
77
+about but not yet fixed. Please check the <link
78
+xref='known-issues'>Known Issues</link> page to see if the problem you
79
+are experiencing is already listed there.
51 80
 </p>
81
+</section>
52 82
 
53
-</page>
83
+<section id="helpdesk">
84
+<title>Contacting the Tor Help Desk</title>
85
+<p>
86
+If the above steps do not help you solve the problem, you can contact
87
+Tor’s help desk. Send an email to help@rt.torproject.org with exact
88
+details of the problem, your operating system, and the steps you have
89
+already tried. Please only contact the help desk if you cannot find the
90
+answer to your question in this manual.
91
+</p>
54 92
 
93
+<p>
94
+If possible, you should also include the “Tor log”, an
95
+automatically-generated list of Tor’s activity that can help diagnose
96
+the problem. To copy the Tor log, either:
97
+</p>
98
+<list>
99
+ <item>
100
+  <p>
101
+  click the button labelled “Copy Tor Log To Clipboard” that appears in
102
+  the dialog window while Tor Browser is connecting to the network, or
103
+  </p>
104
+ </item>
105
+ <item>
106
+  <p>
107
+  if Tor Browser is already open, click on the Torbutton icon (the small
108
+  green onion at the top left of the screen), then “Open Network
109
+  Settings”, then “Copy Tor Log To Clipboard”.
110
+  </p>
111
+ </item>
112
+</list>
113
+<p>
114
+You can now paste the Tor log into your support request.
115
+</p>
116
+<!-- XXX: Include a screenshot of this -->
117
+</section>
118
+
119
+</page>
... ...
@@ -5,24 +4,25 @@
5 4
 
6 5
 <info>
7 6
   <desc>How to remove Tor Browser from your system.</desc>
8
-  <link type="guide" xref="index"/>
7
+  <link type="guide" xref="index" group="#last" />
9 8
 </info>
10 9
 
11 10
 <title>Uninstalling</title>
12 11
 
13 12
 <p>
14
-The Tor Browser does not affect any of the existing software 
15
-or settings on your computer. Uninstalling Tor Browser will not affect your 
16
-system's software or settings either.  
13
+Tor Browser does not affect any of the existing software or settings on
14
+your computer. Uninstalling Tor Browser will not affect your system’s
15
+software or settings.  
17 16
 </p>
18 17
 
19 18
 <p>
20
-Removing the Tor Browser from your system is simple:
19
+Removing Tor Browser from your system is simple:
21 20
 </p>
22 21
 
23 22
 <steps>
24 23
   <item>
25 24
     <p>Locate your Tor Browser folder. The default location is your Desktop.</p>
25
+    <!-- is that true? -->
26 26
   </item>
27 27
   <item>
28 28
     <p>Delete the Tor Browser folder.</p>
... ...
@@ -33,7 +33,8 @@ Removing the Tor Browser from your system is simple:
33 33
 </steps>
34 34
 
35 35
 <p>
36
-Note that your operating system's standard "Uninstall" utility is not used.
36
+Note that your operating system’s standard “Uninstall” utility is not
37
+used.
37 38
 </p>
38 39
 
39 40
 </page>
... ...
@@ -0,0 +1,73 @@
1
+<page xmlns="http://projectmallard.org/1.0/"
2
+  type="topic"
3
+  id="updating">
4
+
5
+<info>
6
+  <desc>How to update Tor Browser</desc>
7
+  <link type="guide" xref="index" />
8
+</info>
9
+
10
+<title>Updating</title>
11
+
12
+<p>
13
+Tor Browser must be kept updated at all times. If you continue to use an
14
+outdated version of the software, you may be vulnerable to serious
15
+security flaws that compromise your privacy and anonymity.
16
+</p>
17
+
18
+<p>
19
+Tor Browser will prompt you to update the software once a new version
20
+has been released: the Torbutton icon will display a yellow triangle,
21
+and you may see a written update indicator when Tor Browser opens. You
22
+can update either automatically or manually.
23
+</p>
24
+
25
+<!-- XXX: Screenshot of update warning, plus screenshots for all the steps below -->
26
+
27
+<section id="automatic">
28
+<title>Updating Tor Browser automatically</title>
29
+<steps>
30
+ <item>
31
+  <p>
32
+  When you are prompted to update Tor Browser, click on the Torbutton
33
+  icon, then select “Check for Tor Browser Update”.
34
+  </p>
35
+ </item>
36
+ <item>
37
+  <p>
38
+  When Tor Browser has finished checking for updates, click on the
39
+  “Update” button and wait for the update to download and install.
40
+  </p>
41
+ </item>
42
+ <item>
43
+  <p>
44
+  Restart Tor Browser. You will now be running the latest version.
45
+  </p>
46
+ </item>
47
+</steps>
48
+</section>
49
+<section id="manual">
50
+<title>Updating Tor Browser manually</title>
51
+<steps>
52
+ <item>
53
+  <p>
54
+  When you are prompted to update Tor Browser, finish the browsing
55
+  session and close the program.
56
+  </p>
57
+ </item>
58
+ <item>
59
+  <p>
60
+  Remove Tor Browser from your system by deleting the folder that
61
+  contains it (see the <link xref='uninstalling'>Uninstalling</link>
62
+  section for more information).
63
+  </p>
64
+ </item>
65
+ <item>
66
+  <p>
67
+  Visit https://www.torproject.org and download a copy of the latest Tor
68
+  Browser release, then install it as before.
69
+  </p>
70
+ </item>
71
+</steps>
72
+</section>
73
+</page>
0 74