summaryrefslogtreecommitdiff
path: root/doc/rtd/topics/code_review.rst
diff options
context:
space:
mode:
authorChad Smith <chad.smith@canonical.com>2021-06-17 20:46:54 -0600
committerGitHub <noreply@github.com>2021-06-17 20:46:54 -0600
commitdb23b1b10b97fe19bc1c8af99a08aa5693d37923 (patch)
tree83a58dd3c7c6b1453742881722a07745f43eb587 /doc/rtd/topics/code_review.rst
parentabd2da5777195e7e432b0d53a3f7f29d071dd50e (diff)
downloadvyos-cloud-init-db23b1b10b97fe19bc1c8af99a08aa5693d37923.tar.gz
vyos-cloud-init-db23b1b10b97fe19bc1c8af99a08aa5693d37923.zip
docs: fix stale links rename master branch to main (#926)
Update doc references to 'main' default branch due to rename. Also some links have eroded: - for doc links directly to a line num link to a blob/<commit>/file/path#L10 instead of blob/<branch_name>. - pytest.param link to a specific version doc as latest has dropped the link
Diffstat (limited to 'doc/rtd/topics/code_review.rst')
-rw-r--r--doc/rtd/topics/code_review.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/rtd/topics/code_review.rst b/doc/rtd/topics/code_review.rst
index cbcd2497..33aad789 100644
--- a/doc/rtd/topics/code_review.rst
+++ b/doc/rtd/topics/code_review.rst
@@ -58,12 +58,12 @@ Reviewer
Committer
A cloud-init core developer (i.e. a person who has permission to
- merge PRs into master).
+ merge PRs into **main**).
Prerequisites For Landing Pull Requests
=======================================
-Before a PR can be landed into master, the following conditions *must*
+Before a PR can be landed into **main**, the following conditions *must*
be met:
* the CLA has been signed by the **Proposer** (or is covered by an
@@ -148,7 +148,7 @@ temporarily closed. (The first two are covered in this section; see
(In the below, when the verbs "merge" or "squash merge" are used, they
should be understood to mean "squash merged using the GitHub UI", which
-is the only way that changes can land in cloud-init's master branch.)
+is the only way that changes can land in cloud-init's **main** branch.)
These are the steps that comprise the review phase: