about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-10-22 12:43:48 -0400
committerSteve Klabnik <steve@steveklabnik.com>2015-10-22 12:43:48 -0400
commit7a16b95d4add4d0b9414e2b9574b68ed902f557f (patch)
tree3ecb1c54fe6c245f1266c7c33082dc9c1d03f425
parentca998fc2f100bce4eab9b4609bd5a0a5c5789872 (diff)
parent968d17a3eb925e19053b8277fc094d14c470e63f (diff)
downloadrust-7a16b95d4add4d0b9414e2b9574b68ed902f557f.tar.gz
rust-7a16b95d4add4d0b9414e2b9574b68ed902f557f.zip
Rollup merge of #29170 - kini:curl-sh-disclaimer, r=steveklabnik
The paragraph here seemed confusing, so I reworded it.  Also added
another possible reason why `curl | sh` might be objectionable to users.

r? @steveklabnik
-rw-r--r--src/doc/trpl/installing-rust.md14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/doc/trpl/installing-rust.md b/src/doc/trpl/installing-rust.md
index 88d7674a01b..0fe61933820 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