Skip to content

Commit 929d9b2

Browse files
committed
---
yaml --- r: 225146 b: refs/heads/stable c: b55f049 h: refs/heads/master v: v3
1 parent 5592788 commit 929d9b2

File tree

11 files changed

+474
-531
lines changed

11 files changed

+474
-531
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: 1fe32ca12c51afcd761d9962f51a74ff0d07a591
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: 02bce96e7baab54d91c8704cee64bc36b0ec8c06
32+
refs/heads/stable: b55f0497db7350e0033b626b317e53cf95b9a8b4
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b

branches/stable/RELEASES.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Language
1919

2020
* Several [restrictions have been added to trait coherence][coh] in
2121
order to make it easier for upstream authors to change traits
22-
without breaking downstream code.
22+
without breaking downsteam code.
2323
* Digits of binary and octal literals are [lexed more eagerly][lex] to
2424
improve error messages and macro behavior. For example, `0b1234` is
2525
now lexed as `0b1234` instead of two tokens, `0b1` and `234`.
@@ -169,10 +169,10 @@ Version 1.0.0-alpha.2 (February 2015)
169169
* Highlights
170170

171171
* The various I/O modules were [overhauled][io-rfc] to reduce
172-
unnecessary abstractions and provide better interoperation with
172+
unncessary abstractions and provide better interoperation with
173173
the underlying platform. The old `io` module remains temporarily
174174
at `std::old_io`.
175-
* The standard library now [participates in feature gating][feat],
175+
* The standard library now [partipates in feature gating][feat],
176176
so use of unstable libraries now requires a `#![feature(...)]`
177177
attribute. The impact of this change is [described on the
178178
forum][feat-forum]. [RFC][feat-rfc].
@@ -385,7 +385,7 @@ Version 1.0.0-alpha (January 2015)
385385
syscall when available.
386386
* The 'serialize' crate has been renamed 'rustc-serialize' and
387387
moved out of the distribution to Cargo. Although it is widely
388-
used now, it is expected to be superseded in the near future.
388+
used now, it is expected to be superceded in the near future.
389389
* The `Show` formatter, typically implemented with
390390
`#[derive(Show)]` is [now requested with the `{:?}`
391391
specifier][show] and is intended for use by all types, for uses

branches/stable/configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -717,10 +717,10 @@ probe CFG_MD5 md5
717717
probe CFG_MD5SUM md5sum
718718
if [ -n "$CFG_MD5" ]
719719
then
720-
CFG_HASH_COMMAND="$CFG_MD5 -q | cut -c 1-8"
720+
CFG_HASH_COMMAND="$CFG_MD5 -q | head -c 8"
721721
elif [ -n "$CFG_MD5SUM" ]
722722
then
723-
CFG_HASH_COMMAND="$CFG_MD5SUM | cut -c 1-8"
723+
CFG_HASH_COMMAND="$CFG_MD5SUM | head -c 8"
724724
else
725725
err 'could not find one of: md5 md5sum'
726726
fi

branches/stable/src/doc/trpl/documentation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ You can control a few aspects of the HTML that `rustdoc` generates through the
549549
```rust
550550
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
551551
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
552-
html_root_url = "http://doc.rust-lang.org/")]
552+
html_root_url = "http://doc.rust-lang.org/")];
553553
```
554554

555555
This sets a few different options, with a logo, favicon, and a root URL.

0 commit comments

Comments
 (0)