Skip to content

chore(merge): dev into main#534

Merged
medubelko merged 17 commits into
mainfrom
merge/dev
Feb 20, 2026
Merged

chore(merge): dev into main#534
medubelko merged 17 commits into
mainfrom
merge/dev

Conversation

@medubelko

Copy link
Copy Markdown
Collaborator

The main work prior to dismissing the dev branch.

Additional commits are to correct the docs and changelog.


  • Have you updated CHANGELOG.md with relevant non-documentation file changes?
  • Have you updated the documentation for this change?

akcano and others added 16 commits November 17, 2025 13:59
- Switch doc links to `stable` slug.
- In Makefile, don't init `SOURCEDIR` and `VENVDIR` variables if they already exist at run time. This lets projects override these dirs in parent build scripts.
* fix: remove redundancy in sitemap_url_scheme

PR #462 introduced fetching the canonical URL from a RTD environment
variable. In versioned docs, this URL includes the version, which means
that the previous logic to set the sitemap_url_scheme is no longer
necessary and duplicates the version (e.g., "../latest/latest/.."). This
fix removes the duplication.

Since the html_baseurl value falls back to "/", there is also no need
to set a separate sitemap_url_scheme for local builds.

* doc: update sitemaps how-to guide and changelog

Updates sitemaps how-to guide to reflect changes to how html_baseurl is generated and sitemap_url_scheme is set. Updates changelog to reflect removal of duplicate version strings in sitemaps.

Signed-off-by: Minae Lee <minae.lee@canonical.com>
chore: update dev with latest release
`VALEDIR` represents the package directory for Vale, yet it re-establishes the same path as `VENVDIR`. It makes more sense to compose it from `VENVDIR`.

Furthermore, since `VENVDIR` is configurable by the calling environment, it stands to reason that `VALEDIR` should be, too.
The site https://canonical-example-product-documentation.readthedocs-hosted.com/
was recently deleted. This commit removes all links and references to that site.
It also updates its use in demonstrating intersphinx use in the documentation
with example syntax instead of a real link to protect against future link rot.

Note that the deleted site has been temporarily re-created to prevent build
failures from numerous sites that link to it. However, this is only a temporarily
measure and those sites should also update their links to avoid future issues.

Signed-off-by: Minae Lee <minae.lee@canonical.com>
The build environment has several variables with popular names such as
`BUILDDIR` and `SOURCEDIR`. These can confuse developers of projects
where the docs aren't at the root, and could collide with their root
build systems.

- Remove old var names.
- Make variables more consistent:
  - `DOCS_` for vars specific to the docs build.
  - `<tool>_` for tool-specific vars, such as `VALE_DIR`.
- Reorganise the list of vars.

This further helps projects that call the Makefile from a root build system.
* ci: revert change to reusable workflow

* docs: add documentation-checks input reference
Fixes #470.

---------

Co-authored-by: Dave Wilding <tech@dpw.me>
@medubelko

Copy link
Copy Markdown
Collaborator Author

Pinging @jahn-junior and @minaelee to have a look. :)

@minaelee minaelee left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you!

@minaelee minaelee self-requested a review February 20, 2026 00:11
Comment thread docs/Makefile Outdated
@medubelko

Copy link
Copy Markdown
Collaborator Author

Needs a rebase now.

@jahn-junior jahn-junior left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks!

@minaelee minaelee left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re-requested my own review because I became concerned about the linter failures. Then I realized that the #508 fix in main should resolve it, so nvm! The linkcheck failure should also resolve in main, and the CLA check is just an intermittent issue. LGTM again :)

@medubelko

medubelko commented Feb 20, 2026

Copy link
Copy Markdown
Collaborator Author

The linkcheck failure should also resolve in main

That will be incorporated when I rebase. :)

@medubelko medubelko force-pushed the merge/dev branch 2 times, most recently from 3ce7055 to d2256dc Compare February 20, 2026 01:20
@medubelko medubelko merged commit dcf9f50 into main Feb 20, 2026
8 of 9 checks passed
@medubelko medubelko deleted the merge/dev branch February 20, 2026 01:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants