---

yaml
---
r: 170693
b: refs/heads/try
c: 36bed41
h: refs/heads/master
i:
  170691: ce3f6b6
v: v3

Author: nhowell

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 73a25f55ad748b4d3516417c711b99ce446591af
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 5b3cd3900ceda838f5798c30ab96ceb41f962534
-refs/heads/try: 589c38a3af4eff738347c82e6b98a0e139eb1563
+refs/heads/try: 36bed41c1fa2f5025563de5a6a5b181b05c4336e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/CONTRIBUTING.md

@@ -47,14 +47,5 @@ example, if it's 2014, and you change a Rust file that was created in
 // Copyright 2010-2014 The Rust Project Developers.
 ```
 
-# Coordination and communication
-
-Get feedback from other developers on
-[discuss.rust-lang.org][discuss], and
-[#rust-internals][pound-rust-internals].
-
-[pound-rust-internals]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-internals
-[discuss]: http://discuss.rust-lang.org
-
 For more details, please refer to
 [Note-development-policy](https://github.com/rust-lang/rust/wiki/Note-development-policy).

branches/try/man/rustc.1

@@ -34,7 +34,7 @@ Specify the name of the crate being built
 \fB\-\-emit\fR [asm|llvm-bc|llvm-ir|obj|link|dep-info]
 Configure the output that rustc will produce
 .TP
-\fB\-\-print\fR [crate-name|file-names|sysroot]
+\fB\-\-print\fR [crate-name|output-file-names|sysroot]
 Comma separated list of compiler information to print on stdout
 .TP
 \fB\-g\fR

branches/try/mk/install.mk

@@ -28,7 +28,11 @@ endif
 # Remove tmp files because it's a decent amount of disk space
 	$(Q)rm -R tmp/dist
 
-prepare_install: dist-tar-bins | tmp/empty_dir
+ifeq ($(CFG_DISABLE_DOCS),)
+prepare_install: dist/$(PKG_NAME)-$(CFG_BUILD).tar.gz dist/$(DOC_PKG_NAME)-$(CFG_BUILD).tar.gz | tmp/empty_dir
+else
+prepare_install: dist/$(PKG_NAME)-$(CFG_BUILD).tar.gz | tmp/empty_dir
+endif
 
 uninstall:
 ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER)))
@@ -44,7 +48,7 @@ endif
 # Remove tmp files because it's a decent amount of disk space
 	$(Q)rm -R tmp/dist
 
-prepare_uninstall: dist-tar-bins | tmp/empty_dir
+prepare_uninstall: dist/$(PKG_NAME)-$(CFG_BUILD).tar.gz | tmp/empty_dir
 
 .PHONY: install prepare_install uninstall prepare_uninstall