Rearrange Contributing material

Author: stwrt

Sources/WebKit/WebKit.docc/GettingStarted/ContributingCode.md

@@ -10,9 +10,17 @@ After downloading the code please run the below command.
 git webkit setup
 ```
 
-The `setup` checks that your environment is optimally configured to contribute, and may prompt you for some additional information.
+The `setup` sub-command of [git-webkit](https://github.com/WebKit/WebKit/tree/main/Tools/Scripts/git-webkit) configures your local WebKit checkout for contributing code to the WebKit project. This script will occasionally prompt the user for input. The script does the following:
 
-### Submitting a pull request
+* Set your [name](/WebKit/WebKit/wiki/Git-Config#username) and [email address](/WebKit/WebKit/wiki/Git-Config#useremail) for the WebKit repository
+* [Make Objective-C diffs easier to digest](/WebKit/WebKit/wiki/Git-Config#diff)
+* Setup a commit message generator
+* Set an [editor for commit messages](/WebKit/WebKit/wiki/Git-Config#coreeditor)
+* Store a [GitHub API token](https://github.com/settings/tokens) in your system credential store
+* Configure `git` to use the [GitHub API token](https://github.com/settings/tokens) when prompted for credentials, if using the HTTPS remote
+* Create a [user owned fork](/WebKit/WebKit/wiki/Git-Config#Forking) of the WebKit repository
+
+## Submitting a pull request
 
 Firstly, please make sure you [file a bug](https://bugs.webkit.org) for the thing you are adding or fixing! Or, find a bug that you think is relevant to the fix you are making.
 
@@ -44,6 +52,28 @@ Once done, you can update your pull request to include the changes by again simp
 git webkit pr
 ```
 
