diff options
| -rw-r--r-- | .github/workflows/book.yml | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | askama/src/lib.rs | 2 | ||||
| -rw-r--r-- | book/src/integrations.md | 12 | ||||
| -rw-r--r-- | book/src/template_syntax.md | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml index 3ac7c9c..2df0a27 100644 --- a/.github/workflows/book.yml +++ b/.github/workflows/book.yml @@ -13,7 +13,7 @@ jobs: - run: mdbook build book - name: Deploy uses: peaceiris/actions-gh-pages@v3 - if: ${{ github.ref == 'refs/heads/master' }} + if: ${{ github.ref == 'refs/heads/main' }} with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./book/book @@ -97,4 +97,4 @@ You should now be able to compile and run this code. Review the [test cases] for more examples. -[test cases]: https://github.com/djc/askama/tree/master/testing +[test cases]: https://github.com/djc/askama/tree/main/testing diff --git a/askama/src/lib.rs b/askama/src/lib.rs index 3ae6c63..601fb16 100644 --- a/askama/src/lib.rs +++ b/askama/src/lib.rs @@ -5,7 +5,7 @@ //! in [`askama_derive`](https://crates.io/crates/askama_derive)). //! //! For feature highlights and a quick start, please review the -//! [README](https://github.com/djc/askama/blob/master/README.md). +//! [README](https://github.com/djc/askama/blob/main/README.md). //! //! The primary documentation for this crate now lives in //! [the book](https://djc.github.io/askama/). diff --git a/book/src/integrations.md b/book/src/integrations.md index 2d016c7..f717fe0 100644 --- a/book/src/integrations.md +++ b/book/src/integrations.md @@ -5,7 +5,7 @@ Enabling the `with-rocket` feature appends an implementation of Rocket's `Responder` trait for each template type. This makes it easy to trivially return a value of that type in a Rocket handler. See -[the example](https://github.com/djc/askama/blob/master/askama_rocket/tests/basic.rs) +[the example](https://github.com/djc/askama/blob/main/askama_rocket/tests/basic.rs) from the Askama test suite for more on how to integrate. In case a run-time error occurs during templating, a `500 Internal Server @@ -17,7 +17,7 @@ handled by your error catcher. Enabling the `with-iron` feature appends an implementation of Iron's `Modifier<Response>` trait for each template type. This makes it easy to trivially return a value of that type in an Iron handler. See -[the example](https://github.com/djc/askama/blob/master/askama_iron/tests/basic.rs) +[the example](https://github.com/djc/askama/blob/main/askama_iron/tests/basic.rs) from the Askama test suite for more on how to integrate. Note that Askama's generated `Modifier<Response>` implementation currently @@ -29,7 +29,7 @@ suggestion, please [file an issue](https://github.com/djc/askama/issues/new). Enabling the `with-actix-web` feature appends an implementation of Actix-web's `Responder` trait for each template type. This makes it easy to trivially return a value of that type in an Actix-web handler. See -[the example](https://github.com/djc/askama/blob/master/askama_actix/tests/basic.rs) +[the example](https://github.com/djc/askama/blob/main/askama_actix/tests/basic.rs) from the Askama test suite for more on how to integrate. ## Gotham integration @@ -37,7 +37,7 @@ from the Askama test suite for more on how to integrate. Enabling the `with-gotham` feature appends an implementation of Gotham's `IntoResponse` trait for each template type. This makes it easy to trivially return a value of that type in a Gotham handler. See -[the example](https://github.com/djc/askama/blob/master/askama_gotham/tests/basic.rs) +[the example](https://github.com/djc/askama/blob/main/askama_gotham/tests/basic.rs) from the Askama test suite for more on how to integrate. In case of a run-time error occurring during templating, the response will be of the same @@ -48,7 +48,7 @@ This preserves the response chain if any custom error handling needs to occur. Enabling the `with-warp` feature appends an implementation of Warp's `Reply` trait for each template type. This makes it simple to return a template from -a Warp filter. See [the example](https://github.com/djc/askama/blob/master/askama_warp/tests/warp.rs) +a Warp filter. See [the example](https://github.com/djc/askama/blob/main/askama_warp/tests/warp.rs) from the Askama test suite for more on how to integrate. ## Tide integration @@ -57,5 +57,5 @@ Enabling the `with-tide` feature appends `Into<tide::Response>` and `TryInto<tide::Body>` implementations for each template type. This provides the ability for tide apps to build a response directly from a template, or to append a templated body to an existing -`Response`. See [the example](https://github.com/djc/askama/blob/master/askama_tide/tests/tide.rs) +`Response`. See [the example](https://github.com/djc/askama/blob/main/askama_tide/tests/tide.rs) from the Askama test suite for more on how to integrate. diff --git a/book/src/template_syntax.md b/book/src/template_syntax.md index 6419140..3f89213 100644 --- a/book/src/template_syntax.md +++ b/book/src/template_syntax.md @@ -321,7 +321,7 @@ assert_eq!(t.render().unwrap(), "Section 1: A=a\nB=b") ``` See the example -[render in place](https://github.com/djc/askama/blob/master/testing/tests/render_in_place.rs) +[render in place](https://github.com/djc/askama/blob/main/testing/tests/render_in_place.rs) using a vector of templates in a for block. ## Comments |