Suggest#376
Conversation
rkratky
left a comment
There was a problem hiding this comment.
Thanks. LGTM. Just a bunch of nits. Pre-approving.
| ## NEW-VERSION | ||
|
|
||
| ### Changed | ||
|
|
||
| * `docs/reference/style-guide.rst` [97fcd55](https://github.com/canonical/sphinx-docs-starter-pack/commit/97fcd55c9e5d52b639a9490b6eaf30d213638ce8) -- Remove impossible warning | ||
| * `docs/reference/style-guide.rst` [edd848a](https://github.com/canonical/sphinx-docs-starter-pack/commit/edd848a24ef8781fe676e214456cb0c5d0089dec) -- Correct underline definition | ||
| * `docs/reference/style-guide.rst` [c8e71d7](https://github.com/canonical/sphinx-docs-starter-pack/commit/c8e71d7dea5964df42396d330e29fad501b97ca2) -- Only use admonitions advised by the style guide | ||
| * `docs/reference/style-guide.rst` [3ff16f2](https://github.com/canonical/sphinx-docs-starter-pack/commit/3ff16f2ac465907024d2a3c7d823e8ce1a9490ca) -- Add section on linking to Ubuntu man-pages | ||
| * `docs/reference/style-guide.rst` [5bda4da](https://github.com/canonical/sphinx-docs-starter-pack/commit/5bda4daa0943af153d9604da45be47bbccc1cda5) -- Add note about image output formats | ||
|
|
There was a problem hiding this comment.
| ## NEW-VERSION | |
| ### Changed | |
| * `docs/reference/style-guide.rst` [97fcd55](https://github.com/canonical/sphinx-docs-starter-pack/commit/97fcd55c9e5d52b639a9490b6eaf30d213638ce8) -- Remove impossible warning | |
| * `docs/reference/style-guide.rst` [edd848a](https://github.com/canonical/sphinx-docs-starter-pack/commit/edd848a24ef8781fe676e214456cb0c5d0089dec) -- Correct underline definition | |
| * `docs/reference/style-guide.rst` [c8e71d7](https://github.com/canonical/sphinx-docs-starter-pack/commit/c8e71d7dea5964df42396d330e29fad501b97ca2) -- Only use admonitions advised by the style guide | |
| * `docs/reference/style-guide.rst` [3ff16f2](https://github.com/canonical/sphinx-docs-starter-pack/commit/3ff16f2ac465907024d2a3c7d823e8ce1a9490ca) -- Add section on linking to Ubuntu man-pages | |
| * `docs/reference/style-guide.rst` [5bda4da](https://github.com/canonical/sphinx-docs-starter-pack/commit/5bda4daa0943af153d9604da45be47bbccc1cda5) -- Add note about image output formats |
I haven't figured out the best practice for this, but the changelog is not intended for documentation of the starter pack itself as it's used as a reference when updating starter pack versions. Adding a disclaimer in the file is also not that helpful if we want to minimise the output from that function... but maybe I should add something in here.
Anyway, this isn't necessary to add to this file as the changes are documentation based and aren't relevant for the use case of this file - documentation sets based on this repository upgrading versions.
There was a problem hiding this comment.
Ah, that makes sense -- I'll fix up my other PR (#373) in a bit too (removing the CHANGELOG bits in there)
There was a problem hiding this comment.
I've rebased to simply excise that commit
It's impossible to skip heading levels in reST (it's designed to avoid this as several of its output formats cannot skip levels either, due to recursive section structures).
reST permits heading underlines to be longer than the corresponding title, which some authors find convenient (i.e. it's fine to just use a full line of "=") https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html#sections
The general style guide at https://docs.ubuntu.com/styleguide/en advises under the admonitions section that only the "warning" and "information" admonition callouts are permitted. Given "information" doesn't exist in reST, "note" is probably the next best thing. Changed "caution" to "warning" and removed "tip" and "important".
Using * as the image extension allows sphinx to pick the "best" image format for the output it's producing. For example, PNG for web, but embedded PS for PDF.
Co-authored-by: Robert Krátký <robert.kratky@canonical.com>
* Simplify vale binary install (#375) * Simplify vale binary install * Use `vale --version` only to trigger binary download & install * Don't direct output to /dev/null to show potential problems * Update version --------- Co-authored-by: Michael Park <michael.park@canonical.com> * Suggest (#376) * Remove impossible warning It's impossible to skip heading levels in reST (it's designed to avoid this as several of its output formats cannot skip levels either, due to recursive section structures). * Correct underline definition reST permits heading underlines to be longer than the corresponding title, which some authors find convenient (i.e. it's fine to just use a full line of "=") https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html#sections * Only use admonitions advised by the style guide The general style guide at https://docs.ubuntu.com/styleguide/en advises under the admonitions section that only the "warning" and "information" admonition callouts are permitted. Given "information" doesn't exist in reST, "note" is probably the next best thing. Changed "caution" to "warning" and removed "tip" and "important". * Add a section on linking to the Ubuntu man-pages * Add note about image output formats Using * as the image extension allows sphinx to pick the "best" image format for the output it's producing. For example, PNG for web, but embedded PS for PDF. * Fix md inclusion example * Apply rkratky's suggestions from code review Co-authored-by: Robert Krátký <robert.kratky@canonical.com> --------- Co-authored-by: Robert Krátký <robert.kratky@canonical.com> * Fix: Update related links header in MyST and RST style guides (#382) * Doc: add instructions for configuring PDF output (#381) * Doc: add instructions for configuring PDF build - explain latex_documents and how to change the Sphinx configurations - introduce methods for overriding LaTeX templates from the extension * fix: spelling * fix: spelling wordlist * use inclusive words * add notes about format of latex_additional_files * fix: spelling check * improve update logic (#386) * run update only when version increases * add changelog entry * Update and rename README.rst to README.md (#387) Changed README format to markdown for correct rendering in the GitHub UI. Updated the Structure section. * Switch the recommendation to Sphinx design tabs (#383) * feat: adds sphinx sitemap support (#389) * docs: update toctree reference * feat: add sitemap support * docs: add changelog entry and bump version * Update docs/how-to/set-up-sitemaps.rst Co-authored-by: tang-mm <3333407+tang-mm@users.noreply.github.com> * feat: update sitemap documentation * fix: spelling * Update docs/how-to/set-up-sitemaps.rst * fix: formatting * docs: add link to sitemap config from docs * Update docs/conf.py --------- Co-authored-by: tang-mm <3333407+tang-mm@users.noreply.github.com> * fix: RTD versioned sitemaps (#392) * docs: update toctree reference * feat: add sitemap support * docs: add changelog entry and bump version * Update docs/how-to/set-up-sitemaps.rst Co-authored-by: tang-mm <3333407+tang-mm@users.noreply.github.com> * feat: update sitemap documentation * fix: spelling * Update docs/how-to/set-up-sitemaps.rst * fix: formatting * docs: add link to sitemap config from docs * Update docs/conf.py * Update set-up-sitemaps.rst * Update conf.py * fix: RTD versioned sitemaps --------- Co-authored-by: tang-mm <3333407+tang-mm@users.noreply.github.com> * fix: sitemap (#393) * fix: doc link * fix: remove outdated comment from conf.py * docs: Clarify instructions for sitemaps (#395) * Clarify instructions for sitemaps * fix spelling error * Update docs/how-to/set-up-sitemaps.rst * docs: add guidance about `dirhtml` for sitemaps (#399) Add guidance that instructs the developer to switch to the `dirhtml` builder if necessary. Certain old projects might still be using the `html` builder, which causes sitemap links to be malformed. * conf: drop spurious `ast` import (#398) * fix: branch name in update script (#397) * fix: branch name in update script * update changelog * fix: remove references to obsolete content directory under docs (#400) * docs: clarify instructions for initial setup guide (#401) * docs: add lastmod configuration for sphinx-sitemap (#404) * feat: lastmod in sitemap * fix: spelling * Apply suggestions from code review Co-authored-by: Dave Wilding <tech@dpw.me> --------- Co-authored-by: Dave Wilding <tech@dpw.me> * Add GitHub workflow for checking Contributor Licence Agreement (#403) * add workflow for checking CLA * add CLA requirement to readme * feat: Optimize the Makefile (#388) * Update Makefile Per @desrod's suggestion: Small changes to group .PHONY targets logically together and introduce proper, recursive ${MAKE} instead of statically calling 'make' each time through. More to time! * Update CHANGELOG.md Add changes regarding Makefile logic * feat: improve markdown linting workflow (#379) * fix: markdown linting workflow * fix(ci): match all mardown documents Co-authored-by: Jeremie Deray <deray.jeremie@gmail.com> * fix: switch to pymarkdownlnt --------- Co-authored-by: Jeremie Deray <deray.jeremie@gmail.com> Co-authored-by: Michael Park <michael.park@canonical.com> * feat: Python3 venv detection (#384) * docs/Makefile: do implicit venv support detection Opportunistically try to create the venv and if it fails, hint the user to install `python3-venv`. This avoids spawning another python3 process just for the detection. Signed-off-by: Simon Deziel <simon.deziel@canonical.com> * docs/Makefile: avoid `'` in comments Signed-off-by: Simon Deziel <simon.deziel@canonical.com> * docs/Makefile: prefer `command -v` to `type` Both are shell builtins but `type` is more for human and `command -v` for shell: ``` $ command -v python3; echo $? /usr/bin/python3 0 $ command -v python4; echo $? 1 ``` ``` $ type python3; echo $? python3 is /usr/bin/python3 0 $ type python4; echo $? bash: type: python4: not found 1 ``` Also, `command -v` does not emit anything on `stderr`, it just reflect the availability with its exit code. Signed-off-by: Simon Deziel <simon.deziel@canonical.com> --------- Signed-off-by: Simon Deziel <simon.deziel@canonical.com> * refactor: reference an existing variable (#409) * docs: improve header customisation instructions (#406) Signed-off-by: Minae Lee <minae.lee@canonical.com> * Remove confusing statement on sitemap config (#414) * Update set-up-automated-testing.rst (#415) * Update set-up-automated-testing.rst * Update set-up-automated-testing.rst * Update .custom_wordlist.txt * 1.2.0 release, tidy, and change to vale for spelling (#410) * feat: replace spelling check with vale * chore: pin canonical-sphinx version to 0.5.0 release * chore: remove unnecessary files * chore: bump version * chore: change style guide repo address * docs: clarify syntax guides * docs: document vale exceptions and new spelling config * feat: add URL removal check * chore: remove wordlist * chore: update changelog * fix: linting and checks * fix: linting, spelling * fix: removes URL check * docs: sitemap exceptions * test: correct repo for URL removal check * docs: updates changelog * fix: adds redirect for removed URLs * fix(check-removed-urls): use the pull request base repo for the base … (#1) * fix(check-removed-urls): use the pull request base repo for the base branch * fix: use the full name and not the object * docs: syntax guide reference * chore: remove comment * chore: word additions for vale style linting * chore: unpin canonical-sphinx * Apply suggestions from code review Co-authored-by: Dave Wilding <tech@dpw.me> * Update contributing.rst * Apply suggestions from code review Co-authored-by: Michael DuBelko <michael.dubelko@gmail.com> * docs: add prompt to redirect removed pages in check * chore: remove spellcheck install * feat: keep alternate spellcheck command to warn of deprecation * fix: makefile backticks fix Co-authored-by: tang-mm <3333407+tang-mm@users.noreply.github.com> --------- Co-authored-by: Guillaume Beuzeboc <guillaume.beuzeboc@gmail.com> Co-authored-by: Dave Wilding <tech@dpw.me> Co-authored-by: Michael DuBelko <michael.dubelko@gmail.com> Co-authored-by: tang-mm <3333407+tang-mm@users.noreply.github.com> * Update woke prereqs in automatic checks doc (#416) * docs: update automatic_checks.rst * fix: update automatic_checks.rst remove woke prereqs * fix: update automatic_checks.rst make list distinction more clear * fix: update automatic_checks.rst fix code block formatting * fix: update automatic_checks.rst punctuation * fix: update docs/reference/automatic_checks.rst typo Co-authored-by: Sara <sara.feijoo@canonical.com> * fix: include suggestions to pr for automatic_checks.rst --------- Co-authored-by: Sara <sara.feijoo@canonical.com> --------- Signed-off-by: Simon Deziel <simon.deziel@canonical.com> Signed-off-by: Minae Lee <minae.lee@canonical.com> Co-authored-by: Robert Krátký <rkratky@gmail.com> Co-authored-by: Dave Jones <dave@waveform.org.uk> Co-authored-by: Robert Krátký <robert.kratky@canonical.com> Co-authored-by: tang-mm <3333407+tang-mm@users.noreply.github.com> Co-authored-by: Artem Konev <141050460+akcano@users.noreply.github.com> Co-authored-by: Andreia <andreia.velasco@canonical.com> Co-authored-by: Marek Suchánek <marek.suchanek@protonmail.com> Co-authored-by: Sally <sally.makin@canonical.com> Co-authored-by: Michael DuBelko <michael.dubelko@canonical.com> Co-authored-by: Michał Sawicz <michal@sawicz.net> Co-authored-by: Dave Wilding <david.wilding@canonical.com> Co-authored-by: Dave Wilding <tech@dpw.me> Co-authored-by: JordanMG13 <91559220+JordanMG13@users.noreply.github.com> Co-authored-by: Stephen Mwangi <mail@stephenmwangi.com> Co-authored-by: Jeremie Deray <deray.jeremie@gmail.com> Co-authored-by: Simon Deziel <simon.deziel@canonical.com> Co-authored-by: Charles Uneze <charlesniklaus@gmail.com> Co-authored-by: Minae Lee <minae.lee@canonical.com> Co-authored-by: Erin Conley <erin.conley@canonical.com> Co-authored-by: Guillaume Beuzeboc <guillaume.beuzeboc@gmail.com> Co-authored-by: Michael DuBelko <michael.dubelko@gmail.com> Co-authored-by: Ashley Cliff <ashley.cliff@canonical.com> Co-authored-by: Sara <sara.feijoo@canonical.com>
Some suggestions for the reST documentation. Each commit is a separate suggestion; if any aren't desirable, I'm happy to rebase and remove them!
(cherry-picked from the archived canonical/sphinx-docs-guide#25 as suggested in that PR)
CHANGELOG.mdwith relevant non-documentation file changes?