+## Landing Changes
+
+### Merge-Queue
+
+To land a pull request, add the [`merge-queue`](https://github.com/WebKit/WebKit/labels?q=merge-queue) or [`unsafe-merge-queue`](https://github.com/WebKit/WebKit/labels?q=unfsafe-merge-queue) label to your pull request. These labels will put your pull request into the [Merge-Queue](https://ews-build.webkit.org/#/builders/74) and [Unsafe-Merge-Queue](https://ews-build.webkit.org/#/builders/75), respectively, which will commit your pull request to the WebKit repository
+
+[Unsafe-Merge-Queue](https://ews-build.webkit.org/#/builders/75) inserts reviewer information into a commit's message and modified change logs. We then check to ensure that a pull request has been reviewed by checking the commit message before landing the change. [Unsafe-Merge-Queue](https://ews-build.webkit.org/#/builders/75) _does not_ validate that a pull request builds.
+
+Along with the actions performed by [Unsafe-Merge-Queue](https://ews-build.webkit.org/#/builders/75), [Merge-Queue](https://ews-build.webkit.org/#/builders/74) will validate that a pull request builds and run layout tests before landing the change.
+
+### git-webkit land
+
+_Landing should be achieved via merge-queue, this outlines the current behavior of `git-webkit land`_
+
+To land a change, run `git-webkit land` from the branch to be landed. Note that only a [committer](https://github.com/orgs/WebKit/teams/committers) has the privileges to commit a change to the WebKit repository. `git-webkit land` does the following:
+
+* Check to ensure a pull-request is approved and not blocked
+* Insert reviewer names into the commit message
+* Rebase the pull-request against its parent branch
+* [Canonicalize](https://github.com/WebKit/WebKit/wiki/Source-Control#canonicalization) the commits to be landed
+* Update the pull-request with the landed commit
+
 ## Coding style
 
 Code you write must follow WebKit’s [coding style guideline](https://webkit.org/contributing-code/#code-style-guidelines).

Sources/WebKit/WebKit.docc/GitHub/Contributing.md

@@ -4,24 +4,6 @@ The WebKit project outlines a simplified recommended setup. This section outline
 
 ## Remotes
 
-### Alternate Remotes
-
-The WebKit project currently has 5 different remotes:
-
-- [github.com/WebKit/WebKit](https://github.com/WebKit/WebKit)
-- [svn.webkit.org](https://svn.webkit.org/repository/webkit/)
-- [git.webkit.org (https)](https://git.webkit.org/?p=WebKit.git;a=summary)
-- [git.webkit.org (http)](https://git.webkit.org/?p=WebKit.git;a=summary)
-- [github.com/WebKit/WebKit-http](https://github.com/WebKit/WebKit-http)
-
-The first remote, [github.com/WebKit/WebKit](https://github.com/WebKit/WebKit), is an actively maintained `git` mirror of [svn.webkit.org](https://svn.webkit.org/repository/webkit/) that will soon become the canonical home of the WebKit project. We strongly recommend that all contributors use this remote for routine development.
-
-The second remote, [svn.webkit.org](https://svn.webkit.org/repository/webkit/), is the current canonical remote for the WebKit project. If a contributor is contributing to the WebKit project on a release branch, this is the remote they should be using. Note that this remote is Subversion, not git.
-
-[git.webkit.org (https)](https://git.webkit.org/?p=WebKit.git;a=summary) is a deprecated `git` mirror of [svn.webkit.org](https://svn.webkit.org/repository/webkit/). This mirror is maintained, but commit authorship is incorrect. This means that the shas of commits in this repository _do not_ match those from [github.com/WebKit/WebKit](https://github.com/WebKit/WebKit). This remote is sufficient for patch workflows, but contributors relying on it should migrate to [github.com/WebKit/WebKit](https://github.com/WebKit/WebKit) as we start using pull requests.
-
-[git.webkit.org (http)](https://git.webkit.org/?p=WebKit.git;a=summary) and [github.com/WebKit/WebKit-http](https://github.com/WebKit/WebKit-http) the same repository but served in different locations. This remote is no longer maintained and should not be relied on.
-
 ### Forking
 
 Since `git` is a decentralized version control system, a local copy can work with any remote that has the same set of shas. GitHub pull requests take advantage of this. After running [`git-webkit setup`](/WebKit/WebKit/wiki/Contributing#setup), the `.git/config` in the local WebKit repository should look something like this:
@@ -120,10 +102,6 @@ When creating or editing commit messages, `git` will invoke an external editor.
 
 `git` does basic automatic conflict resolution, but certain types of files may be difficult to resolve with what `git` provides. Specifying a `merge.driver` for a category of files can help automatically resolve conflicts in these files when running `git` commands, most notable, `git pull`. This is most common with frequently changing versioning files or ChangeLogs.
 
-### svn-remote
-
-This configuration options pairs a local branch in a contributor's checkout to a subversion branch on a specified remote. This configuration is required to use `git svn` commands. Note that `git-webkit find` allows a pure `git` checkout to reason about Subversion revisions without specifying an `svn-remote` for the branch containing the revision in question.
-
 ## WebKit Options
 
 [`git-webkit`] respects a few options that are specific to the `webkitscmpy` library. [`git-webkit setup`](/WebKit/WebKit/wiki/Contributing#setup) does automatically configure some of these, [`metadata/project_config`](/WebKit/WebKit/blob/main/metadata/project_config) also contains a few default values for the project.

Sources/WebKit/WebKit.docc/GitHub/Git_Config.md

@@ -1,6 +1,6 @@
 # Migration
 
-As WebKit moves away from Subversion to Git, contributors will need to migrate their local checkouts and workflows to GitHub. To determine which migration workflow you need, run the following command in your WebKit repository:
+WebKit has moved away from Subversion to Git, and contributors will need to migrate their local checkouts and workflows to GitHub. To determine which migration workflow you need, run the following command in your WebKit repository:
 
 ```
 git remote -v

Sources/WebKit/WebKit.docc/GitHub/Migration.md

@@ -67,7 +67,6 @@ For details on submitting your code to the project, read [Contributing Code](htt
 
 ### GitHub
 
-- <doc:Contributing>
 - <doc:Git_Config>
 - <doc:Merging>
 - <doc:Migration>