Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace mkdocs with sphinx/myst-parser for HTML documentation generation, documentation improvements #2025

Merged
merged 20 commits into from
Oct 15, 2023

Conversation

nodiscc
Copy link
Member

@nodiscc nodiscc commented Oct 5, 2023

- fixes shaarli#1451
- tools/.gitattributes: exclude doc/conf.py and doc/requirements.txt from zip exports
- tools/doc/sphinx: suppress myst.xref_missing warnings caused by executablebooks/MyST-Parser#564
- dockerfile: use makefile/sphinx instead of mkdocs to build HTML documentation
- dockerfile: add bash to the docs build container (make: bash: No such file or directory)
- tools/doc/readthedocs: force use of python 3.11 (readthedocs ERROR: No matching distribution found for sphinx==7.1.0)
- tools/doc/readthedocs: add all required configuration variables https://docs.readthedocs.io/en/latest/config-file/v2.html#build-os
- tools/doc/readthedocs: override build commands to allow the source directory to be different from the conf.py directory (https://docs.readthedocs.io/en/stable/config-file/v2.html#build-commands, readthedocs/readthedocs.org#1543)
- tools/doc/readthedocs: manually set output directory (readthedocs ERROR: No _readthedocs/html folder was created during this build.)
- doc: replace all references to mkdocs with sphinx
…lopment page

- add the Development page to the main TOC
- remove json syntax highlighting from invalid json block
- fix warning about unknown lexer `conf`
- fix syntax highlighting for example htaccess
- ref. shaarli#2002
- uses old instructions/mod-php instead of the now recommended php-fpm
- server configuration may not be the ideal page for this, installation would be more suitable
- remove apache 2.2 configuration (2.4 was released in 2012)
- checked with python -m sphinx -b linkcheck -c doc doc/md doc/linkcheck
@nodiscc nodiscc added enhancement cleanup code cleanup and refactoring documentation tools developer tools labels Oct 5, 2023
@nodiscc nodiscc added this to the 0.13.0 milestone Oct 5, 2023
@nodiscc nodiscc added the bug it's broken! label Oct 5, 2023
@nodiscc
Copy link
Member Author

nodiscc commented Oct 5, 2023

This also fixes readthedocs builds which started failing 2 days ago: https://readthedocs.org/projects/shaarli/builds/

Error

The configuration key "build.os" is required to build your documentation. Read more at https://docs.readthedocs.io/en/stable/config-file/v2.html#build-os

@nodiscc nodiscc merged commit ba21aa6 into shaarli:master Oct 15, 2023
8 checks passed
@nodiscc nodiscc deleted the doc-sphinx branch October 15, 2023 16:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug it's broken! cleanup code cleanup and refactoring documentation enhancement tools developer tools
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Switch to Sphinx/reCommonMark for HTML documentation generation
1 participant