@@ -154,6 +154,15 @@ been approved. The PR then enters the [merge queue][merge-queue], where [@bors][
154
154
will run all the tests on every platform we support. If it all works out,
155
155
[ @bors ] [ bors ] will merge your code into ` master ` and close the pull request.
156
156
157
+ Depending on the scale of the change, you may see a slightly different form of ` r+ ` :
158
+
159
+ @bors r+ rollup
160
+
161
+ The additional ` rollup ` tells [ @bors ] [ bors ] that this change is eligible for to be
162
+ "rolled up". Changes that are rolled up are tested and merged at the same time, to
163
+ speed the process up. Typically only small changes that are expected not to conflict
164
+ with one another are rolled up.
165
+
157
166
[ rust-highfive ] : https://github.com/rust-highfive
158
167
[ steveklabnik ] : https://github.com/steveklabnik
159
168
[ bors ] : https://github.com/bors
@@ -298,18 +307,8 @@ the submodule to. Running `./x.py build` should work now.
298
307
299
308
Documentation improvements are very welcome. The source of ` doc.rust-lang.org `
300
309
is located in ` src/doc ` in the tree, and standard API documentation is generated
301
- from the source code itself.
302
-
303
- Documentation pull requests function in the same way as other pull requests,
304
- though you may see a slightly different form of ` r+ ` :
305
-
306
- @bors r+ rollup
307
-
308
- That additional ` rollup ` tells [ @bors ] [ bors ] that this change is eligible for a 'rollup'.
309
- To save [ @bors ] [ bors ] some work, and to get small changes through more quickly, when
310
- [ @bors ] [ bors ] attempts to merge a commit that's rollup-eligible, it will also merge
311
- the other rollup-eligible patches too, and they'll get tested and merged at
312
- the same time.
310
+ from the source code itself. Documentation pull requests function in the same way
311
+ as other pull requests.
313
312
314
313
To find documentation-related issues, sort by the [ T-doc label] [ tdoc ] .
315
314
0 commit comments