From d142a4eed0ea6c3f6d0b3ba9427caa6270b0a90b Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Mon, 19 Oct 2015 12:05:52 -0500 Subject: [PATCH 1/2] =?UTF-8?q?Reword=20`curl=20|=20sh`=20disclaimer=20in?= =?UTF-8?q?=20TRPL=20=C2=A72.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The paragraph here seemed confusing, so I reworded it. Also added another possible reason why `curl | sh` might be objectionable to users. --- src/doc/trpl/installing-rust.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/doc/trpl/installing-rust.md b/src/doc/trpl/installing-rust.md index a3666d1c08e0a..6872b7da0e9df 100644 --- a/src/doc/trpl/installing-rust.md +++ b/src/doc/trpl/installing-rust.md @@ -51,11 +51,15 @@ us an uninstall option. ## That disclaimer we promised Some people, and somewhat rightfully so, get very upset when we tell them to -`curl | sh`. Basically, when they do this, they are trusting that the good -people who maintain Rust aren't going to hack their computer and do bad things. -That's a good instinct! If you're one of those people, please check out the -documentation on [building Rust from Source][from-source], or [the official -binary downloads][install-page]. +`curl | sh`. Their concern is that `curl | sh` implicitly requires you to trust +that the good people who maintain Rust aren't going to hack your computer and +do bad things -- and even having accepted that, there is still the possibility +that the Rust website has been hacked and the `rustup` script compromised. + +Being wary of such possibilities is a good instinct! If you're uncomfortable +using `curl | sh` for reasons like these, please check out the documentation on +[building Rust from Source][from-source], or +[the official binary downloads][install-page]. [from-source]: https://github.com/rust-lang/rust#building-from-source From 968d17a3eb925e19053b8277fc094d14c470e63f Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Mon, 19 Oct 2015 16:18:20 -0500 Subject: [PATCH 2/2] =?UTF-8?q?Replace=20--=20with=20=E2=80=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/doc/trpl/installing-rust.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/trpl/installing-rust.md b/src/doc/trpl/installing-rust.md index 6872b7da0e9df..9f241717d3609 100644 --- a/src/doc/trpl/installing-rust.md +++ b/src/doc/trpl/installing-rust.md @@ -53,7 +53,7 @@ us an uninstall option. Some people, and somewhat rightfully so, get very upset when we tell them to `curl | sh`. Their concern is that `curl | sh` implicitly requires you to trust that the good people who maintain Rust aren't going to hack your computer and -do bad things -- and even having accepted that, there is still the possibility +do bad things — and even having accepted that, there is still the possibility that the Rust website has been hacked and the `rustup` script compromised. Being wary of such possibilities is a good instinct! If you're uncomfortable