aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2022-02-08 16:16:01 +0000
committerNeil Alexander <neilalexander@users.noreply.github.com>2022-02-08 16:16:01 +0000
commit8a1dfffe3dc7e720964820301f58a7a9e50d5ee6 (patch)
tree3f125ffcb9fd8ea2d285b1287d5d0ffe8667b462 /docs
parent0e26662a552b671ef201490defbbea59df4250c1 (diff)
Various updates for renaming the `master` branch to `main`
Diffstat (limited to 'docs')
-rw-r--r--docs/CONTRIBUTING.md6
-rw-r--r--docs/p2p.md2
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index ea4b2b27..fe7127c7 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -37,7 +37,7 @@ If a job fails, click the "details" button and you should be taken to the job's
logs.
![Click the details button on the failing build
-step](https://raw.githubusercontent.com/matrix-org/dendrite/master/docs/images/details-button-location.jpg)
+step](https://raw.githubusercontent.com/matrix-org/dendrite/main/docs/images/details-button-location.jpg)
Scroll down to the failing step and you should see some log output. Scan the
logs until you find what it's complaining about, fix it, submit a new commit,
@@ -57,7 +57,7 @@ significant amount of CPU and RAM.
Once the code builds, run [Sytest](https://github.com/matrix-org/sytest)
according to the guide in
-[docs/sytest.md](https://github.com/matrix-org/dendrite/blob/master/docs/sytest.md#using-a-sytest-docker-image)
+[docs/sytest.md](https://github.com/matrix-org/dendrite/blob/main/docs/sytest.md#using-a-sytest-docker-image)
so you can see whether something is being broken and whether there are newly
passing tests.
@@ -94,4 +94,4 @@ For more general questions please use
We ask that everyone who contributes to the project signs off their
contributions, in accordance with the
-[DCO](https://github.com/matrix-org/matrix-doc/blob/master/CONTRIBUTING.rst#sign-off).
+[DCO](https://github.com/matrix-org/matrix-doc/blob/main/CONTRIBUTING.rst#sign-off).
diff --git a/docs/p2p.md b/docs/p2p.md
index e858ba11..4e9a5052 100644
--- a/docs/p2p.md
+++ b/docs/p2p.md
@@ -6,7 +6,7 @@ These are the instructions for setting up P2P Dendrite, current as of May 2020.
#### Build
-- The `master` branch has a WASM-only binary for dendrite: `./cmd/dendritejs`.
+- The `main` branch has a WASM-only binary for dendrite: `./cmd/dendritejs`.
- Build it and copy assets to riot-web.
```
$ ./build-dendritejs.sh