Skip to content
This repository was archived by the owner on Sep 30, 2020. It is now read-only.

Commit 3f32d3e

Browse files
committed
Edits
1 parent b1f86b8 commit 3f32d3e

File tree

4 files changed

+81
-192
lines changed

4 files changed

+81
-192
lines changed

css/style.css

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -689,39 +689,45 @@ footer a {
689689
color: white;
690690
background-color: #428BCA;
691691
border-radius: 3px;
692-
padding-left: 4rem;
693-
padding-top: 2rem;
694-
padding-bottom: 2rem;
692+
padding: 2rem;
695693
margin-top: 4rem;
694+
font-size: 1.5em;
695+
text-align: center;
696696
}
697697

698-
.release-info-column > div {
699-
margin-top: 4rem;
698+
.pitch-row .release-version > span {
699+
font-weight: 500;
700700
}
701701

702-
.release-info-column > div > div:first-child {
702+
.pitch-row .release-date {
703+
text-align: center;
704+
margin-top: 2rem;
705+
}
706+
707+
.release-info-column {
708+
text-align: center;
709+
font-weight: 500;
710+
}
711+
712+
.release-info-column > div {
713+
margin-top: 6rem;
714+
padding-right: 9rem;
703715
}
704716

705717
.release-info-column .release-version {
706718
font-size: 1.5em;
707-
font-weight: 500;
708719
}
709720

710721
.release-info-column .release-date {
711-
font-weight: 500;
722+
margin-top: 1rem;
712723
}
713724

714-
/* de-emphasize the header to draw attention to the instructions */
715-
h1.rustup,
716-
h1.rustup ~ h2 {
717-
color: #999;
718-
font-size: 2em; /* same as h2 */
719-
font-size: 2em;
720-
line-height: 1.5em;
721-
margin: 3rem 0 1rem;
722-
font-weight: 400;
723-
border-top: 2px solid #dedede;
724-
padding-top: 1rem;
725+
h1.rustup {
726+
border-top: 0px;
727+
}
728+
729+
.rustup-row {
730+
margin-bottom: 4rem;
725731
}
726732

727733
.rustup-init-table {

en-US/index.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
<b><a href="friends.html">See who's using Rust.</a></b>
1515
</p>
1616
</div>
17-
<div class="col-md-4 release-info-column">
17+
<div class="col-md-4">
1818
<a class="release-button" href="install.html">
19-
<div>Current release</div>
20-
<div class="release-version">{{ site.stable }}</div>
21-
<div class="release-date">{{ site.stable_date | date: "%B %-d, %Y" }}</div>
19+
<div class="release-version">Install Rust <span>{{ site.stable }}</span></div>
2220
</a>
21+
<div class="release-date">{{ site.stable_date | date: "%B %-d, %Y" }}</div>
2322
</div>
2423
</div>
2524

en-US/install.html

Lines changed: 34 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
layout: default
33
title: Installation &middot; The Rust Programming Language
44
---
5+
<h1 class="rustup">Install Rust</h1>
6+
7+
<hr>
8+
59
<div class="row rustup-row">
610
<div class="col-md-8 instr-column">
711
<div id="platform-instructions-unix" class="instructions" style="display: none;">
@@ -35,7 +39,7 @@
3539
<p>
3640
Rust runs on Windows, Linux, Mac OS X, FreeBSD and NetBSD. If
3741
you are on one of these platforms and are seeing this then please
38-
<a href="https://github.com/rust-lang-nursery/rustup.rs/issues/new">report an issue</a>,
42+
<a href="https://github.com/rust-lang/rust-www/issues/new">report an issue</a>,
3943
along with the following values:
4044
<div>
4145
<div>navigator.platform:</div>
@@ -68,10 +72,7 @@
6872

6973
<div class="col-md-4 release-info-column">
7074
<div>
71-
<br>
72-
73-
<div>Current release</div>
74-
<div class="release-version">{{ site.stable }}</div>
75+
<div class="release-version">Rust <span>{{ site.stable }}</span></div>
7576
<a href="{{ site.stable_blog }}">
7677
<div class="release-date">{{ site.stable_date | date: "%B %-d, %Y" }}</div>
7778
</a>
@@ -86,76 +87,6 @@
8687

8788
</div>
8889

89-
<h1 class="rustup">Installing Rust</h1>
90-
91-
<div class="row">
92-
<div class="col-md-12">
93-
<p>
94-
The most common way to install Rust is to ↑ <em>follow the
95-
instructions above</em> ↑. The installer will explain everything it
96-
does, and everything you need to set up your environment. It's
97-
simple, and it usually just works. If you are confident and
98-
clever then ↑ <em>follow the instructions above</em> ↑. If you are
99-
cautious or have questions, read on.
100-
</p>
101-
102-
<p>
103-
Follow the instructions above.
104-
Doing so will install the latest stable release of Rust,
105-
including the compiler, <code>rustc</code>, the build system and
106-
package manager, <code>cargo</code>, and the Rust toolchain
107-
manager, <code>rustup</code>, to Cargo's application directory,
108-
<span class="platform-specific not-win" style="display: inline;">
109-
<code>~/.cargo/bin</code>
110-
</span>
111-
<span class="platform-specific win" style="display: none;">
112-
<code>%USERPROFILE%\.cargo\bin</code>
113-
</span>
114-
.
115-
</p>
116-
</div>
117-
</div>
118-
119-
<div class="install-examples">
120-
<div class="row install-example-row">
121-
<div class="col-md-4">
122-
<p>Test the installation by running</p>
123-
</div>
124-
<div class="col-md-6">
125-
<pre class="platform-specific not-win" style="display: inline;">~/.cargo/bin/rustc --version</pre>
126-
<pre class="platform-specific win" style="display: inline;">%USERPROFILE%\.cargo\bin\rustc --version</pre>
127-
</div>
128-
</div>
129-
130-
<div class="row install-example-row">
131-
<div class="col-md-4">
132-
<p>... which should print</p>
133-
</div>
134-
<div class="col-md-6">
135-
<pre>{{ site.stable_full_version }}</pre>
136-
</div>
137-
</div>
138-
139-
<div class="row install-example-row">
140-
<div class="col-md-4">
141-
<p>To uninstall Rust, run</p>
142-
</div>
143-
<div class="col-md-6">
144-
<pre class="platform-specific not-win" style="display: inline;">~/.cargo/bin/rustup self uninstall</pre>
145-
<pre class="platform-specific win" style="display: inline;">%USERPROFILE%\.cargo\bin\rustup self uninstall</pre>
146-
</div>
147-
</div>
148-
</div>
149-
150-
<div class="row">
151-
<div class="col-md-12">
152-
<p>
153-
If you run into problems see the
154-
<a href="TODO">troubleshooting guide</a>.
155-
</p>
156-
</div>
157-
</div>
158-
15990
<h2>Notes about Rust installation</h2>
16091

16192
<div class="row">
@@ -173,28 +104,22 @@ <h3>Toolchain management with <code>rustup</code></h3>
173104
<a href="https://forge.rust-lang.org/platform-support.html">
174105
great number of platforms
175106
</a>, so there are many builds of Rust available at any time.
176-
<code>rustup</code> manages these builds in a consistent way on every platform
177-
that Rust supports, enabling
178-
<a href="https://github.com/rust-lang-nursery/rustup.rs#working-with-nightly-rust">
179-
installation of Rust from the beta and nightly release channels
180-
</a>
181-
as well as
182-
<a href="https://github.com/rust-lang-nursery/rustup.rs#cross-compilation">
183-
support for additional cross-compilation targets
184-
</a>.
107+
<code>rustup</code> manages these builds in a consistent way on every
108+
platform that Rust supports, enabling installation of Rust from the
109+
beta and nightly release channels as well as support for additional
110+
cross-compilation targets
185111
</p>
186112

187113
<p>
188-
To keep your Rust installation up to date, periodically
189-
run <code>rustup update</code>. For more information see the
190-
<a href="https://github.com/rust-lang-nursery/rustup.rs"><code>rustup</code> documentation</a>.
114+
For more information see the
115+
<a href="https://github.com/rust-lang-nursery/rustup.rs/blob/master/README.md"><code>rustup</code>
116+
documentation</a>.
191117
</p>
192118

193119
<h3>Configuring the <code>PATH</code> environment variable</h3>
194120

195121
<p>
196-
In the Rust development environment, all tools are installed
197-
to <code>cargo</code>'s
122+
In the Rust development environment, all tools are installed to the
198123
<span class="platform-specific not-win" style="display: inline;">
199124
<code>~/.cargo/bin</code>
200125
</span>
@@ -212,16 +137,14 @@ <h3>Configuring the <code>PATH</code> environment variable</h3>
212137
environment variable</a>. During installation, <code>rustup</code>,
213138
will attempt to configure
214139
<code>PATH</code>, but because of differences between platforms,
215-
command shells, and bugs in <code>rustup</code> the modifications
140+
command shells, and bugs in <code>rustup</code>, the modifications
216141
to <code>PATH</code> may not take effect until the console is
217142
restarted, or the user logged out, or may not succeed at all.
218143
</p>
219144

220145
<p>
221146
If, after installation, running <code>rustc --version</code> in the
222-
console fails, this is the most likely reason. Follow the
223-
<a href="TODO">platform-specific instructions</a> to
224-
modify <code>PATH</code> yourself.
147+
console fails, this is the most likely reason.
225148
</p>
226149

227150
<div class="platform-specific win">
@@ -231,52 +154,43 @@ <h3>Windows considerations</h3>
231154
<a id="win-foot"></a>
232155

233156
<p>
234-
There are two prominent
235-
<a href="https://en.wikipedia.org/wiki/Application_binary_interface">ABIs</a>
236-
in use on Windows: the native (MSVC) ABI used by
237-
<a href="https://www.visualstudio.com">Visual Studio</a>,
238-
and the GNU ABI used by the
239-
<a href="https://gcc.gnu.org/">GCC toolchain</a>.
240-
Rust can compile for both ABIs, and which one you choose to target
241-
depends largely on what C/C++ libraries you want to interoperate with:
242-
for interop with software produced by Visual Studio use the MSVC build
243-
of Rust; for interop with GNU software built using the
244-
<a href="https://msys2.github.io/">MinGW/MSYS2 toolchain</a>
245-
use the GNU build.
246-
</p>
247-
248-
<p>
249-
For best interoperability with other Windows software, Rust targets
250-
the MSVC ABI by default. For this Rust requires the C++ build tools
157+
On Windows, Rust additionally requires the C++ build tools
251158
for Visual Studio 2013 or later. The easiest way to acquire the build
252159
tools is by installing
253160
<a href="http://landinghub.visualstudio.com/visual-cpp-build-tools">
254-
Microsoft Visual C++ Build Tools 2015</a>
255-
which provides just the Visual C++ build tools.
256-
Alternately, you can <a href="https://www.visualstudio.com/downloads/">install</a>
257-
Visual Studio 2015 or Visual Studio 2013 and during install select the "C++ tools".
258-
No additional software installation is necessary for basic use of the GNU build.
161+
Microsoft Visual C++ Build Tools 2015
162+
</a>
163+
which provides just the Visual C++ build tools. Alternately, you
164+
can <a href="https://www.visualstudio.com/downloads/">install</a>
165+
Visual Studio 2015 or Visual Studio 2013 and during install select
166+
the "C++ tools".
259167
</p>
260168

261169
<p>
262170
For further information about configuring Rust on Windows see the
263-
<a href="TODO">Windows-specific <code>rustup</code> documentation</a>.
171+
<a href="https://github.com/rust-lang-nursery/rustup.rs/blob/master/README.md#working-with-rust-on-windows">Windows-specific <code>rustup</code>
172+
documentation</a>.
264173
</p>
265174

266175
</div>
267176

268-
<h3>Other installation methods</h3>
177+
</div>
178+
</div>
179+
180+
<h2>Other installation methods</h3>
269181

182+
<div class="row">
183+
<div class="col-md-12">
270184
<p>
271185
The installation described above, via
272186
<code>rustup</code>, is the preferred way to install Rust for most developers,
273187
but Rust can be
274-
<a href="other-installers.html">installed via other methods as well</a>.
188+
<a href="other-installers.html">installed via other methods</a>
189+
as well.
275190
</p>
276-
277191
</div>
278192
</div>
279-
193+
280194
<script type="text/javascript">
281195
{% include rustup.js %}
282196
</script>

0 commit comments

Comments
 (0)