Merge tag 'debian/1.52.1+dfsg1-1_exp2' into proxmox/buster

[rustc.git] / src / doc / rustc-dev-guide / src / walkthrough.md

diff --git a/src/doc/rustc-dev-guide/src/walkthrough.md b/src/doc/rustc-dev-guide/src/walkthrough.md
index c74f72cc571bfcd228fcdb6a8a8a612165074eb9..b0d040942e70013ae317c0cb1f1430655507a049 100644 (file)
--- a/src/doc/rustc-dev-guide/src/walkthrough.md
+++ b/src/doc/rustc-dev-guide/src/walkthrough.md
@@ -1,5 +1,7 @@
 # Walkthrough: a typical contribution
 
+<!-- toc -->
+
 There are _a lot_ of ways to contribute to the rust compiler, including fixing
 bugs, improving performance, helping design features, providing feedback on
 existing features, etc. This chapter does not claim to scratch the surface.
@@ -50,7 +52,7 @@ before, not all of these are needed for every type of contribution.
 - **Implementation** Implement your idea unstably in the compiler. You can
   find the original implementation [here][impl1].
 - **Possibly iterate/refine** As the community gets experience with your
-  feature on the nightly compiler and in `libstd`, there may be additional
+  feature on the nightly compiler and in `std`, there may be additional
   feedback about design choice that might be adjusted. This particular feature
   went [through][impl2] a [number][impl3] of [iterations][impl4].
 - **Stabilization** When your feature has baked enough, a rust team member may
@@ -189,10 +191,10 @@ questions or discuss things you don't understand or disagree with. However,
 recognize that the PR won't be merged unless someone on the rust team approves
 it.
 
-When your review approves the PR, it will go into a queue for yet another bot
-called `@bors`.  `@bors` manages the CI build/merge queue. When your PR reaches
+When your reviewer approves the PR, it will go into a queue for yet another bot
+called `@bors`. `@bors` manages the CI build/merge queue. When your PR reaches
 the head of the `@bors` queue, `@bors` will test out the merge by running all
-tests against your PR on Travis CI. This takes a lot of time to
+tests against your PR on GitHub Actions. This takes a lot of time to
 finish. If all tests pass, the PR is merged and becomes part of the next
 nightly compiler!