Merge branch 'master' into patch-1

Author: ehuss

book.toml

@@ -13,6 +13,7 @@ command = "./build.bash"
 additional-js = ["js/moment.min.js", "js/index.js"]
 no-section-label=true
 git-repository-url="https://github.com/rust-lang/rust-forge"
+curly-quotes = true
 
 [output.html.redirect]
 "beta-backporting.html" = "/release/backporting.html"
@@ -43,8 +44,11 @@ git-repository-url="https://github.com/rust-lang/rust-forge"
 "compiler/diagnostic-codes.html" = "https://rustc-dev-guide.rust-lang.org/diagnostics/diagnostic-codes.html"
 "compiler/profile-queries.html" = "https://rustc-dev-guide.rust-lang.org/queries/profiling.html"
 "chat/index.html" = "/platforms/index.html"
-"chat/discord.html" = "platforms/discord.html"
-"github.html" = "platforms/github.html"
-"chat/email.html" = "platforms/email.html"
-"chat/zulip/index.html" = "platforms/zulip/index.html"
-"chat/zulip.html" = "platforms/zulip.html"
+"chat/discord.html" = "/platforms/discord.html"
+"github.html" = "/platforms/github.html"
+"chat/email.html" = "/platforms/email.html"
+"chat/zulip/index.html" = "/platforms/zulip/index.html"
+"chat/zulip.html" = "/platforms/zulip.html"
+"platforms/zulip/triagebot.html" = "/triagebot/index.html"
+"core/blogs.html" = "/platforms/blogs.html"
+"core/index.html" = "/governance/council.html"

src/SUMMARY.md

@@ -8,9 +8,32 @@
   - [GitHub](./platforms/github.md)
   - [Zulip](./platforms/zulip.md)
       - [Moderation](./platforms/zulip/moderation.md)
-      - [Triagebot](./platforms/zulip/triagebot.md)
-- [Core](./core/README.md)
-    - [Rust Blog Guidelines](./core/blogs.md)
+  - [Blogs](./platforms/blogs.md)
+- [Triagebot](./triagebot/README.md)
+    - [Agenda Generator](./triagebot/agenda.md)
+    - [Issue Assignment](./triagebot/issue-assignment.md)
+    - [PR Assignment](./triagebot/pr-assignment.md)
+    - [Autolabels](./triagebot/autolabels.md)
+    - [Close](./triagebot/close.md)
+    - [Documentation Updates](./triagebot/doc-updates.md)
+    - [GitHub Releases](./triagebot/github-releases.md)
+    - [Glacier](./triagebot/glacier.md)
+    - [Labeling](./triagebot/labeling.md)
+    - [Major Changes](./triagebot/major-changes.md)
+    - [Mentions](./triagebot/mentions.md)
+    - [No Merge Policy](./triagebot/no-merge.md)
+    - [Nominate](./triagebot/nominate.md)
+    - [Note](./triagebot/note.md)
+    - [Notifications](./triagebot/notifications.md)
+    - [Pinging](./triagebot/pinging.md)
+    - [Requesting Prioritization](./triagebot/requesting-prioritization.md)
+    - [Review Changes Requested](./triagebot/review-submitted.md)
+    - [Review Requested](./triagebot/review-requested.md)
+    - [Rustc Commit Tracking](./triagebot/rustc-commit-list.md)
+    - [Shortcuts](./triagebot/shortcuts.md)
+    - [Triagebot Dashboard](./triagebot/triage-dashboard.md)
+    - [Zulip Meeting Management](./triagebot/zulip-meeting.md)
+    - [Zulip Notifications](./triagebot/zulip-notifications.md)
 - [Community](./community/README.md)
     - [State of Rust Survey FAQ](./community/survey-faq.md)
 - [Compiler](./compiler/README.md)
@@ -38,6 +61,8 @@
   - [Self-hosting a docs.rs instance](./docs-rs/self-hosting.md)
   - [Maintenance procedures](./docs-rs/maintenance.md)
 - [Governance](./governance/README.md)
+    - [Leadership Council](./governance/council.md)
+    - [Moderation](./governance/moderation.md)
 - [Infrastructure](./infra/README.md)
     - [Other Installation Methods](./infra/other-installation-methods.md)
     - [Release Channel Layout](./infra/channel-layout.md)

src/community/survey-faq.md

@@ -1,6 +1,6 @@
 # State of Rust Survey FAQ
 
