about summary refs log tree commit diff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorvarkor <github@varkor.com>2019-03-14 01:17:49 +0000
committervarkor <github@varkor.com>2019-03-14 01:17:49 +0000
commit3a00649256c64cacfdbf5f0e7b370d660291d06e (patch)
treef518241f41c45037e464eed6352d51c5370ce99b /CONTRIBUTING.md
parent308a002eb16425b5164c1d2931d26d802ae89f6f (diff)
downloadrust-3a00649256c64cacfdbf5f0e7b370d660291d06e.tar.gz
rust-3a00649256c64cacfdbf5f0e7b370d660291d06e.zip
Move rollup description earlier
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md23
1 files changed, 11 insertions, 12 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d6253dcb233..ee56f5bf995 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -154,6 +154,15 @@ been approved. The PR then enters the [merge queue][merge-queue], where [@bors][
 will run all the tests on every platform we support. If it all works out,
 [@bors][bors] will merge your code into `master` and close the pull request.
 
+Depending on the scale of the change, you may see a slightly different form of `r+`:
+
+    @bors r+ rollup
+
+The additional `rollup` tells [@bors][bors] that this change is eligible for to be
+"rolled up". Changes that are rolled up are tested and merged at the same time, to
+speed the process up. Typically only small changes that are expected not to conflict
+with one another are rolled up.
+
 [rust-highfive]: https://github.com/rust-highfive
 [steveklabnik]: https://github.com/steveklabnik
 [bors]: https://github.com/bors
@@ -298,18 +307,8 @@ the submodule to. Running `./x.py build` should work now.
 
 Documentation improvements are very welcome. The source of `doc.rust-lang.org`
 is located in `src/doc` in the tree, and standard API documentation is generated
-from the source code itself.
-
-Documentation pull requests function in the same way as other pull requests,
-though you may see a slightly different form of `r+`:
-
-    @bors r+ rollup
-
-That additional `rollup` tells [@bors][bors] that this change is eligible for a 'rollup'.
-To save [@bors][bors] some work, and to get small changes through more quickly, when
-[@bors][bors] attempts to merge a commit that's rollup-eligible, it will also merge
-the other rollup-eligible patches too, and they'll get tested and merged at
-the same time.
+from the source code itself. Documentation pull requests function in the same way
+as other pull requests.
 
 To find documentation-related issues, sort by the [T-doc label][tdoc].