From b7ec24ff52d790259160b212de5d01bdfc175a13 Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 17 May 2021 12:53:12 +0200 Subject: [PATCH] Fix old references to master in docs --- docs/content/doc/development/development.md | 2 +- docs/content/doc/development/mage.md | 2 +- docs/content/doc/development/notifications.md | 2 +- docs/content/doc/setup/config.md | 6 +++--- docs/content/doc/setup/install-backend.md | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/content/doc/development/development.md b/docs/content/doc/development/development.md index 54035bca..6bf1dd51 100644 --- a/docs/content/doc/development/development.md +++ b/docs/content/doc/development/development.md @@ -15,7 +15,7 @@ menu: We use go modules to vendor libraries for Vikunja, so you'll need at least go `1.11` to use these. If you don't intend to add new dependencies, go `1.9` and above should be fine. -To contribute to Vikunja, fork the project and work on the master branch. +To contribute to Vikunja, fork the project and work on the main branch. A lot of developing tasks are automated using a Magefile, so make sure to [take a look at it]({{< ref "mage.md">}}). diff --git a/docs/content/doc/development/mage.md b/docs/content/doc/development/mage.md index b18fe180..67541dbf 100644 --- a/docs/content/doc/development/mage.md +++ b/docs/content/doc/development/mage.md @@ -39,7 +39,7 @@ There are multiple categories of subcommands in the magefile: ## CI -These tasks are automatically run in our CI every time someone pushes to master or you update a pull request: +These tasks are automatically run in our CI every time someone pushes to main or you update a pull request: * `mage check:lint` * `mage check:fmt` diff --git a/docs/content/doc/development/notifications.md b/docs/content/doc/development/notifications.md index 893ef03f..ca39a64d 100644 --- a/docs/content/doc/development/notifications.md +++ b/docs/content/doc/development/notifications.md @@ -110,4 +110,4 @@ If it was called, no mails are being sent and you can instead assert they have b ## Example -Take a look at the [pkg/user/notifications.go](https://code.vikunja.io/api/src/branch/master/pkg/user/notifications.go) file for a good example. +Take a look at the [pkg/user/notifications.go](https://code.vikunja.io/api/src/branch/main/pkg/user/notifications.go) file for a good example. diff --git a/docs/content/doc/setup/config.md b/docs/content/doc/setup/config.md index 8ab8a954..ed08631f 100644 --- a/docs/content/doc/setup/config.md +++ b/docs/content/doc/setup/config.md @@ -32,7 +32,7 @@ first: Vikunja supports using `toml`, `yaml`, `hcl`, `ini`, `json`, envfile, env variables and Java Properties files. We reccomend yaml or toml, but you're free to use whatever you want. -Vikunja provides a default [`config.yml`](https://kolaente.dev/vikunja/api/src/branch/master/config.yml.sample) file which you can use as a starting point. +Vikunja provides a default [`config.yml`](https://kolaente.dev/vikunja/api/src/branch/main/config.yml.sample) file which you can use as a starting point. # Config file locations @@ -46,7 +46,7 @@ Vikunja will search on various places for a config file: # Default configuration with explanations The following explains all possible config variables and their defaults. -You can find a full example configuration file in [here](https://code.vikunja.io/api/src/branch/master/config.yml.sample). +You can find a full example configuration file in [here](https://code.vikunja.io/api/src/branch/main/config.yml.sample). If you don't provide a value in your config file, their default will be used. @@ -55,7 +55,7 @@ If you don't provide a value in your config file, their default will be used. Most config variables are nested under some "higher-level" key. For example, the `interface` config variable is a child of the `service` key. -The docs below aim to reflect that leveling, but please also have a lookt at [the default config](https://code.vikunja.io/api/src/branch/master/config.yml.sample) file +The docs below aim to reflect that leveling, but please also have a lookt at [the default config](https://code.vikunja.io/api/src/branch/main/config.yml.sample) file to better grasp how the nesting looks like. diff --git a/docs/content/doc/setup/install-backend.md b/docs/content/doc/setup/install-backend.md index 7cb4687b..31c1df9e 100644 --- a/docs/content/doc/setup/install-backend.md +++ b/docs/content/doc/setup/install-backend.md @@ -28,7 +28,7 @@ wget ### Verify the GPG signature Starting with version `0.7`, all releases are signed using pgp. -Releases from `master` will always be signed. +Releases from `main` will always be signed. To validate the downloaded zip file use the signiture file `.asc` and the key `FF054DACD908493A`: