Commit 436fb1a1 authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'origin/web/9323-replace-old-documentation' into...

Merge remote-tracking branch 'origin/web/9323-replace-old-documentation' into web/9323-replace-old-documentation
parents 6a96bac6 fe483c7e
......@@ -138,6 +138,7 @@ To continue discovering Tails, you can now read:
- the [[warning page|doc/about/warning]] to better understand the security limitations of Tails and Tor,
- more details about the [[features and software|doc/about/features]] included in Tails,
- our [[installation instructions|install]] to download and install Tails,
- our [[documentation|doc]] explaining in detail how to use Tails,
- some hints on why [[you should trust Tails|doc/about/trust]],
- our [[design document|contribute/design]] laying out Tails specification, threat model and implementation,
......
......@@ -23,8 +23,8 @@ documentation|/contribute/how/documentation]].
- [[Install from another Tails (for PC)|install/win/clone/overview]]
- [[Install from another Tails (for Mac)|install/mac/clone/overview]]
- [[Install from Windows|install/win/usb/overview]]
- [[Install from Ubuntu|install/debian/usb/overview]]
- [[Install from Ubuntu and the command line|install/expert/usb/overview]]
- [[Install from Debian or Ubuntu|install/debian/usb/overview]]
- [[Install from Debian or Ubuntu using the command line and GnuPG|install/expert/usb/overview]]
- [[Install from other Linux distributions|install/linux/usb/overview]]
- [[Install from Mac OS X by burning a DVD first|install/mac/dvd/overview]]
- [[Install from Mac OS X and the command line|install/mac/usb/overview]]
......
......@@ -82,7 +82,7 @@ Encryption and privacy
* [Paperkey](http://www.jabberwocky.com/software/paperkey/) a command line tool to back up OpenPGP secret keys on paper ([[More...|doc/advanced_topics/paperkey]])
The full packages list can be found in the [BitTorrent files download
directory](/torrents/files/) (look for files with the `.packages`
directory](https://tails.boum.org/torrents/files/) (look for files with the `.packages`
extension).
Additional software
......
<div class="tip">
<p>For installing and starting Tails, we recommend you try our new
[[installation assistant|install]]. The following pages are the old
instructions, provided as a fallback.</p>
</div>
- [[!traillink Start_Tails|first_steps/start_tails]]
- [[!traillink Startup_options|first_steps/startup_options]]
- [[!traillink Administration_password|first_steps/startup_options/administration_password]]
......
......@@ -79,9 +79,3 @@ Greeter</span>:
- [[Tor bridge mode|bridge_mode]]
- [[Disabling all networking (offline_mode)|offline_mode]]
- [[Encrypted persistence|doc/first_steps/persistence/use]]
Problems booting?
=================
If you have problems booting Tails, please read the [[following
guidelines|doc/first_steps/bug_reporting/tails_does_not_start]].
......@@ -157,9 +157,10 @@ But, while doing so, you could download malicious information if our
website is compromised or if you are victim of a [[man-in-the-middle
attack|doc/about/warning#man-in-the-middle]].
The OpenPGP verification allows you to verify the ISO image even better
The OpenPGP verification is the only technique that allows you to verify the ISO image even better
by also authenticating the Tails signing key through the OpenPGP Web of
Trust, without having to trust your download.
Trust. Relying on the OpenPGP Web of Trust is the only way to completely
protect you from malicious downloads.
<div class="note">
......@@ -171,7 +172,7 @@ Tails installation already because you are not downloading it.</p>
</div>
One of the inherent problems of standard HTTPS is that the trust we usually put
on a website is defined by certificate authorities: a hierarchical and closed
in a website is defined by certificate authorities: a hierarchical and closed
set of companies and governmental institutions approved by your web browser vendor.
This model of trust has long been criticized and proved several times to be
vulnerable to attacks [[as explained on our warning page|doc/about/warning#man-in-the-middle]].
......@@ -196,13 +197,13 @@ this problem. Let's see this with an example:
In this scenario, Alice found a path to trust the Tails signing key
without the need to rely on certificate authorities.
<div class="note">
<div class="tip">
<p>If you are on Debian or Ubuntu, you can install the
<code>debian-keyring</code> package which contains the OpenPGP keys of
all Debian developers. Some Debian developers have certified the Tails
signing key and you can use these certifications to build a trust path.
This technique is explained in detail in our instructions for
This technique is explained in detail in our instructions on
[[installing Tails from Debian or Ubuntu using the command
line|install/expert/usb]].</p>
......
......@@ -1106,6 +1106,10 @@ div.trophy {
background-image: url(lib/trophy-gold.png);
}
div.bug pre, div.caution pre, div.next pre, div.note pre, div.tip pre, div.trophy pre {
max-width: 34em;
}
/* Inlined 16x16 icons */
img.symbolic {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment