diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cb05aa87e..e6ad6a5cd 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,7 +1,7 @@ name: Deploy on: push: - branches: [master] + branches: [main] jobs: docs: diff --git a/README.md b/README.md index f82ad79d7..ccede76ff 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ A clean customizable theme for Sphinx.

- Demo image + Demo image ## Quickstart diff --git a/docs/contributing/index.md b/docs/contributing/index.md index 7964ced01..3380e7216 100644 --- a/docs/contributing/index.md +++ b/docs/contributing/index.md @@ -23,4 +23,4 @@ design-goals [Design Goals](./design-goals) : Describes the priorities for this theme's design. -[code of conduct]: https://github.com/pradyunsg/furo/blob/master/CODE_OF_CONDUCT.md +[code of conduct]: https://github.com/pradyunsg/furo/blob/main/CODE_OF_CONDUCT.md diff --git a/docs/customisation/index.md b/docs/customisation/index.md index 964dc6646..ac6f52d72 100644 --- a/docs/customisation/index.md +++ b/docs/customisation/index.md @@ -67,6 +67,6 @@ If you want more control than what is provided by the above theme options, you c ReadTheDocs has an excellent explanation on [how to add custom CSS files][sphinx-custom-css] to Sphinx-based documentation. [css-variables]: https://developer.mozilla.org/en-US/docs/Web/CSS/Using_CSS_custom_properties -[sphinx-html-theme-options]: https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-html_theme_options +[sphinx-html-theme-options]: https://www.sphinx-doc.org/en/main/usage/configuration.html#confval-html_theme_options [sphinx-custom-css]: https://docs.readthedocs.io/en/stable/guides/adding-custom-css.html -[sphinx-file-wide-metadata]: https://www.sphinx-doc.org/en/master/usage/restructuredtext/field-lists.html#metadata +[sphinx-file-wide-metadata]: https://www.sphinx-doc.org/en/main/usage/restructuredtext/field-lists.html#metadata diff --git a/docs/customisation/landing-page.md b/docs/customisation/landing-page.md index 97b8fe3c4..fc05373de 100644 --- a/docs/customisation/landing-page.md +++ b/docs/customisation/landing-page.md @@ -15,4 +15,4 @@ You'll need to write HTML for the page in `_templates/your-custom-landing-page.h In case you're curious, this works because Sphinx allows overwriting existing files when generating the website and processes `html_additional_pages` _after_ processing the pages normally. These two behaviours combined mean that we can overwrite the page generated with the default layout by specifying the same document with a different template in `html_additional_pages`. -[additional-pages]: https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-html_additional_pages +[additional-pages]: https://www.sphinx-doc.org/en/main/usage/configuration.html#confval-html_additional_pages diff --git a/docs/customisation/logo.md b/docs/customisation/logo.md index 37403e129..3c6512250 100644 --- a/docs/customisation/logo.md +++ b/docs/customisation/logo.md @@ -8,4 +8,4 @@ html_logo = "logo.png" It is also possible to [hide the name of the project in the sidebar](customisation/index.md#sidebar_hide_name), which might be desirable if the logo contains the project name. -[sphinx-html_logo]: https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-html_logo +[sphinx-html_logo]: https://www.sphinx-doc.org/en/main/usage/configuration.html#confval-html_logo diff --git a/docs/customisation/toc.md b/docs/customisation/toc.md index 80cde060b..a28603ae7 100644 --- a/docs/customisation/toc.md +++ b/docs/customisation/toc.md @@ -23,4 +23,4 @@ hide-toc: true ``` ```` -[sphinx-file-wide-metadata]: https://www.sphinx-doc.org/en/master/usage/restructuredtext/field-lists.html#metadata +[sphinx-file-wide-metadata]: https://www.sphinx-doc.org/en/main/usage/restructuredtext/field-lists.html#metadata diff --git a/noxfile.py b/noxfile.py index d96893b0e..8a875ea91 100644 --- a/noxfile.py +++ b/noxfile.py @@ -123,7 +123,7 @@ def release(session): session.run("release-helper", "version-check-validity", next_version) session.run("release-helper", "directory-check-empty", "dist") - session.run("release-helper", "git-check-branch", "master") + session.run("release-helper", "git-check-branch", "main") session.run("release-helper", "git-check-clean") session.run("release-helper", "git-check-tag", release_version, "--does-not-exist") session.run("release-helper", "git-check-remote", "origin", *allowed_upstreams) @@ -154,7 +154,7 @@ def release(session): session.run("git", "commit", "-m", "Back to development", external=True) # Push the commits and tag. - session.run("git", "push", "origin", "master", release_version, external=True) + session.run("git", "push", "origin", "main", release_version, external=True) # Upload the distributions. session.run("twine", "upload", *glob.glob("dist/*"))