From 5ad79e06d1c9ef4934086fbf816249035eba9fb2 Mon Sep 17 00:00:00 2001 From: Traumschule Date: Sat, 11 Aug 2018 17:18:04 +0200 Subject: [PATCH] docs/debian: mention apt-transport-tor ; unhide onion address --- docs/en/debian.wml | 101 +++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 53 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index e93c8401..b4008f33 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -87,13 +87,14 @@ version
-

You need to add the following entry in /etc/apt/sources.list or a new file in /etc/apt/sources.list.d/:

+

You need to add the following entries to /etc/apt/sources.list or a new file in +/etc/apt/sources.list.d/:

deb https://deb.torproject.org/torproject.org jessie main
-

Note: To use this source line in /etc/apt/sources.list The Note: To use source lines with https:// in /etc/apt/sources.list the apt-transport-https package is required. Install it with 

@@ -101,6 +102,12 @@ apt install apt-transport-https
to enable the usage of 'deb https://foo distro main' lines in the /etc/apt/sources.list so that all package managers using the libapt-pkg library can access metadata and packages available in sources accessible over https (Hypertext Transfer Protocol Secure).

+

To use Apt with Tor later replace https:// with tor:// and run +

+apt install apt-transport-tor
+
+

+

Then add the gpg key used to sign the packages by running the following commands at your command prompt:

@@ -112,15 +119,13 @@ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
 
 

 
You can install it with the following commands:

-
$ apt update
-$ apt install tor deb.torproject.org-keyring
+
apt update
+apt install tor deb.torproject.org-keyring
 $ apt install build-essential fakeroot devscripts
 $ apt build-dep tor deb.torproject.org-keyring

 
 

-

-Then you can build Tor in ~/debian-packages:
-

+
Then you can build Tor in ~/debian-packages:

 
 $ mkdir ~/debian-packages; cd ~/debian-packages
 $ apt source tor
@@ -149,6 +154,30 @@ or whatever it is)
 in place of <DISTRIBUTION>.
 

 
+

+If you want to use the development branch of Tor 
+instead (more features and more bugs), you need add a different set of lines to your 
+/etc/apt/sources.list file:

+
+deb     https://deb.torproject.org/torproject.org <DISTRIBUTION> main
+deb     https://deb.torproject.org/torproject.org tor-experimental-0.3.4.x-<DISTRIBUTION> main
+

+

+
+
Note: To use source lines with https:// in /etc/apt/sources.list the apt-transport-https
+package is required. Install it with
+
+apt install apt-transport-https
+

+to enable the usage of 'deb https://foo distro main' lines in the /etc/apt/sources.list so that all package managers using the libapt-pkg library can access metadata and packages available in sources accessible over https (Hypertext Transfer Protocol Secure).

+
+
To use Apt with Tor later replace https:// with tor:// and run 
+
+apt install apt-transport-tor
+

+

+
 

 Then add the gpg key used to sign the packages by running the following
 commands at your command prompt:
@@ -166,16 +195,9 @@ If there are no errors you're good to continue.
 
 

 We provide a Debian package to help you keep our signing key current.  It is
-recommended you use it.  Install it using
+recommended you use it.  Install it along with tor using
 
-apt install deb.torproject.org-keyring
-

-

-
-

-To finally install Tor just run:
-
-apt install tor
+apt install tor deb.torproject.org-keyring
 

 

 
@@ -187,7 +209,6 @@ docs/tor-doc-unix>#using">step two of the "Tor on Linux/Unix"
 instructions.
 

 
-