-In this FAQ we try to answer common questions about the Annual State of the Rust Language Community Survey. If in your opinion there is a missing question or if you have a concern about this document, please do not hesitate to contact the [Rust Community Team](community-team@rust-lang.org) or open an [issue with the Community Team](https://github.com/rust-community/team/issues).
+In this FAQ we try to answer common questions about the Annual State of the Rust Language Community Survey. If in your opinion there is a missing question or if you have a concern about this document, please do not hesitate to contact the [Rust Community Team](mailto:community-team@rust-lang.org) or open an [issue with the Community Team](https://github.com/rust-community/team/issues).
 
 ## Why is this survey important for the Rust project?
 
@@ -27,7 +27,7 @@ The answers from the survey will be anonymized, aggregated, and summarized. A hi
 
 ### How is personally identifiable information handled?
 
-Nearly every question in the survey is optional. You are welcome to share as much or as little information as you are comfortable with. Only the Rust language Core Team and the Community Team Survey Leads will have access to the raw data from the survey. All the answers are anonymized prior to be shared with the rest of the teams and prior to the results publication.
+Nearly every question in the survey is optional. You are welcome to share as much or as little information as you are comfortable with. Only the Community Team Survey Leads will have access to the raw data from the survey. All the answers are anonymized prior to be shared with the rest of the teams and prior to the results publication.
 
 ### Why is the survey collecting contact information?
 
@@ -39,7 +39,7 @@ The survey optionally collects contact information for the following cases if yo
 - Rust training
 - interest in a Rust team contacting you about your survey responses
 
-If you would like to be contacted about any of this, or any other concerns, but you don't want to associate your email with your survey responses, you can instead email the Rust Community Team at community-team@rust-lang.org or the Core Team at core-team@rust-lang.org, and we will connect you to the right people.
+If you would like to be contacted about any of this, or any other concerns, but you don't want to associate your email with your survey responses, you can instead email the Rust Community Team at community-team@rust-lang.org, and we will connect you to the right people.
 
 ## Where and when is the survey results report published?
 

src/compiler/prioritization/procedure.md

@@ -68,7 +68,7 @@ Paste the markdown file of this week [performance triage logs](https://github.co
 
 ### Announce the meeting on Zulip
 
-About two hours before the scheduled meeting, create a new topic on the Zulip stream `#t-compiler/meetings` titled "[weekly] YYYY-MM-DD" using the the following message template:
+About two hours before the scheduled meeting, create a new topic on the Zulip stream `#t-compiler/meetings` titled "\[weekly] YYYY-MM-DD" using the the following message template:
 
 ```text
 Hi @*T-compiler/meeting*; the triage meeting will happen tomorrow in about 2 hours.

src/compiler/steering-meeting/how-to-run-planning.md

@@ -26,7 +26,7 @@ To actually make the final selection, we recommend
     * Typical ratio is 2 technical, 1 non-technical, but this is not set in stone
     * It's ok to have fewer than 3 meetings
 
-[compiler-team]: XXX
+[compiler-team]: https://github.com/rust-lang/compiler-team/
 
 ## Announce the meetings
 

src/core/README.md

@@ -4,8 +4,8 @@ If we get a DMCA takedown notice, here's what needs to happen:
 
 ## Contact Legal
 
-Before removing the crates, get in touch with legal support, currently by
-emailing the Core team, and ask an opinion from them on the received request and
+Before removing the crates, get in touch with legal support,
+and ask an opinion from them on the received request and
 whether we have to comply with it.
 
 ## Remove relevant version(s) and/or entire crates from crates.io

src/crates-io/crate-removal.md

@@ -1,6 +1,9 @@
 # Self hosting a docs.rs instance
 
-These are instructions for deploying the server in a production environment. For instructions on developing locally without docker-compose, see [Developing without docker-compose](no-docker-compose.html).
+These are instructions for deploying the server in a production environment. For instructions on developing locally without docker-compose, see [Developing without docker-compose][no-docker-compose].
+
+<!-- NOTE: This link is outdated, and should probably be migrated to this site. -->
+[no-docker-compose]: https://github.com/rust-lang/docs.rs/wiki/Developing-without-docker-compose
 
 Here is a breakdown of what it takes to turn a regular server into its own version of docs.rs.
 
@@ -20,7 +23,7 @@ Docs.rs has a few basic requirements:
 * LXC tools (doc builds run inside an LXC container)
 
 ```console
-$ curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly
+$ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
 $ source $HOME/.cargo/env
 # apt install build-essential git curl cmake gcc g++ pkg-config libmagic-dev libssl-dev zlib1g-dev postgresql lxc-utils
 ```
@@ -109,7 +112,7 @@ Inside the container, we also need to set up a `cratesfyi` user, and install Rus
 
 ```console
 lxc-attach -n cratesfyi-container -- adduser --disabled-login --disabled-password --gecos "" cratesfyi
-lxc-attach -n cratesfyi-container -- su - cratesfyi -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly'
+lxc-attach -n cratesfyi-container -- su - cratesfyi -c 'curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly'
 lxc-attach -n cratesfyi-container -- su - cratesfyi -c 'rustup target add i686-apple-darwin'
 lxc-attach -n cratesfyi-container -- su - cratesfyi -c 'rustup target add i686-pc-windows-msvc'
 lxc-attach -n cratesfyi-container -- su - cratesfyi -c 'rustup target add i686-unknown-linux-gnu'
@@ -249,4 +252,4 @@ Next, we can unlock the builder so it can start checking new crates:
 $ sudo su - cratesfyi -c "cd ~/docs.rs && cargo run --release -- build unlock"
 ```
 
-And we're done! Changes to the site or the build behavior should be visible now.
+And we're done! Changes to the site or the build behavior should be visible now.