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

Commit accf1c8

Browse files
author
edunham
committed
fix merge conflict
3 parents 7ec0fbc + 29a9156 + dbf5d15 commit accf1c8

File tree

5 files changed

+62
-27
lines changed

5 files changed

+62
-27
lines changed

‎_includes/set_platform.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ function detect_platform() {
2121
"use strict";
2222
var platform = detect_platform();
2323

24-
var rec_package_name = "1.0.0";
24+
var rec_package_name = "1.1.0";
2525
var rec_version_type = "source";
26-
var rec_download_file = "rustc-1.0.0-src.tar.gz";
26+
var rec_download_file = "rustc-1.1.0-src.tar.gz";
2727

2828
if (platform == "x86_64-unknown-linux-gnu") {
2929
rec_version_type = "Linux binary";

‎_layouts/default.html

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
<header>
2020

2121
<ul class="row menu">
22-
<li class="col-xs-12 col-md-4">
22+
<li class="col-xs-12 col-md-2">
2323
<a href="index.html">
2424
<img class="img-responsive" src="logos/rust-logo-blk.svg" onerror="this.src='logos/rust-logo-256x256-blk.png'" height="128" width="128" alt="Rust logo" />
2525
</a>
2626
</li>
27-
<li class="col-xs-4 col-md-2"><h2>Docs (1.0.0)</h2>
27+
<li class="col-xs-4 col-md-2"><h2>Docs (1.1.0)</h2>
2828
<ul>
2929
<li><a href="https://doc.rust-lang.org/stable/book/">Book</a></li>
3030
<li><a href="https://doc.rust-lang.org/stable/reference.html">Reference</a></li>
@@ -76,6 +76,13 @@
7676
</li>
7777
</ul>
7878
</li>
79+
<li class="col-xs-4 col-md-2"><h2>&nbsp;</h2>
80+
<ul>
81+
<li>
82+
<a href="team.html">Team</a>
83+
</li>
84+
</ul>
85+
</li>
7986
</ul>
8087
</header>
8188
{{ content }}

‎index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
<span class="version-rec-box-inner">
1919
Recommended Version:<br>
2020
<span id="install-version">
21-
1.0.0
21+
1.1.0
2222
(<span>source</span>)
2323
</span>
2424
</span>
2525
<a class="btn btn-primary" id="inst-link"
26-
href="https://static.rust-lang.org/dist/rustc-1.0.0-src.tar.gz">Install</a>
26+
href="https://static.rust-lang.org/dist/rustc-1.1.0-src.tar.gz">Install</a>
2727
<a class="btn btn-default" href="install.html" role="button">Other Downloads</a>
2828
</div>
2929
</div>

‎install.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
<div class="row install">
77
<div class="col-md-4 side-header">
8-
<h2>1.0.0</h2>
9-
<h3>May 15, 2015</h3>
8+
<h2>1.1.0</h2>
9+
<h3>June 25, 2015</h3>
1010
<p>
1111
The current stable release of Rust, updated every six weeks and backwards-compatible.
1212
</p>
@@ -15,27 +15,27 @@ <h3>May 15, 2015</h3>
1515
<table class="table-features table-installers"><tbody>
1616
<tr>
1717
<td class="inst-type">Linux binaries (.tar.gz)</td>
18-
<td><a href="https://static.rust-lang.org/dist/rust-1.0.0-x86_64-unknown-linux-gnu.tar.gz"><div class="inst-button">64-bit</div></a></td>
19-
<td><a href="https://static.rust-lang.org/dist/rust-1.0.0-i686-unknown-linux-gnu.tar.gz"><div class="inst-button">32-bit</div></a></td>
18+
<td><a href="https://static.rust-lang.org/dist/rust-1.1.0-x86_64-unknown-linux-gnu.tar.gz"><div class="inst-button">64-bit</div></a></td>
19+
<td><a href="https://static.rust-lang.org/dist/rust-1.1.0-i686-unknown-linux-gnu.tar.gz"><div class="inst-button">32-bit</div></a></td>
2020
</tr>
2121
<tr>
2222
<td class="inst-type">Mac installer (.pkg)</td>
23-
<td><a href="https://static.rust-lang.org/dist/rust-1.0.0-x86_64-apple-darwin.pkg"><div class="inst-button">64-bit</div></a></td>
24-
<td><a href="https://static.rust-lang.org/dist/rust-1.0.0-i686-apple-darwin.pkg"><div class="inst-button">32-bit</div></a></td>
23+
<td><a href="https://static.rust-lang.org/dist/rust-1.1.0-x86_64-apple-darwin.pkg"><div class="inst-button">64-bit</div></a></td>
24+
<td><a href="https://static.rust-lang.org/dist/rust-1.1.0-i686-apple-darwin.pkg"><div class="inst-button">32-bit</div></a></td>
2525
</tr>
2626
<tr>
2727
<td class="inst-type">Mac binaries (.tar.gz)</td>
28-
<td><a href="https://static.rust-lang.org/dist/rust-1.0.0-x86_64-apple-darwin.tar.gz"><div class="inst-button">64-bit</div></a></td>
29-
<td><a href="https://static.rust-lang.org/dist/rust-1.0.0-i686-apple-darwin.tar.gz"><div class="inst-button">32-bit</div></a></td>
28+
<td><a href="https://static.rust-lang.org/dist/rust-1.1.0-x86_64-apple-darwin.tar.gz"><div class="inst-button">64-bit</div></a></td>
29+
<td><a href="https://static.rust-lang.org/dist/rust-1.1.0-i686-apple-darwin.tar.gz"><div class="inst-button">32-bit</div></a></td>
3030
</tr>
3131
<tr>
3232
<td class="inst-type">Windows installer (.msi)</td>
33-
<td><a href="https://static.rust-lang.org/dist/rust-1.0.0-x86_64-pc-windows-gnu.msi"><div class="inst-button">64-bit</div></a></td>
34-
<td><a href="https://static.rust-lang.org/dist/rust-1.0.0-i686-pc-windows-gnu.msi"><div class="inst-button">32-bit</div></a></td>
33+
<td><a href="https://static.rust-lang.org/dist/rust-1.1.0-x86_64-pc-windows-gnu.msi"><div class="inst-button">64-bit</div></a></td>
34+
<td><a href="https://static.rust-lang.org/dist/rust-1.1.0-i686-pc-windows-gnu.msi"><div class="inst-button">32-bit</div></a></td>
3535
</tr>
3636
<td class="inst-type">Source</td>
3737
<td colspan="2"><a
38-
href="https://static.rust-lang.org/dist/rustc-1.0.0-src.tar.gz"><div class="inst-button">rustc-1.0.0-src.tar.gz</div></a></td>
38+
href="https://static.rust-lang.org/dist/rustc-1.1.0-src.tar.gz"><div class="inst-button">rustc-1.1.0-src.tar.gz</div></a></td>
3939
</tr>
4040
</tbody></table>
4141
</div>

‎team.md

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ people:
1616
name: Brian Koropoff
1717
brson:
1818
name: Brian Anderson
19+
bstrie:
20+
name: Ben Striegel
1921
BurntSushi:
2022
name: Andrew Gallant
2123
irc: burntsushi
@@ -53,8 +55,13 @@ people:
5355
name: Patrick Walton
5456
pnkfelix:
5557
name: Felix Klock
58+
rpcraig:
59+
name: Rachel Craig
60+
site: twitter
5661
sfackler:
5762
name: Steven Fackler
63+
skade:
64+
name: Florian Gilcher
5865
steveklabnik:
5966
name: Steve Klabnik
6067
vadimcn:
@@ -83,10 +90,23 @@ teams:
8390
responsibility: "tool support (e.g. Cargo, multirust), CI infrastructure, etc."
8491
members: [brson, nrc, alexcrichton, vadimcn, wycats, michaelwoerister]
8592
lead: alexcrichton
93+
- name: Community
94+
responsibility: "coordinating events, outreach, commercial users, teaching materials, and exposure"
95+
lead: steveklabnik
96+
members: [brson, rpcraig, skade, manishearth, steveklabnik, bstrie, erickt]
8697
- name: Moderation
87-
responsibility: "helping uphold the [code of conduct](http://www.rust-lang.org/conduct.html)"
98+
responsibility: "helping uphold the <a href='http://www.rust-lang.org/conduct.html'>code of conduct</a>"
8899
members: [mbrubeck, BurntSushi, manishearth, pnkfelix, erickt]
89100
email: [email protected]
101+
102+
# Information on sites to get profile information from
103+
sites:
104+
github:
105+
url: https://github.com/%nick
106+
avatar: http://avatars.githubusercontent.com/%nick
107+
twitter:
108+
url: https://twitter.com/%nick
109+
avatar: https://avatars.io/twitter/%nick?size=large
90110
---
91111

92112
<style type="text/css">
@@ -134,23 +154,31 @@ rosters, in alphabetical order.
134154

135155
{% for team in page.teams %}
136156
<section id="{{ team.name | replace:' ','-' }}">
137-
## {{ team.name }} team
157+
<h2> {{ team.name }} team</h2>
158+
159+
<strong>Responsibility</strong>: <em>{{ team.responsibility }}</em>
138160

139-
**Responsibility**: *{{ team.responsibility }}*
161+
<br />
140162

141163
{% if team.email %}
142-
**Contact**:
164+
<strong>Contact</strong>:
143165
<a href="mailto:{{ team.email | uri_escape }}">{{ team.email }}</a>
144166
{% endif %}
145167

146168
<ul class="headshots">
147-
{% for github in team.members %}
148-
{% assign person = page.people[github] %}
149-
<li class="person {% if team.lead and team.lead == github %}lead{% endif %}">
150-
<a href="https://github.com/{{ github }}">
169+
{% for nick in team.members %}
170+
{% assign person = page.people[nick] %}
171+
{% if person.site %}
172+
{% assign sitename = person.site %}
173+
{% else %}
174+
{% assign sitename = "github" %}
175+
{% endif %}
176+
{% assign site = page.sites[sitename] %}
177+
<li class="person {% if team.lead and team.lead == nick %}lead{% endif %}">
178+
<a href="{{ site.url | replace:'%nick',nick }}">
151179
<div class="name">{{ person.name }}</div>
152-
<div class="irc">irc: {% if person.irc %}{{ person.irc }}{% else %}{{ github }}{% endif %}</div>
153-
<img class="headshot" src="http://avatars.githubusercontent.com/{{ github }}">
180+
<div class="irc">irc: {% if person.irc %}{{ person.irc }}{% else %}{{ nick }}{% endif %}</div>
181+
<img class="headshot" src="{{ site.avatar | replace:'%nick',nick }}">
154182
</a>
155183
</li>
156184
{% endfor %}

0 commit comments

Comments
 (0)