diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3220d1ff..1d1ea8f6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,10 +2,10 @@ name: CI on: push: branches: - - master + - main pull_request: branches: - - master + - main jobs: lint: name: lint diff --git a/examples/seed/README.md b/examples/seed/README.md index f50dd215..fd0ebc7c 100644 --- a/examples/seed/README.md +++ b/examples/seed/README.md @@ -1,7 +1,7 @@ Trunk | Seed ============ -An example application demonstrating building a WASM web application using Trunk & Seed taken from: [Seed TodoMVC Example](https://github.com/seed-rs/seed/tree/master/examples/todomvc) +An example application demonstrating building a WASM web application using Trunk & Seed taken from: [Seed TodoMVC Example](https://github.com/seed-rs/seed/tree/main/examples/todomvc) Once you've installed Trunk, simply execute `trunk serve --open` from this example's directory, and you should see the web application rendered in your browser. diff --git a/site/content/_index.md b/site/content/_index.md index 88b81c9a..ab117ac4 100644 --- a/site/content/_index.md +++ b/site/content/_index.md @@ -121,7 +121,7 @@ That's not all! Trunk has even more useful features. Head on over to the followi # Contributing -Anyone and everyone is welcome to contribute! Please review the [CONTRIBUTING.md](https://github.com/trunk-rs/trunk/blob/master/CONTRIBUTING.md) document for more details. The best way to get started is to find an open issue, and then start hacking on implementing it. Letting other folks know that you are working on it, and sharing progress is a great approach. Open pull requests early and often, and please use GitHub's draft pull request feature. +Anyone and everyone is welcome to contribute! Please review the [CONTRIBUTING.md](https://github.com/trunk-rs/trunk/blob/main/CONTRIBUTING.md) document for more details. The best way to get started is to find an open issue, and then start hacking on implementing it. Letting other folks know that you are working on it, and sharing progress is a great approach. Open pull requests early and often, and please use GitHub's draft pull request feature. # License diff --git a/site/content/configuration.md b/site/content/configuration.md index 14b24df9..c4767f1f 100644 --- a/site/content/configuration.md +++ b/site/content/configuration.md @@ -7,7 +7,7 @@ weight = 2 Trunk supports a layered config system. At the base, a config file can encapsulate project specific defaults, paths, ports and other config. Environment variables can be used to overwrite config file values. Lastly, CLI arguments / options take final precedence. # Trunk.toml -Trunk supports an optional `Trunk.toml` config file. An example config file is included [in the Trunk repo](https://github.com/trunk-rs/trunk/blob/master/Trunk.toml), and shows all available config options along with their default values. By default, Trunk will look for a `Trunk.toml` config file in the current working directory. Trunk supports the global `--config` option to specify an alternative location for the file. +Trunk supports an optional `Trunk.toml` config file. An example config file is included [in the Trunk repo](https://github.com/trunk-rs/trunk/blob/main/Trunk.toml), and shows all available config options along with their default values. By default, Trunk will look for a `Trunk.toml` config file in the current working directory. Trunk supports the global `--config` option to specify an alternative location for the file. Note that any relative paths declared in a `Trunk.toml` file will be treated as being relative to the `Trunk.toml` file itself.