Commit a300a558 authored by sajolida's avatar sajolida
Browse files

Revert "Temporarily remove Debian"

This reverts commit 4678906e.

Conflicts:
	wiki/src/install/debian/usb.mdwn
	wiki/src/install/expert/usb.mdwn
	wiki/src/install/inc/steps/not_at_all.inline.mdwn
parent 82b0cbf2
[[!meta robots="noindex"]]
[[!meta title="Ubuntu"]]
[[!meta title="Debian (& Ubuntu, Linux Mint, etc.)"]]
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/router-debian" rel="stylesheet" title=""]]
......@@ -8,7 +8,7 @@
[[<span class="back">Back</span>|install/os]]
<h1 class="text-center"><strong>Ubuntu</strong></h1>
<h1 class="text-center"><strong>Debian & Ubuntu</strong> <small>(Linux Mint, etc.)</small></h1>
<div id="scenarios" class="row">
<div class="col-md-6">
......@@ -39,7 +39,7 @@
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Install from Ubuntu</h3>
<h3 class="panel-title">Install from Debian</h3>
</div>
</div>
|debian/usb/overview]]
......@@ -47,7 +47,7 @@
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title"><small>Install from Ubuntu using the</small><br />command line <small> and </small> GnuPG</h3>
<h3 class="panel-title"><small>Install from Debian using the</small><br />command line <small> and </small> GnuPG</h3>
</div>
</div>
|expert/usb/overview]]
......
[[!meta robots="noindex"]]
[[!meta title="Installing Tails on a USB stick from Ubuntu"]]
[[!meta title="Installing Tails on a USB stick from Debian or Ubuntu"]]
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
......@@ -11,12 +11,51 @@
<div class="step-image">[[!img install/inc/infography/os-debian-ubuntu.png link="no"]]</div>
<p class="start">Start in Ubuntu.</p>
<p class="start">Start in Debian or Ubuntu.</p>
[[!inline pages="install/inc/steps/download.inline" raw="yes"]]
[[!inline pages="install/inc/steps/install_tails_installer.inline" raw="yes"]]
In Debian
---------
1. Make sure that you are connected to the Internet.
1. Start <span class="application">Synaptic Package Manager</span>.
1. Choose
<span class="guimenupath">
<span class="guimenu">Settings</span>&nbsp;▸
<span class="guimenuitem">Repositories</span></span>.
1. To add the *jessie-backports* repository, click
<span class="button">New</span> in the <span class="guilabel">Repositories</span>
dialog and specify:
- <span class="guilabel">URI</span>: *http://http.debian.net/debian*
- <span class="guilabel">Distributions</span>: *jessie-backports*
- <span class="guilabel">Section(s)</span>: *main*
1. Click <span class="button">Ok</span>.
1. In the confirmation dialog, click <span class="guilabel">Reload</span> and
wait for the download of the package information to finish.
1. In the main windows of <span class="application">Synaptic</span>, click
<span class="button">Search</span> and search for `tails-installer`.
1. In the list of packages, double-click on `tails-installer` to mark
`tails-installer` for installation.
1. Click on the <span class="button">Apply</span> button in the toolbar to
apply the changes.
1. After all the changes are applied, close <span class="application">Synaptic</span>.
In Ubuntu
---------
1. Make sure that you are connected to the Internet.
1. Start <span class="application">Ubuntu Software Center</span>.
......
[[!meta robots="noindex"]]
[[!meta title="Install from Ubuntu"]]
[[!meta title="Install from Debian"]]
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
......@@ -9,7 +9,7 @@
[[<span class="back">Back</span>|install/win]]
<h1 class="text-center">Install from <strong>Ubuntu</strong></h1>
<h1 class="text-center">Install from <strong>Debian</strong></h1>
[[!inline pages="install/inc/overview" raw="yes"]]
......
[[!meta robots="noindex"]]
[[!meta title="Installing Tails on a USB stick from Ubuntu using the command line"]]
[[!meta title="Installing Tails on a USB stick from Debian or Ubuntu using the command line"]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/expert" rel="stylesheet" title=""]]
<p>Start in Ubuntu.</p>
<p>Start in Debian or Ubuntu.</p>
Verify the Tails signing key
============================
......@@ -123,8 +123,14 @@ using the Tails signing key.
[[!inline pages="install/inc/steps/install_tails_installer.inline" raw="yes"]]
1. Execute the following command to add the
PPA repository to your system:
1. If you are running Debian, execute the following command to add the
backports repository to your system:
echo 'deb http://http.debian.net/debian jessie-backports main' | \
sudo tee /etc/apt/sources.list.d/jessie-backports.list
1. If you are running Ubuntu, execute the following command to add the
PPA repository to your system:
sudo add-apt-repository ppa:tails-team/tails-installer
......
[[!meta robots="noindex"]]
[[!meta title="Install from Ubuntu using the command line and GnuPG"]]
[[!meta title="Install from Debian using the command line and GnuPG"]]
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
......@@ -9,7 +9,7 @@
[[<span class="back">Back</span>|install/win]]
<h1 class="text-center"><small>Install from Ubuntu using the</small><br />command line <small> and </small> GnuPG</h1>
<h1 class="text-center"><small>Install from Debian using the</small><br />command line <small> and </small> GnuPG</h1>
[[!inline pages="install/inc/overview" raw="yes"]]
......
......@@ -5,13 +5,15 @@ In this step, you will install <span class="application">Tails
Installer</span>, a program designed specifically for installing Tails.
<span class="application">Tails Installer</span> is available in:
- Debian 8 (Jessie) or later in the backports repository
- Ubuntu 14.04 (Trusty) or later in a PPA (*Personal Package Archive*)
<div class="tip debian">
<p>To know your version of Ubuntu, open
<p>To know your version of Debian or Ubuntu, open
<span class="application">System Settings</span> and click on
<span class="guilabel">Details</span>.</p>
<span class="guilabel">Details</span>. For Debian, refer to the
<span class="guilabel">Base system</span> information.</p>
</div>
......@@ -25,7 +27,7 @@ Installer</span>, a program designed specifically for installing Tails.
<div class="tip">
<p>If it is impossible to install <span class="application">Tails
Installer</span> in your version of Ubuntu, you can [[install Tails using
Installer</span> in your version of Ubuntu or Debian, you can [[install Tails using
<span class="application">GNOME Disks</span>|install/linux/usb/overview]]
instead. But it is more complicated and requires two USB sticks instead of
one.</span></p>
......
......@@ -57,7 +57,7 @@
and press <span class="keycap">Enter</span>.
a. If the computer starts on another operating system or returns an
error message, then shut down the computer again and repeat step
error message, then shut down the computer again and repeat step
4 for all the potential boot menu keys identified in step 3.
If none of the potential boot menu keys identified in step 3 work or if
......
......@@ -60,7 +60,7 @@ from a Tails DVD in a similar way.</p>
<div class="note install-clone debian expert windows linux">
<p>Most computers do not start on Tails by default. If it does you
are lucky. Otherwise, if the computer starts on
<span class="debian expert">Ubuntu,</span>
<span class="debian expert">Debian or Ubuntu,</span>
<span class="windows">Windows,</span>
<span class="linux">Linux,</span>
<span class="install-clone">Windows or Linux,</span>
......
......@@ -32,7 +32,7 @@
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Ubuntu</h3>
<h3 class="panel-title">Debian & Ubuntu <small>(Linux Mint, etc.)</small></h3>
</div>
</div>
|install/debian]]
......
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