From 0f63b13d655cea6d7739150ddfa1b118f3c3f33f Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Tue, 19 Jan 2021 09:13:29 +0100
Subject: guide: Fix links.

---
 doc/release-checklist.md | 4 ++--
 guide/src/chapter_01.md  | 6 +++---
 guide/src/chapter_02.md  | 6 +++---
 guide/src/chapter_03.md  | 2 +-
 guide/src/lib.rs         | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/doc/release-checklist.md b/doc/release-checklist.md
index e8243b20..bc19865c 100644
--- a/doc/release-checklist.md
+++ b/doc/release-checklist.md
@@ -1,6 +1,6 @@
 This is a checklist for doing Sequoia releases.
 
- 0. Starting from origin/master, create a branch XXX for the release.
+ 0. Starting from origin/main, create a branch XXX for the release.
  1. For all 'Cargo.toml's: Bump version = "XXX".
        - Only do this for non-released crates and those with changes
          relative to the last released version.
@@ -28,7 +28,7 @@ This is a checklist for doing Sequoia releases.
        - openpgp
        - sqv
 10. In case of errors, correct them, and go back to 6.
-11. Merge the branch to master by merging the merge request created in
+11. Merge the branch to main by merging the merge request created in
     step 6, push the tag.
 12. Make a source distribution, put it on
     https://sequoia-pgp.org/dist/, collect and merge signatures.
diff --git a/guide/src/chapter_01.md b/guide/src/chapter_01.md
index 0a60b1ea..e4fc4fe6 100644
--- a/guide/src/chapter_01.md
+++ b/guide/src/chapter_01.md
@@ -6,7 +6,7 @@ will construct this program from top to bottom, concatenating the
 fragments yields the [`openpgp/examples/generate-sign-verify.rs`].
 
 [low-level API]: ../../sequoia_openpgp/index.html
-[`openpgp/examples/generate-sign-verify.rs`]: https://gitlab.com/sequoia-pgp/sequoia/blob/master/openpgp/examples/generate-sign-verify.rs
+[`openpgp/examples/generate-sign-verify.rs`]: https://gitlab.com/sequoia-pgp/sequoia/blob/main/openpgp/examples/generate-sign-verify.rs
 
 ```rust
 use std::io::{self, Write};
@@ -622,5 +622,5 @@ create a signed message, or a detached signature, see
 [`openpgp/examples/sign.rs`] and
 [`openpgp/examples/sign-detached.rs`].
 
-[`openpgp/examples/sign.rs`]: https://gitlab.com/sequoia-pgp/sequoia/blob/master/openpgp/examples/sign.rs
-[`openpgp/examples/sign-detached.rs`]: https://gitlab.com/sequoia-pgp/sequoia/blob/master/openpgp/examples/sign-detached.rs
+[`openpgp/examples/sign.rs`]: https://gitlab.com/sequoia-pgp/sequoia/blob/main/openpgp/examples/sign.rs
+[`openpgp/examples/sign-detached.rs`]: https://gitlab.com/sequoia-pgp/sequoia/blob/main/openpgp/examples/sign-detached.rs
diff --git a/guide/src/chapter_02.md b/guide/src/chapter_02.md
index fc88f653..832cd9b8 100644
--- a/guide/src/chapter_02.md
+++ b/guide/src/chapter_02.md
@@ -6,7 +6,7 @@ We will construct this program from top to bottom, concatenating the
 fragments yields the [`openpgp/examples/generate-encrypt-decrypt.rs`].
 
 [low-level API]: ../../sequoia_openpgp/index.html
-[`openpgp/examples/generate-encrypt-decrypt.rs`]: https://gitlab.com/sequoia-pgp/sequoia/blob/master/openpgp/examples/generate-encrypt-decrypt.rs
+[`openpgp/examples/generate-encrypt-decrypt.rs`]: https://gitlab.com/sequoia-pgp/sequoia/blob/main/openpgp/examples/generate-encrypt-decrypt.rs
 
 ```rust
 use std::io::{self, Write};
@@ -613,5 +613,5 @@ encrypt or decrypt some messages, see
 [`openpgp/examples/encrypt-for.rs`] and
 [`openpgp/examples/decrypt-with.rs`].
 
-[`openpgp/examples/encrypt-for.rs`]: https://gitlab.com/sequoia-pgp/sequoia/blob/master/openpgp/examples/encrypt-for.rs
-[`openpgp/examples/decrypt-with.rs`]: https://gitlab.com/sequoia-pgp/sequoia/blob/master/openpgp/examples/decrypt-with.rs
+[`openpgp/examples/encrypt-for.rs`]: https://gitlab.com/sequoia-pgp/sequoia/blob/main/openpgp/examples/encrypt-for.rs
+[`openpgp/examples/decrypt-with.rs`]: https://gitlab.com/sequoia-pgp/sequoia/blob/main/openpgp/examples/decrypt-with.rs
diff --git a/guide/src/chapter_03.md b/guide/src/chapter_03.md
index b8f05dd2..fac026b8 100644
--- a/guide/src/chapter_03.md
+++ b/guide/src/chapter_03.md
@@ -183,7 +183,7 @@ e.g. for collecting statistics about the SKS keyserver dump.  For a
 complete example, see [`openpgp/examples/statistics.rs`].
 
 [`PacketParser`]: ../../sequoia_openpgp/parse/struct.PacketParser.html
-[`openpgp/examples/statistics.rs`]: https://gitlab.com/sequoia-pgp/sequoia/blob/master/openpgp/examples/statistics.rs
+[`openpgp/examples/statistics.rs`]: https://gitlab.com/sequoia-pgp/sequoia/blob/main/openpgp/examples/statistics.rs
 
 ```rust
 use std::io::Read;
diff --git a/guide/src/lib.rs b/guide/src/lib.rs
index c1760d02..7fe94663 100644
--- a/guide/src/lib.rs
+++ b/guide/src/lib.rs
@@ -11,9 +11,9 @@ sure that this guide is always up-to-date.
 For more inspiration, see our various [examples] and our
 command-line frontends [sq] and [sqv].
 
-[examples]: https://gitlab.com/sequoia-pgp/sequoia/tree/master/openpgp/examples
-[sq]: https://gitlab.com/sequoia-pgp/sequoia/tree/master/sq
-[sqv]: https://gitlab.com/sequoia-pgp/sequoia/tree/master/sqv
+[examples]: https://gitlab.com/sequoia-pgp/sequoia/tree/main/openpgp/examples
+[sq]: https://gitlab.com/sequoia-pgp/sequoia/tree/main/sq
+[sqv]: https://gitlab.com/sequoia-pgp/sequoia/tree/main/sqv
 
 Happy climbing!
 
-- 
cgit v1.2.3