Skip to content

Conversation

@marmarek
Copy link
Member

@marmarek marmarek commented Jul 4, 2025

This is result of running https://github.com/maiska/qubes-translation-utilz/tree/main/md2rst on the documentation repo, developed by @maiska and @tokideveloper over last several months (years?). There is little sense in reviewing all the pages manually, but some selective sanity check could be useful.

It is now published at https://doc.qubes-os.org.

While restructuring qubes-doc repo, I'm merging also qubes-attachment repository into qubes-doc (or rather: importing files that are actually used here). The current approach with separate repos makes doc contribution with images very cumbersome, and since moving away from Trac several years ago there is no real reason for this split.

The conversion process is scripted, so it isn't big deal to re-run when needed (for example after merging some other PR in this repo), but I'd prefer to merge this soon anyway, to not diverge content too much. PRs that are currently open (if applicable) can be converted by the script on a side branch and then re-opened into RST version.

This replaces #1367

marmarek added 3 commits July 4, 2025 14:23
This is done using tools at
https://github.com/maiska/qubes-translation-utilz, commit
4c8e2a7f559fd37e29b51769ed1ab1c6cf92e00d.
Import only files used in the documentation (and their source files if
applicable).
Imported from https://github.com/QubesOS/qubes-attachment at
52bc8a22484236c5bd494707aafe32aa5e849950.
Manual fixes after the conversion tool. Mostly based on sphinx warnings.
marmarek and others added 7 commits July 5, 2025 20:26
This is plain rename without changing content, to help git track files
history.
Do not touch files that are going to be removed during conversion.

Thanks @parulin for the idea!
This is done using tools at
https://github.com/maiska/qubes-translation-utilz, commit
4c8e2a7f559fd37e29b51769ed1ab1c6cf92e00d.
Import only files used in the documentation (and their source files if
applicable).
Imported from https://github.com/QubesOS/qubes-attachment at
52bc8a22484236c5bd494707aafe32aa5e849950.
Manual fixes after the conversion tool. Mostly based on sphinx warnings.
parulin and others added 17 commits August 6, 2025 09:43
* Use dirhtml as default builder for readthedocs (clean URLs)
* The configuration variables are now sorted with respect to the Sphinx
  documentation
* Remove useless comments in conf.py
* Add new comments for each section, following Sphinx documentation
  order
* The code corresponding to videos have been moved from config to a
  dedicated extension.
* Use proper HTML theme options
* Exclude all files starting with `.`, `_` (sphinx convention)
* Use OpenSearch
* Avoid checking .onion domains.
* Do not download links to check anchors
RTD provides own CI service
Changing `bash` lexer to `console` because it is appropriate most of
the time. Then after a manual review, some lexer have been changed.

I used `text` each time I was unsure, and for prompt outputs.

The page `/developer/building/qubes-iso-building.rst` still need to be
reviewed (look for lines starting with `$ #`).

I'm not sure about the Windows pages, should we use
[doscon](https://pygments.org/docs/lexers/#pygments.lexers.shell.MSDOSSessionLexer)
or `powershell`?

Is there an appropriate lexer for `guid.conf` content?

**Statistics - Before**
    870 bash
      9 python
      9 c
      2 yaml

**Statistics - After**
    684 console
    111 text
     44 bash
     16 yaml
      9 systemd
      9 c
      8 python
      4 ini
      4 doscon
      2 markdown
      2 desktop
      1 xorg.conf
      1 xml+jinja
      1 xml
      1 kconfig
      1 html

This suggests that the default lexer should be `console`.
* Most of text blocks are in fact output blocks
* On qubes-iso-building.rst, try to get something correct for console
  lines starting with a comment
* Fixing a wrong :menuselection: item.

Statistics:

    685 console
     79 text
     44 bash
     35 output
     16 yaml
      9 systemd
      9 c
      8 python
      4 ini
      4 doscon
      2 markdown
      2 desktop
      1 xorg.conf
      1 xml+jinja
      1 xml
      1 kconfig
      1 html
All raw directives have been removed or replaced by reStructuredText
list-tables.
@marmarek marmarek merged commit 0bf8984 into main Sep 11, 2025
1 check passed
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.

7 participants