auto merge of #13193 : pongad/rust/fixconfig, r=thestinger

[rust.git] / CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3cba6f2891a5a08240c9b4ed7131eaf74ef863f9..52598ea3c692f33095533419c93427d2e6d3dcea 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,15 +1,17 @@
+## How to submit a bug report
+
+If you're just reporting a bug, please see:
+
+http://static.rust-lang.org/doc/master/complement-bugreport.html
+
 ## Pull request procedure
 
-Pull requests should be targeted at Rust's `incoming` branch (note
-that by default Github will aim them at the `master` branch) -- see
-"Changing The Commit Range and Destination Repository" in Github's
-documentation on [pull
-requests](https://help.github.com/articles/using-pull-requests).
+Pull requests should be targeted at Rust's `master` branch.
 Before pushing to your Github repo and issuing the pull request,
 please do two things:
 
 1. [Rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) your
-   local changes against the `incoming` branch. Resolve any conflicts
+   local changes against the `master` branch. Resolve any conflicts
    that arise.
 
 2. Run the full Rust test suite with the `make check` command.  You're