Merge pull request #551 from brson/nodisclaim

Revert "www: Add a disclaimer about curl | sh"
rust-lang · Jun 27, 2016 · 0d414ef · 0d414ef
2 parents 2ae4713 + cb79e50
commit 0d414ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 24 deletions.
diff --git a/www/index.html b/www/index.html
@@ -24,20 +24,14 @@
 </p>
 
 <div id="platform-instructions-unix" class="instructions" style="display: none;">
-  <p>Run the following in your terminal<sup>†</sup>, then follow the onscreen instructions.</p>
+  <p>Run the following in your terminal, then follow the onscreen instructions.</p>
   <pre>curl https://sh.rustup.rs -sSf | sh</pre>
-  <p id="sh-disclaimer">
-    <sup>†</sup>
-    <a href="https://sandstorm.io/news/2015-09-24-is-curl-bash-insecure-pgp-verified-install">
-      On the security of <code>curl | sh</code>
-    </a>
-  </p>
 </div>
 
 <div id="platform-instructions-win" class="instructions" style="display: none;">
   <p>
     Download and run
-    <a class="rustup-link" href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
+    <a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
     then follow the onscreen instructions.
   </p>
 </div>
@@ -73,22 +67,16 @@
 
 <div id="platform-instructions-default" class="instructions">
   <div>
-    <p>If you are running Unix,<br/>run the following in your terminal<sup>†</sup>, then follow the onscreen instructions.</p>
+    <p>If you are running Unix,<br/>run the following in your terminal, then follow the onscreen instructions.</p>
     <pre>curl https://sh.rustup.rs -sSf | sh</pre>
-    <p id="sh-disclaimer">
-      <sup>†</sup>
-      <a href="https://sandstorm.io/news/2015-09-24-is-curl-bash-insecure-pgp-verified-install">
-        On the security of <code>curl | sh</code>
-      </a>
-    </p>
   </div>
 
   <hr/>
 
   <div>
     <p>
       If you are running Windows,<br/>download and run
-      <a class="rustup-link" href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
+      <a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
       then follow the onscreen instructions.
     </p>
   </div>

diff --git a/www/rustup.css b/www/rustup.css
@@ -115,8 +115,8 @@ hr {
     box-shadow: inset 0px 0px 20px 0px #333333;
 }
 
-#platform-instructions-win .rustup-link,
-#platform-instructions-default .rustup-link {
+#platform-instructions-win a,
+#platform-instructions-default a {
     display: block;
     padding-top: 0.4rem;
     padding-bottom: 0.6rem;
@@ -130,12 +130,6 @@ hr {
     line-height: 2rem;
 }
 
-#sh-disclaimer {
-    font-size: 14px;
-    padding-top: 20px;
-    padding-bottom: 10px;
-}
-
 #warning {
     color: red;
     font-weight: 500;