Merge pull request #363 from brson/www

Website updates

README.md

@@ -13,7 +13,7 @@ And it runs on all platforms Rust supports, especially Windows.
 
 [The Rust Programming Language]: https://www.rust-lang.org
 
-**WARNING: This is an early beta. Expect breakage.**
+**WARNING: This is beta software.**
 
 * [Installation](#installation)
 * [How rustup works](#how-rustup-works)
@@ -28,7 +28,7 @@ And it runs on all platforms Rust supports, especially Windows.
 * [Environment variables](#environment-variables)
 * [Other installation methods](#other-installation-methods)
 * [Security](#security)
-* [How is this related to multirust?](#how-is-this-related-to-multirust)
+* [FAQ](#faq)
 * [License](#license)
 * [Contributing](#contributing)
 
@@ -419,7 +419,15 @@ variable.
 work. `rustup` performs all downloads over HTTPS, but does not
 yet validate signatures of downloads.
 
-## How is this related to multirust?
+## FAQ
+
+### Is this an official Rust project?
+
+Yes. rustup is an official Rust project. Once it is complete it will
+be the recommended way to install Rust and www.rust-lang.org will be
+updated to reflect that.
+
+### How is this related to multirust?
 
 rustup is the successor to [multirust]. rustup began as multirust-rs,
 a rewrite of multirust from shell script to Rust, by [Diggory Blake],

src/rustup-cli/self_update.rs

@@ -75,7 +75,7 @@ r#"
 You can uninstall at any time with `rustup self uninstall` and
 these changes will be reverted.
 
-WARNING: This is an early beta. Expect breakage.
+WARNING: This is beta software.
 
 To cancel installation, type "n", or for more options type "a",
 then press the Enter key to continue.

www/fonts/OFL.txt

@@ -0,0 +1,92 @@
+Copyright (c) 2011, Raph Levien (firstname.lastname@gmail.com), Copyright (c) 2012, Cyreal (cyreal.org)
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

www/index.html

@@ -2,7 +2,7 @@
 
 <head>
   <meta charset="utf-8">
-  <title>rustup.rs - Update your Rust</title>
+  <title>rustup.rs - The Rust toolchain installer</title>
   <meta name="keywords" content="Rust, Rust programming language, rustlang, rust-lang, Mozilla Rust, rustup">
   <meta name="description" content="The Rust toolchain installer">
 
@@ -13,48 +13,90 @@
 
 <body id="idx">
 
+<a id="platform-button" style="display: none;" href="#">
+  click or press "n" to cycle platforms
+</a>
+
 <p id="pitch">
-  This is the ultimate way to install
+  <em>rustup</em> is an installer for<br/>
+  the systems programming language
   <a href="https://www.rust-lang.org">Rust</a>
-  the systems programming language<br/>
-  that runs blazingly fast,<br/>
-  prevents segfaults,<br/>
-  and guarantees thread safety.
 </p>
 
-<div id="platform-instructions-unix" style="display: none;">
+<div id="platform-instructions-unix" class="instructions" style="display: none;">
   <p>Run the following in your terminal, then follow the onscreen instructions.</p>
   <pre>curl https://sh.rustup.rs -sSf | sh</pre>
 </div>
 
-<div id="platform-instructions-win" style="display: none;">
+<div id="platform-instructions-win" class="instructions" style="display: none;">
   <p>
     Download and run
     <a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
     then follow the onscreen instructions.
   </p>
 </div>
 
-<div id="platform-instructions-unknown">
+<div id="platform-instructions-android" class="instructions" style="display: none;">
+  <p>It looks like you are running Android.</p>
+  <p>
+    rustup does not run on Android directly (yet),
+    but it does make it easy to cross-compile <em>to</em> Android.
+    Install rustup on a supported host platform and
+    <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
+      follow the cross-compilation instructions
+    </a>
+    to build Rust applications for Android.
+  </p>
+</div>
+
+<div id="platform-instructions-unknown" class="instructions" style="display: none;">
   <p>I don't recognize your platform.</p>
   <p>
-    rustup supports Windows, Linux, and Mac OS X. If you <em>are</em>
-    on one of these platforms and are seeing this then either
-    JavaScript is disabled or this website is drunk and
-    <a href="https://github.com/rust-lang-nursery/rustup.rs/issues/new">should be reported.</a>
+    rustup runs on Windows, Linux, Mac OS X, FreeBSD and NetBSD. If
+    you are on one of these platforms and are seeing this then please
+    <a href="https://github.com/rust-lang-nursery/rustup.rs/issues/new">report an issue</a>,
+    along with the following values:
+    <div>
+      <div>navigator.platform:</div>
+      <div id="nav-plat"></div>
+      <div>navigator.appVersion:</div>
+      <div id="nav-app"></div>
+    </div>
   </p>
 </div>
 
-<p id="warning" style="font-size: 100%; color: red; font-family: 'Work Sans', monospace;">
-  WARNING: This is an early beta. Expect breakage.
+<div id="platform-instructions-default" class="instructions">
+  <div>
+    <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>
+  </div>
+
+  <hr/>
+
+  <div>
+    <p>
+      If you are running Windows,<br/>download and run
+      <a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
+      then follow the onscreen instructions.
+    </p>
+  </div>
+</div>
+
+<p id="warning">
+WARNING: This is beta software.
 </p>
 
-<p id="help">
-  Need help?<br/><a href="https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-beginners">Ask on #rust-beginners</a>.
+<p>
+  Need help? <a href="https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-beginners">Ask on #rust-beginners</a>.
 </p>
 
 <p id="about">
-  <a href="https://github.com/rust-lang-nursery/rustup.rs/blob/master/README.md">More about rustup</a>.
+  <img src="https://www.rust-lang.org/logos/rust-logo-blk.svg" alt="" />
+  rustup is an official Rust project.
+  <br/>
+  <a href="https://github.com/rust-lang-nursery/rustup.rs/#other-installation-methods">other installation options</a>
+  &nbsp;&middot;&nbsp;
+  <a href="https://github.com/rust-lang-nursery/rustup.rs">about rustup</a>
 </p>
 
 <script type="text/javascript" src="rustup.js"></script>