dl-snapshot: be more forgiving to triples
bug fix for oh-my-zsh
auto merge of #920 : CMGS/cargo/master, r=eerden

when I use this script in oh-my-zsh, it will raise an error, so I modified it..
auto merge of #913 : jmesmon/cargo/forgive-wierd-triples, r=alexcrichton
fix capitalization in build script docs
auto merge of #922 : steveklabnik/cargo/patch-1, r=alexcrichton
Point to spdx.org/licenses in license field docs

I expected the comment about the whitelist to say where you could find the whitelist. This mirrors the information given in the error message if you specify an invalid license identifier.
Update to newest Rust
auto merge of #956 : jakub-/cargo/newest-rust, r=alexcrichton
auto merge of #964 : carols10cents/cargo/patch-1, r=alexcrichton

I expected the comment about the whitelist to say where you could find the whitelist. This mirrors the information given in the error message if you specify an invalid license identifier.

I didn't make this a markdown link since it's within markdown within code within markdown, but I'm happy to edit this in any way you see fit.

Thank you!! :heart: