From 6fe90668986075708a7036b450a97c3486801c63 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Lallement Date: Fri, 3 Nov 2023 10:49:58 +0200 Subject: [PATCH] Update documentation framework --- docs/.custom_wordlist.txt | 98 +++++++++++++++++ docs/.gitignore | 3 +- docs/.sphinx/_static/furo_colors.css | 88 +++++++++++++++ docs/.sphinx/_static/github_issue_links.js | 8 ++ docs/.sphinx/_templates/base.html | 5 + docs/.sphinx/_templates/footer.html | 61 ++++++----- docs/.sphinx/requirements.txt | 17 +-- docs/.sphinx/spellingcheck.yaml | 2 + docs/.wordlist.txt | 119 ++++----------------- docs/Makefile | 76 ++++--------- docs/conf.py | 74 +++---------- docs/custom_conf.py | 52 +++++++-- 12 files changed, 345 insertions(+), 258 deletions(-) create mode 100644 docs/.custom_wordlist.txt create mode 100644 docs/.sphinx/_static/furo_colors.css diff --git a/docs/.custom_wordlist.txt b/docs/.custom_wordlist.txt new file mode 100644 index 000000000..0e2ad98dd --- /dev/null +++ b/docs/.custom_wordlist.txt @@ -0,0 +1,98 @@ +Acknowledgements +adml +ADML +admx +ADMX +adsys +ADSys +adsysctl +adsysd +adwatchd +apparmor +AppArmor +AppArmor's +autocompletion +autoenroll +autoenrollment +autoload +backend +backends +CAs +CEP +CES +changelog +compinit +config +constructiveCAs +CSR +dconf +dir +Dropdown +enrolment +erroring +executables +fpath +FQDN +GDM +GPL +GPO +gpolist +GPOs +GPT +GSettings +GVfs +html +https +idempotency +IIS +incrementation +incrementing +infos +ini +ip +Jira +kerberos +Kerberos +LDAP +lifecycle +LTS +MacOS +macOS +multiline +OpenLDAP +OU +OUs +polkit +powershell +PowerShell +readthedocs +runscripts +sss +sssd +SSSD +subcommands +subdirectory +subprofile +subprofiles +sudo +syntaxes +systemd +systemd's +sysvol +TDB +TODO +toolset +Transactional +txt +ubuntu +Unix +unmonitoring +unmount +unmounting +Unmounting +unticking +vendoring +Winbind +yaml +zsh +zshrc diff --git a/docs/.gitignore b/docs/.gitignore index c8f8ee69f..d261ebfc7 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -1,7 +1,8 @@ /*env*/ -.sphinx/venv +.sphinx/venv/ .sphinx/warnings.txt .sphinx/.wordlist.dic +.sphinx/.doctrees/ _build .DS_Store __pycache__ diff --git a/docs/.sphinx/_static/furo_colors.css b/docs/.sphinx/_static/furo_colors.css new file mode 100644 index 000000000..ffc36cbc8 --- /dev/null +++ b/docs/.sphinx/_static/furo_colors.css @@ -0,0 +1,88 @@ +body { + --color-code-background: #f8f8f8; + --color-code-foreground: black; + --font-stack: Ubuntu, -apple-system, Segoe UI, Roboto, Oxygen, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; + --font-stack--monospace: Ubuntu Mono, Consolas, Monaco, Courier, monospace; + --color-foreground-primary: #111; + --color-foreground-secondary: var(--color-foreground-primary); + --color-foreground-muted: #333; + --color-background-secondary: #FFF; + --color-background-hover: #f2f2f2; + --color-brand-primary: #111; + --color-brand-content: #06C; + --color-api-background: #cdcdcd; + --color-inline-code-background: rgba(0,0,0,.03); + --color-sidebar-link-text: #111; + --color-sidebar-item-background--current: #ebebeb; + --color-sidebar-item-background--hover: #f2f2f2; + --toc-font-size: var(--font-size--small); + --color-admonition-title-background--note: var(--color-background-primary); + --color-admonition-title-background--tip: var(--color-background-primary); + --color-admonition-title-background--important: var(--color-background-primary); + --color-admonition-title-background--caution: var(--color-background-primary); + --color-admonition-title--note: #24598F; + --color-admonition-title--tip: #24598F; + --color-admonition-title--important: #C7162B; + --color-admonition-title--caution: #F99B11; + --color-highlighted-background: #EbEbEb; + --color-link-underline: var(--color-background-primary); + --color-link-underline--hover: var(--color-background-primary); + --color-version-popup: #772953; +} + +@media not print { + body[data-theme="dark"] { + --color-code-background: #202020; + --color-code-foreground: #d0d0d0; + --color-foreground-secondary: var(--color-foreground-primary); + --color-foreground-muted: #CDCDCD; + --color-background-secondary: var(--color-background-primary); + --color-background-hover: #666; + --color-brand-primary: #fff; + --color-brand-content: #06C; + --color-sidebar-link-text: #f7f7f7; + --color-sidebar-item-background--current: #666; + --color-sidebar-item-background--hover: #333; + --color-admonition-background: transparent; + --color-admonition-title-background--note: var(--color-background-primary); + --color-admonition-title-background--tip: var(--color-background-primary); + --color-admonition-title-background--important: var(--color-background-primary); + --color-admonition-title-background--caution: var(--color-background-primary); + --color-admonition-title--note: #24598F; + --color-admonition-title--tip: #24598F; + --color-admonition-title--important: #C7162B; + --color-admonition-title--caution: #F99B11; + --color-highlighted-background: #666; + --color-link-underline: var(--color-background-primary); + --color-link-underline--hover: var(--color-background-primary); + --color-version-popup: #F29879; + } + @media (prefers-color-scheme: dark) { + body:not([data-theme="light"]) { + --color-code-background: #202020; + --color-code-foreground: #d0d0d0; + --color-foreground-secondary: var(--color-foreground-primary); + --color-foreground-muted: #CDCDCD; + --color-background-secondary: var(--color-background-primary); + --color-background-hover: #666; + --color-brand-primary: #fff; + --color-brand-content: #06C; + --color-sidebar-link-text: #f7f7f7; + --color-sidebar-item-background--current: #666; + --color-sidebar-item-background--hover: #333; + --color-admonition-background: transparent; + --color-admonition-title-background--note: var(--color-background-primary); + --color-admonition-title-background--tip: var(--color-background-primary); + --color-admonition-title-background--important: var(--color-background-primary); + --color-admonition-title-background--caution: var(--color-background-primary); + --color-admonition-title--note: #24598F; + --color-admonition-title--tip: #24598F; + --color-admonition-title--important: #C7162B; + --color-admonition-title--caution: #F99B11; + --color-highlighted-background: #666; + --color-link-underline: var(--color-background-primary); + --color-link-underline--hover: var(--color-background-primary); + --color-version-popup: #F29879; + } + } +} diff --git a/docs/.sphinx/_static/github_issue_links.js b/docs/.sphinx/_static/github_issue_links.js index 980609cd0..f0706038b 100644 --- a/docs/.sphinx/_static/github_issue_links.js +++ b/docs/.sphinx/_static/github_issue_links.js @@ -1,4 +1,12 @@ +// if we already have an onload function, save that one +var prev_handler = window.onload; + window.onload = function() { + // call the previous onload function + if (prev_handler) { + prev_handler(); + } + const link = document.createElement("a"); link.classList.add("muted-link"); link.classList.add("github-issue-link"); diff --git a/docs/.sphinx/_templates/base.html b/docs/.sphinx/_templates/base.html index 62ffe6b8c..33081547c 100644 --- a/docs/.sphinx/_templates/base.html +++ b/docs/.sphinx/_templates/base.html @@ -5,3 +5,8 @@ const github_url = "{{ github_url }}"; {% endblock theme_scripts %} + +{# ru-fu: don't include the color variables from the conf.py file, but use a + separate CSS file to save space #} +{% block theme_styles %} +{% endblock theme_styles %} diff --git a/docs/.sphinx/_templates/footer.html b/docs/.sphinx/_templates/footer.html index 759448687..f13cb6314 100644 --- a/docs/.sphinx/_templates/footer.html +++ b/docs/.sphinx/_templates/footer.html @@ -1,31 +1,40 @@ -{# ru-fu: copied from Furo, with modifications as stated below #} +{# ru-fu: copied from Furo, with modifications as stated below. Modifications are marked 'mod:'. #}