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

Commit d9d69ef

Browse files
author
edunham
committed
Merge branch 'gh-pages'
Since the site is moving off of github pages, it would be better to use conventional branch naming. Doing this as a merge commit because I doubt github would handle a PR of branch renaming gracefully, and we want to keep the github-pages site operational during the transition.
2 parents fedf00f + 60c1a1d commit d9d69ef

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2813
-0
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
_site
2+
Gemfile.lock
3+
serve/

‎CNAME

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
www.rust-lang.org

‎COPYRIGHT

Lines changed: 370 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,370 @@
1+
Short version for non-lawyers:
2+
3+
The Rust Project is dual-licensed under Apache 2.0 and MIT
4+
terms.
5+
6+
7+
Longer version:
8+
9+
The Rust Project is copyright 2012, The Rust Project
10+
Developers (given in the file AUTHORS.txt).
11+
12+
Licensed under the Apache License, Version 2.0
13+
<LICENSE-APACHE or
14+
http://www.apache.org/licenses/LICENSE-2.0> or the MIT
15+
license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
16+
at your option. All files in the project carrying such
17+
notice may not be copied, modified, or distributed except
18+
according to those terms.
19+
20+
21+
The Rust Project includes packages written by third parties.
22+
The following third party packages are included, and carry
23+
their own copyright notices and license terms:
24+
25+
26+
* The ISAAC pseudo random number generation package. Code
27+
for this package is found in the src/rt/isaac directory,
28+
within this distribution. This package is redistributed
29+
under the following terms, as noted in its source:
30+
31+
By Bob Jenkins, 1996, Public Domain
32+
33+
34+
* The ACME large integer package. Code for this package is
35+
found in the src/rt/bigint directory, within this
36+
distribution. This package is redistributed under the
37+
following terms, as noted in its source:
38+
39+
Copyright © 2000 by Jef Poskanzer <[email protected]>.
40+
All rights reserved.
41+
42+
Redistribution and use in source and binary forms, with
43+
or without modification, are permitted provided that the
44+
following conditions are met:
45+
46+
1. Redistributions of source code must retain the above
47+
copyright notice, this list of conditions and the
48+
following disclaimer.
49+
50+
2. Redistributions in binary form must reproduce the
51+
above copyright notice, this list of conditions and
52+
the following disclaimer in the documentation and/or
53+
other materials provided with the distribution.
54+
55+
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS
56+
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
57+
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
58+
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
59+
DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
60+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
61+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
62+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
63+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
64+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
65+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
66+
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
67+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
68+
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
69+
70+
71+
* The UTHASH hash table package. Code for this package is
72+
found in the src/rt/uthash directory within this
73+
distribution. This package is redistributed under the
74+
following terms, as noted in its source:
75+
76+
Copyright (c) 2003-2009, Troy D. Hanson
77+
http://uthash.sourceforge.net All rights reserved.
78+
79+
Redistribution and use in source and binary forms, with
80+
or without modification, are permitted provided that the
81+
following conditions are met:
82+
83+
* Redistributions of source code must retain the
84+
above copyright notice, this list of conditions
85+
and the following disclaimer.
86+
87+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
88+
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
89+
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
90+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
91+
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
92+
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
93+
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
94+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
95+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
96+
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
97+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
98+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
99+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
100+
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
101+
OF SUCH DAMAGE.
102+
103+
104+
* Two header files that are part of the Valgrind
105+
package. These files are found at src/rt/vg/valgrind.h and
106+
src/rt/vg/memcheck.h, within this distribution. These files
107+
are redistributed under the following terms, as noted in
108+
them:
109+
110+
for src/rt/vg/valgrind.h:
111+
112+
This file is part of Valgrind, a dynamic binary
113+
instrumentation framework.
114+
115+
Copyright (C) 2000-2010 Julian Seward. All rights
116+
reserved.
117+
118+
Redistribution and use in source and binary forms, with
119+
or without modification, are permitted provided that the
120+
following conditions are met:
121+
122+
1. Redistributions of source code must retain the above
123+
copyright notice, this list of conditions and the
124+
following disclaimer.
125+
126+
2. The origin of this software must not be
127+
misrepresented; you must not claim that you wrote the
128+
original software. If you use this software in a
129+
product, an acknowledgment in the product
130+
documentation would be appreciated but is not
131+
required.
132+
133+
3. Altered source versions must be plainly marked as
134+
such, and must not be misrepresented as being the
135+
original software.
136+
137+
4. The name of the author may not be used to endorse or
138+
promote products derived from this software without
139+
specific prior written permission.
140+
141+
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
142+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
143+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
144+
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
145+
NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
146+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
147+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
148+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
149+
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
150+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
151+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
152+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
153+
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
154+
OF SUCH DAMAGE.
155+
156+
for src/rt/vg/memcheck.h:
157+
158+
This file is part of MemCheck, a heavyweight Valgrind
159+
tool for detecting memory errors.
160+
161+
Copyright (C) 2000-2010 Julian Seward. All rights
162+
reserved.
163+
164+
Redistribution and use in source and binary forms, with
165+
or without modification, are permitted provided that the
166+
following conditions are met:
167+
168+
1. Redistributions of source code must retain the above
169+
copyright notice, this list of conditions and the
170+
following disclaimer.
171+
172+
2. The origin of this software must not be
173+
misrepresented; you must not claim that you wrote the
174+
original software. If you use this software in a
175+
product, an acknowledgment in the product
176+
documentation would be appreciated but is not
177+
required.
178+
179+
3. Altered source versions must be plainly marked as
180+
such, and must not be misrepresented as being the
181+
original software.
182+
183+
4. The name of the author may not be used to endorse or
184+
promote products derived from this software without
185+
specific prior written permission.
186+
187+
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
188+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
189+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
190+
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
191+
NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
192+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
193+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
194+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
195+
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
196+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
197+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
198+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
199+
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
200+
OF SUCH DAMAGE.
201+
202+
203+
* The auxiliary file src/etc/pkg/modpath.iss contains a
204+
library routine compiled, by Inno Setup, into the Windows
205+
installer binary. This file is licensed under the LGPL,
206+
but, in our legal interpretation, this does not affect the
207+
aggregate "collected work" license of the Rust
208+
distribution (MIT) nor any other components of it. We
209+
believe that the terms governing distribution of the
210+
binary Windows installer built from modpath.iss are
211+
therefore LGPL, but not the terms governing distribution
212+
of any of the files installed by such an installer (such
213+
as the Rust compiler or runtime libraries themselves).
214+
215+
216+
* The libuv asynchronous I/O library. Code for this package
217+
is found in the src/libuv directory, within this
218+
distribution. This package is redistributed under the
219+
following terms, as noted in its source:
220+
221+
Copyright Joyent, Inc. and other Node contributors. All
222+
rights reserved. Permission is hereby granted, free of
223+
charge, to any person obtaining a copy of this software
224+
and associated documentation files (the "Software"), to
225+
deal in the Software without restriction, including
226+
without limitation the rights to use, copy, modify,
227+
merge, publish, distribute, sublicense, and/or sell
228+
copies of the Software, and to permit persons to whom
229+
the Software is furnished to do so, subject to the
230+
following conditions:
231+
232+
The above copyright notice and this permission notice
233+
shall be included in all copies or substantial portions
234+
of the Software.
235+
236+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
237+
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
238+
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
239+
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
240+
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
241+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
242+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
243+
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
244+
DEALINGS IN THE SOFTWARE.
245+
246+
247+
* Additional libraries included in libuv carry separate
248+
BSD-compatible licenses. See src/libuv/LICENSE for
249+
details.
250+
251+
* The src/rt/miniz.c file, carrying an implementation of
252+
RFC1950/RFC1951 DEFLATE, by Rich Geldreich
253+
<[email protected]>. All uses of this file are
254+
permitted by the embedded "unlicense" notice
255+
(effectively: public domain with warranty disclaimer).
256+
257+
* LLVM and Clang. Code for this package is found in
258+
src/llvm.
259+
260+
Copyright (c) 2003-2012 University of Illinois at
261+
Urbana-Champaign. All rights reserved.
262+
263+
Developed by:
264+
265+
LLVM Team
266+
267+
University of Illinois at Urbana-Champaign
268+
269+
http://llvm.org
270+
271+
Permission is hereby granted, free of charge, to any
272+
person obtaining a copy of this software and associated
273+
documentation files (the "Software"), to deal with the
274+
Software without restriction, including without
275+
limitation the rights to use, copy, modify, merge,
276+
publish, distribute, sublicense, and/or sell copies of
277+
the Software, and to permit persons to whom the Software
278+
is furnished to do so, subject to the following
279+
conditions:
280+
281+
* Redistributions of source code must retain the
282+
above copyright notice, this list of conditions
283+
and the following disclaimers.
284+
285+
* Redistributions in binary form must reproduce the
286+
above copyright notice, this list of conditions
287+
and the following disclaimers in the documentation
288+
and/or other materials provided with the
289+
distribution.
290+
291+
* Neither the names of the LLVM Team, University of
292+
Illinois at Urbana-Champaign, nor the names of its
293+
contributors may be used to endorse or promote
294+
products derived from this Software without
295+
specific prior written permission.
296+
297+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
298+
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
299+
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
300+
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
301+
SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE
302+
FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
303+
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
304+
OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
305+
OTHER DEALINGS WITH THE SOFTWARE.
306+
307+
308+
* Additional libraries included in LLVM carry separate
309+
BSD-compatible licenses. See src/llvm/LICENSE.txt for
310+
details.
311+
312+
313+
* Portions of the FFI code for interacting with the native ABI
314+
is derived from the Clay programming language, which carries
315+
the following license.
316+
317+
Copyright (C) 2008-2010 Tachyon Technologies.
318+
All rights reserved.
319+
320+
Redistribution and use in source and binary forms, with
321+
or without modification, are permitted provided that the
322+
following conditions are met:
323+
324+
1. Redistributions of source code must retain the above
325+
copyright notice, this list of conditions and the
326+
following disclaimer.
327+
328+
2. Redistributions in binary form must reproduce the
329+
above copyright notice, this list of conditions and
330+
the following disclaimer in the documentation and/or
331+
other materials provided with the distribution.
332+
333+
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR
334+
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
335+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
336+
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
337+
DEVELOPERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
338+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
339+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
340+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
341+
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
342+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
343+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
344+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
345+
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
346+
OF SUCH DAMAGE.
347+
348+
349+
* Additional copyright may be retained by contributors other
350+
than Mozilla, the Rust Project Authors, or the parties
351+
enumerated in this file. Such copyright can be determined
352+
on a case-by-case basis by examining the author of each
353+
portion of a file in the revision-control commit records
354+
of the project, or by consulting representative comments
355+
claiming copyright ownership for a file.
356+
357+
For example, the text:
358+
359+
"Copyright (c) 2011 Google Inc."
360+
361+
appears in some files, and these files thereby denote
362+
that their author and copyright-holder is Google Inc.
363+
364+
In all such cases, the absence of explicit licensing text
365+
indicates that the contributor chose to license their work
366+
for distribution under identical terms to those Mozilla
367+
has chosen for the collective work, enumerated at the top
368+
of this file. The only difference is the retention of
369+
copyright itself, held by the contributor.
370+

‎Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source "https://rubygems.org"
2+
3+
gem 'jekyll'

‎README.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# rust-www
2+
3+
This repository contains the source files for rust-lang.org.
4+
5+
To install jekyll (and any other dependencies, if we get any):
6+
7+
```
8+
bundle install
9+
```
10+
11+
To run this website as a developer:
12+
13+
```
14+
jekyll serve
15+
```
16+
17+
This will serve the site at `localhost:4000`.

0 commit comments

Comments
 (0)