commit 63b0a94eb4a916c10b44aa4d4743b6b2349ced96 Author: Iain R. Learmonth irl@fsfe.org Date: Mon Oct 9 21:22:37 2017 +0100

Switch out references to apt-get for apt

Signed-off-by: hiromipaw hiro@torproject.org --- docs/en/debian.wml | 30 +++++++++++++++--------------- docs/en/tor-relay-debian.wml | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/docs/en/debian.wml b/docs/en/debian.wml index 535c449d..f6a58fd2 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -21,7 +21,7 @@ Debian Buster - testing, or Debian Sid - unstable</a></h2>

<p> If you're using Debian, just run -</blockquote><pre> apt-get install tor </pre></blockquote> +</blockquote><pre> apt install tor </pre></blockquote> as root. </p>

@@ -104,10 +104,10 @@ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -

<div id="apt-get"> <p>You can install it with the following commands:</p> -<blockquote><pre>$ apt-get update -<span id="regular-install">$ apt-get install <span id="apt-package">tor</span> deb.torproject.org-keyring</span> -<span id="source-install">$ apt-get install build-essential fakeroot devscripts -$ apt-get build-dep tor deb.torproject.org-keyring</span></pre></blockquote> +<blockquote><pre>$ apt update +<span id="regular-install">$ apt install <span id="apt-package">tor</span> deb.torproject.org-keyring</span> +<span id="source-install">$ apt install build-essential fakeroot devscripts +$ apt build-dep tor deb.torproject.org-keyring</span></pre></blockquote>

<div id="source-install2"> <p> @@ -115,7 +115,7 @@ Then you can build Tor in ~/debian-packages: </p> <blockquote><pre> $ mkdir ~/debian-packages; cd ~/debian-packages -$ apt-get source tor +$ apt source tor $ cd tor-* $ debuild -rfakeroot -uc -us $ cd .. @@ -151,7 +151,7 @@ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - Now refresh your sources, running the following command (as root) at your command prompt: <pre style="margin: 1.5em 0 1.5em 2em"> -apt-get update +apt update </pre> If there are no errors you're good to continue. </p> @@ -160,14 +160,14 @@ 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 <pre style="margin: 1.5em 0 1.5em 2em"> -apt-get install deb.torproject.org-keyring +apt install deb.torproject.org-keyring </pre> </p>

<p> To finally install Tor just run: <pre style="margin: 1.5em 0 1.5em 2em"> -apt-get install tor +apt install tor </pre> </p>

@@ -214,8 +214,8 @@ Then run the following commands at your command prompt: <pre style="margin: 1.5em 0 1.5em 2em"> gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - -apt-get update -apt-get install tor deb.torproject.org-keyring +apt update +apt install tor deb.torproject.org-keyring </pre> </p>

@@ -244,18 +244,18 @@ deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-&lt;DI </pre> Substitute the name of your distro (wheezy, sid, trusty, ...) in place of &lt;DISTRIBUTION&gt;. Now refresh your sources by running (as root): <pre style="margin: 1.5em 0 1.5em 2em"> -apt-get update +apt update </pre> You also need to install the necessary packages to build your own debs and the packages needed to build Tor: <pre style="margin: 1.5em 0 1.5em 2em"> -apt-get install build-essential fakeroot devscripts -apt-get build-dep tor +apt install build-essential fakeroot devscripts +apt build-dep tor </pre> Then you can build Tor in ~/debian-packages: <pre style="margin: 1.5em 0 1.5em 2em"> mkdir ~/debian-packages; cd ~/debian-packages -apt-get source tor +apt source tor cd tor-* debuild -rfakeroot -uc -us cd .. diff --git a/docs/en/tor-relay-debian.wml b/docs/en/tor-relay-debian.wml index ac332dbf..ac74052f 100644 --- a/docs/en/tor-relay-debian.wml +++ b/docs/en/tor-relay-debian.wml @@ -28,7 +28,7 @@ <h2><a class="anchor" href="#install">Step One: Download and Install Tor</a></h2> <br>

- <p>If you're on Debian, start with "apt-get install tor".</p> + <p>If you're on Debian, start with "apt install tor".</p>

<p><b>Do not use the packages in Ubuntu's universe.</b> If you're on Ubuntu or if you want to track newer Tor packages, follow the @@ -169,7 +169,7 @@ href="<wiki>/doc/TorExitGuidelines">guidelines <p> 13. You might like to use the <a href="https://www.atagar.com/arm/">arm</a> relay monitor to watch - your relay's activities from the command line. First, "sudo apt-get + your relay's activities from the command line. First, "sudo apt install tor-arm". Second, as the user that will be running arm, run "sudo adduser $USER debian-tor" to add your user to the debian-tor group so it can reach Tor's controlsocket. Then log out and log back