summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2017-05-25 16:33:49 +0000
committersajolida <sajolida@pimienta.org>2017-05-25 16:33:49 +0000
commite6aaa3fcbf02ad149d9bb7e81da25489002d2082 (patch)
tree9166b69e84a5b6430befca0ab381b56783ea7a19
parentd0f0179e2738703090bf246653b665c1d2977b99 (diff)
parentad898ab7e6b87298e6a844b3dd2c7d8883f2dcf5 (diff)
Merge branch 'doc/11110-software-properties-gtk' into feature/stretch (Closes: #11110)
-rw-r--r--wiki/src/install/debian/usb.mdwn87
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.mdwn2
2 files changed, 31 insertions, 58 deletions
diff --git a/wiki/src/install/debian/usb.mdwn b/wiki/src/install/debian/usb.mdwn
index 27bbfdb..5a43cc9 100644
--- a/wiki/src/install/debian/usb.mdwn
+++ b/wiki/src/install/debian/usb.mdwn
@@ -28,6 +28,8 @@ Installer</span>, a program designed specifically for installing Tails.
If you are running Debian
-------------------------
+### Configure the *backports* repository
+
1. Make sure that you are connected to the Internet.
1. Start <span class="application">Synaptic Package Manager</span>.
@@ -37,19 +39,40 @@ If you are running Debian
<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:
+1. Depending on your Debian installation, two different dialogs might
+ appear:
+
+ a. If the dialog is titled <span class="guilabel">Software & Updates</span> and has tabs:
+
+ Open the <span class="guilabel">Other Software</span> tab, and click on
+ the <span class="button">Add&hellip;</span> button.
+
+ In the <span class="guilabel">APT line</span> field, specify:
+
+ * If you are running Debian 8 (Jessie):<br/>
+ `deb http://http.debian.net/debian/ jessie-backports main`
+
+ * If you are running Debian 9 (Stretch):<br/>
+ `deb http://http.debian.net/debian/ stretch-backports main`
+
+ a. If the dialog is titled <span class="guilabel">Repositories</span> and has no tabs:
+
+ Click <span class="button">New</span> 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*
+ * <span class="guilabel">URI</span>: `http://http.debian.net/debian/`
+ * If you are running Debian 8 (Jessie), <span class="guilabel">Distribution</span>: `jessie-backports`
+ * If you are running Debian 9 (Stretch), <span class="guilabel">Distribution</span>: `stretch-backports`
+ * <span class="guilabel">Section(s)</span>: `main`
-1. Click <span class="button">Ok</span>.
+1. Click the <span class="button">Add Source</span> button.
+
+1. Click <span class="button">Close</span> or <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.
+### Install <span class="application">Tails Installer</span>
+
1. In the main windows of <span class="application">Synaptic</span>, click
<span class="button">Search</span> and search for `tails-installer`.
@@ -70,8 +93,6 @@ If you are running Debian
If you are running Ubuntu
-------------------------
-### If you are running Ubuntu 16.04 or later
-
1. Make sure that you are connected to the Internet.
1. Open a <span class="guimenuitem">Root Terminal</span>.
@@ -95,54 +116,6 @@ If you are running Ubuntu
apt install tails-installer
-### If you are running Ubuntu 15.10
-
-1. Make sure that you are connected to the Internet.
-
-1. Start <span class="application">Ubuntu Software Center</span>.
-
-1. Choose
- <span class="guimenupath">
- <span class="guimenu">Edit</span>&nbsp;▸
- <span class="guimenuitem">Software Sources&hellip;</span></span>
-
-1. In the <span class="guilabel">Software & Updates</span> dialog,
- make sure that the *universe* repository (labelled
- <span class="guilabel">Community-maintained free and open source
- software</span>) is selected.
-
-1. Open the <span class="guilabel">Other Software</span> tab, and click
- on the <span class="button">Add&hellip;</span> button.
-
-1. In the <span class="guilabel">APT line</span> field, specify
- `ppa:tails-team/tails-installer` and click the
- <span class="button">Add Source</span> button.
-
-1. A new software source named
- <span class="filename">https://ppa.launchpad.net/tails-team/tails-installer/ubuntu</span>
- appears in the list of sources.
-
-1. Close the <span class="guilabel">Software & Updates</span> dialog.
-
-1. In the main window of <span class="application">Ubuntu Software Center</span>,
- search for `tails-installer`.
-
- <div class="bug">
- <p>If no package named `tails-installer` can be found, you might have to
- reload the cache of <span class="application">Ubuntu Software Center</span>, to
- do so you can either:</p>
-
- <ul>
- <li>Execute <span class="command">sudo update-apt-xapian-index</span>
- in a terminal.</span></li>
- <li>Restart Ubuntu.</li>
- </ul>
- </div>
-
-1. Select `tails-installer` in the list of packages and click <span class="button">Install</span>.
-
-1. After `tails-installer` is installed, close <span class="application">Ubuntu Software Center</span>.
-
If you are running Linux Mint
-----------------------------
diff --git a/wiki/src/install/inc/steps/debian_requirements.inline.mdwn b/wiki/src/install/inc/steps/debian_requirements.inline.mdwn
index 69660b8..1b1b919 100644
--- a/wiki/src/install/inc/steps/debian_requirements.inline.mdwn
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.mdwn
@@ -1,7 +1,7 @@
These instructions require:
- Debian 8 (Jessie) or later
- - Ubuntu 15.10 (Wily Werewolf) or later
+ - Ubuntu 16.04 (Xenial Xerus) or later
- Linux Mint 18 (Sarah) or later
If your version of Debian, Ubuntu, or Linux Mint is not supported, you can follow the