-
-
Notifications
You must be signed in to change notification settings - Fork 483
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
Convert all the documentation to Sphinx / RST #1367
base: main
Are you sure you want to change the base?
Conversation
Actually, the current (github pages) doc index still points at the qubes-community github org. So, technically the rst index linking to qubes-community is not a regression, and can be fixed in a followup PR. I'd prefer it this way, to not block this huge conversion any longer. |
aabf0f9
to
0324e69
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- I went through all options on https://docs.readthedocs.io/en/stable/config-file/v2.html and consider the configuration file
.readthedocs.yaml
fine. - I don't know how the file
requirements.txt
has been written but I guess it has happened via something likepip freeze > requirements.txt
. - The files
README.md
andCONTRIBUTING.md
have been deleted without a replacement. I'm not sure whether a replacement is needed or not. - I checked the file
conf.py
, see my comments there. - I did not check the files of the converted documentation.
- In general, a new run of converting the files to RST is needed. After that, I will re-review the files ASAP.
conf.py
Outdated
source_suffix = { | ||
'.rst': 'restructuredtext', | ||
} | ||
templates_path = ['_templates'] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
there is no file nor directory named _templates
'visitedlinkcolor': '#7b7b7b', | ||
'bodyfont': '"Open Sans", Arial, sans-serif', | ||
'codebgcolor': '$color-qube-light', | ||
'codebgcolor': 'grey', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
codebgcolor
is set twice
|
||
|
||
locale_dirs = ['_translated'] | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- the option
nitpicky = True
could be useful, I think - the option
language = 'en'
could be set explicitly
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the option
language = 'en'
could be set explicitly
Won't that interfere with language set in readthedocs?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the option
language = 'en'
could be set explicitlyWon't that interfere with language set in readthedocs?
I don't know. In the last minutes, I tried to find an answer on the Internet but without success. However, since language
defaults to en
, we can omit it.
Thanks for checking @tokideveloper ! |
Import only files used in the documentation (and their source files if applicable). Based on c3f45c81842d6c5df064fce385b464b4041b3b62 in qubes-attachment repo.
Manual fixes after the conversion tool.
Not only comment them, really remove.
Updated |
Will there be an announcement about the migration to ReadTheDocs and ReST? Concerning ReST, essentially the documentation style guide needs to be edited. |
Sure, we can make an announcement about it. Are we close to launch? |
I would say yes but I want to wait for this weekend (probably within 30 hours). When everything goes fine I will tell you here. Immediately afterwards the announcement can come and then let's say 3 days until launch? Just to see the reactions beforehand. Hope that the Markdown version on |
You want to announce it before it's live in order to see people's reactions beforehand? Are you thinking that people will somehow figure out how to preview it themselves and effectively beta test it so that we can abort the launch if there are big problems? The problem is that we will have already announced it by that point, so it will kind of be too late. If we're afraid that testing might reveal big problems, we should just have some kind of designated testing period first. |
I never thought about users being beta testers for the documentation. I'm just curious to see how people react when they know what's coming just based on the description. But maybe it's pointless and probably stupid the more I think about it. I'm sorry for my bad idea! However, an announcement itself would be fine IMHO. I'll let you know when it's time for it. Thank you! |
@marmarek wrote:
I thought that, too, but now, I started reviewing all the pages manually by comparing the rendered Markdown pages and the rendered ReST pages side by side and I've found a lot of errors (and I'm not done yet). This includes:
I'm making a list of all those errors and will correct them afterwards. |
^^^^^^^^^^^^^^^^^ | ||
|
||
:caption: Troubleshooting | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
QA: in the original index the order is as follows here under Security in Qubes section:
Multi-factor Login
CTAP proxy
index.rst
Outdated
Core documentation for Qubes developers and advanced users. | ||
|
||
General | ||
^^^^^^^ | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The section name in the oirignal is General not Developers - General. if the section is named _general? similar to the rest subsections in the Developer Documentation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is intentional, so the TOC on the left is clearer, otherwise it easy to miss which sections belong to developers and which to users documentation.
index.rst
Outdated
Unofficial, third-party documentation from the Qubes community and | ||
others. | ||
|
||
Operating System Guides | ||
^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The same for the subsection to the External Documentation as in the comment about the Developer Documentaion
These are errors I've found so far (sorry for writing it in German): https://qubes-doc-rst.readthedocs.io/en/latest/introduction/intro.html
https://qubes-doc-rst.readthedocs.io/en/latest/introduction/screenshots.html
https://qubes-doc-rst.readthedocs.io/en/latest/introduction/getting-started.html
https://qubes-doc-rst.readthedocs.io/en/latest/introduction/faq.html
https://qubes-doc-rst.readthedocs.io/en/latest/introduction/issue-tracking.html
https://qubes-doc-rst.readthedocs.io/en/latest/introduction/support.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/hardware/system-requirements.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/hardware/certified-hardware.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/downloading-installing-upgrading/testing.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/how-to-guides/how-to-update.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/how-to-guides/backup-emergency-restore-v3.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/how-to-guides/backup-emergency-restore-v4.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/how-to-guides/how-to-copy-from-dom0.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/how-to-guides/how-to-install-software.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/how-to-guides/how-to-use-disposables.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/how-to-guides/how-to-use-devices.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/how-to-guides/how-to-use-usb-devices.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/how-to-guides/how-to-use-pci-devices.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/how-to-guides/how-to-reinstall-a-template.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/templates/minimal-templates.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/templates/templates.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/templates/fedora/fedora-upgrade.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/templates/debian/debian-upgrade.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/templates/windows/windows-qubes-4-1.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/templates/windows/qubes-windows-tools-4-1.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/templates/windows/migrate-to-4-1.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/security-in-qubes/firewall.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/security-in-qubes/data-leaks.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/security-in-qubes/vm-sudo.html
EDIT: markers added EDIT 2: checkboxes added |
The previous post is especially for @maiska 🙂 |
Ah, I see. I guess it depends on how detailed of a description you have in mind, but we've already been telling people that the migration to RtD is coming for over a year now, so there have already been lots of reactions (e.g., on the forum and mailing lists).
Not at all! I just wasn't quite sure what you had in mind. Sorry if my remarks came across negatively. I think it's good that you highlighted the importance of getting feedback from our real userbase. The more I think about it, the more I think that a public testing period (where we ask people to test https://qubes-doc-rst.readthedocs.io/, for example) would be a good idea and might help the transition to go a lot smoother. People will inevitably discover and point out lots of problems that we'll have to fix, and it'd be a lot better to have that happen during a testing period than after launching the live, stable version. However, I'm not sure if we have the bandwidth to support that, and I wouldn't want to delay things even further. (@marmarek, do you have thoughts on this?)
Sounds good. :) |
@tokideveloper thanks for the review! I think the best approach to fix those issues is to separate them into following categories:
The first one IMO best to fix in the markdown version (like I did at 7598bbe) |
@andrewdavidwong wrote:
Ah, okay, I didn't read them yet.
Often, I tell only half of my thoughts, not knowing that the other half is important, too. This often causes misunderstandings. I'm sorry for that. For me, your remarks came across indeed a little bit negatively but that's not a reason for me not to reply in a professional way. 🙂
Sounds good! However, we should correct the obvious problems first. Afterwards, the people may take a look and list problems they find (or open PRs for them). I'm not sure whether PR-ing new content should be allowed at this stage. |
@marmarek wrote:
No problem. However, I'm not done yet. ;-)
Good idea! I can try to assign the issues to these categories by just guessing and hope that's the correct category for each one. We'll see … |
I'm done. Other issues I've found: https://qubes-doc-rst.readthedocs.io/en/latest/user/security-in-qubes/split-gpg.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/security-in-qubes/mfa.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/volume-backup-revert.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/standalones-and-hvms.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/config-files.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/secondary-storage.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/rpc-policy.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/usb-qubes.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/managing-vm-kernels.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/salt.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/gui-domain.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/disposable-customization.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/bind-dirs.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/gui-configuration.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/resize-disk-image.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/qubes-service.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/mount-from-other-os.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/kde.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/i3.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/advanced-topics/awesomewm.html
https://qubes-doc-rst.readthedocs.io/en/latest/developer/general/gsoc.html
https://qubes-doc-rst.readthedocs.io/en/latest/
https://qubes-doc-rst.readthedocs.io/en/latest/developer/general/usability-ux.html
https://qubes-doc-rst.readthedocs.io/en/latest/developer/code/source-code.html
https://qubes-doc-rst.readthedocs.io/en/latest/developer/code/code-signing.html
https://qubes-doc-rst.readthedocs.io/en/latest/developer/services/qrexec2.html
https://qubes-doc-rst.readthedocs.io/en/latest/developer/services/qrexec-internals.html
https://qubes-doc-rst.readthedocs.io/en/latest/developer/services/qrexec-socket-services.html
https://qubes-doc-rst.readthedocs.io/en/latest/developer/services/admin-api.html
https://qubes-doc-rst.readthedocs.io/en/latest/developer/services/admin-api.html
https://qubes-doc-rst.readthedocs.io/en/latest/developer/debugging/automated-tests.html
https://qubes-doc-rst.readthedocs.io/en/latest/developer/debugging/vm-interface.html
https://qubes-doc-rst.readthedocs.io/en/latest/developer/building/qubes-builder.html
https://qubes-doc-rst.readthedocs.io/en/latest/developer/building/qubes-builder-details.html
https://qubes-doc-rst.readthedocs.io/en/latest/developer/building/qubes-iso-building.html
https://qubes-doc-rst.readthedocs.io/en/latest/developer/releases/version-scheme.html
EDIT: checkboxes added |
Here is the legend for the listed issues:
|
@tokideveloper and me are going to proceed with reviewing next weekend. FYI |
On Sun, May 26, 2024 at 07:04:08AM -0700, m wrote:
@tokideveloper and me are going to proceed with reviewing next weekend. FYI
This is excellent.
Possible steps to progress would be:
1. rerun the conversion after incorporating any errors found.
2. Freeze docs.
3. Post announcement about existence of RTD and invite comments, and further
"eyes on" testing and review, for a set period. (2-4 weeks?)
4. Incorporate any errors found, rerun conversion, and post final RTD version.
5. Forward existing pages to RTD
Thoughts?
|
I don't think this should be a full announcement on the website (this should be only for the actual switch when finally done), but maybe a mailing list post and a forum post (in the testing category)? I mean, the target audience here would be testers and contributors, not really all users (yet).
FYI for this part there is QubesOS/qubesos.github.io#243. I did not updated it this time, but the conversion tool can also generate this one, so it's just a matter of re-running it. |
On Mon, May 27, 2024 at 04:49:43AM -0700, Marek Marczykowski-Górecki wrote:
I don't think this should be a full announcement on the website (this should be only for the actual switch when finally done), but maybe a mailing list post and a forum post (in the testing category)? I mean, the target audience here would be testers and contributors, not really all users (yet).
This was what I had originally drafted - I think that post should not be
restricted to "testers", and there will be users who watch web site bit
not Forum.
FYI for this part there is QubesOS/qubesos.github.io#243. I did not updated it this time, but the conversion tool can also generate this one, so it's just a matter of re-running it.
[/quote]
Yes, I saw that. It's a step to take, not an added process.
And we should add:
6. Make full new announcement
|
I think the bar for testing a website is a lot lower than for testing a Qubes OS release candidate, for example. Clicking around a website is low risk and doesn't require as much technical sophistication. I think it would be fine to announce the testing in a more general forum category (in addition to qubes-devel and qubes-users), but I agree with not doing a full announcement yet.
Does this mean forwarding to someplace on the readthedocs.io domain? Because my understanding is that the readthedocs.io domain is being used only for testing, whereas the final new documentation will live at https://doc.qubes-os.org/ (as mentioned in QubesOS/qubesos.github.io#243). Just making sure everyone is on the same page.
Thanks! I've updated QubesOS/qubes-issues#8180 and added a version of this checklist there. |
I missed some files. This should be the rest:
https://qubes-doc-rst.readthedocs.io/en/latest/user/security-in-qubes/firewall_4.1.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/templates/windows/qubes-windows-tools-4-0.html
https://qubes-doc-rst.readthedocs.io/en/latest/user/templates/windows/windows-qubes-4-0.html
|
see https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html. It is either bold or italic. Better bold imho
fixed that in the fork
|
|
|
Hello all, all the markdown changes in qubes-doc that relate somewhat to the rst conversion are in this pull request: I updated config, some code to fix different minor errors in the repo: https://github.com/maiska/qubes-translation-utilz Ran the script on the current qubes-doc main state and the result is here: https://github.com/maiska/qubes-doc.rtd/tree/rtd-deploy-test and deployed here: https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-test/ Also ran the script on the incorporated changes to be seen in the PR from above and the result is here: https://github.com/maiska/qubes-doc.rtd/tree/rtd-deploy-pr and deployed here: https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/ If you have the time @tokideveloper please feel free to go over the deployed version before @marmarek could run it on his rst2 branch and deploy. @unman If you find some time perhaps you could go over the pull request: #1418 ? . I tested locally, meaning jekyll build was ok, but did not spend time looking for errors, just that is up and looks good. |
Thank you for your work, @maiska! I'm not sure which Markdown version to compare with which RST version since you put links to two deployed versions (in sum after an edit) in your post. So, which deployed version do you mean (link)? So, just by guessing, I started to compare https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/ with https://www.qubes-os.org/doc/ since it seems to be the newest version (incorporated Markdown stuff). But I found that the pictures are missing (see the introduction and screenshots pages). @maiska, could you please deploy a pictured version? That would be great! Meanwhile, I'll continue comparing. Please stop me if I'm comparing the wrong RST version. ;-) Thanks! |
Now, I compared the docs on https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/ with the docs on https://www.qubes-os.org/doc/ and this is the result. For the sake of simplicity, I'll write all issues down that I found. In general, section titles (like "Introduction" and "User Documentation") are missing on the TOC on the left side. See here for a better example: https://qubes-doc-rst.readthedocs.io/en/latest/index.html Now the pages: https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/introduction/intro.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/introduction/getting-started.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/introduction/faq.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/introduction/issue-tracking.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/introduction/support.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/introduction/contributing.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/user/hardware/system-requirements.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/user/hardware/certified-hardware.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/user/hardware/how-to-use-the-hcl.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/user/how-to-guides/how-to-update.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/user/templates/templates.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/user/templates/minimal-templates.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/user/security-in-qubes/firewall.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/user/security-in-qubes/data-leaks.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/user/security-in-qubes/vm-sudo.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/user/security-in-qubes/split-gpg.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/user/security-in-qubes/mfa.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/user/advanced-topics/bind-dirs.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/developer/general/usability-ux.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/developer/system/architecture.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/developer/system/gui.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/developer/services/qrexec.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/developer/services/admin-api.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/developer/building/qubes-builder.html
https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/developer/releases/version-scheme.html
The yellow top warning box "Caution: This page is intended for advanced users." is missing on the following pages:
|
@tokideveloper Thank you very much for your work. |
As mentioned above, there is a workaround for the missing newlines/paragraphs breaks. The problem is that Markdown code like this:
renders to this using Jekyll:
while ReStructuredText code like this:
renders to this using Sphinx:
So, newlines / paragraph breaks are dropped in lists. My suggested solution is to itemize those paragraphs. So, I would transform the Markdown code to
which renders to
using Jekyll and also using Sphinx. @maiska, if you give me your "Go!", I can apply this proposed solution to all Markdown files on branch qubes-doc:main. But beforehand, I'd like to see PR #1418 merged. @maiska, @unman, are there any reasons for not merging that PR? |
On Fri, Aug 23, 2024 at 11:54:55PM -0700, Tobias Killer wrote:
My suggested solution is to itemize those paragraphs. So, I would transform the Markdown code to
But beforehand, I'd like to see PR #1418 merged. @maiska, @unman, are there any reasons for not merging that PR?
I'll do that merge when I get back home. I hope over the weekend.
I see no issue with itemizing the lists, and can create PR to merge
after #1418.
|
@tokideveloper I fixed the most important errors. Formatting, such as newlines, fonts, etc. could be done after the conversion to rst imho. Would you like to take another look? :) https://current-qubes-docrtd.readthedocs.io/en/rtd-deploy-pr/ |
@maiska, thank you for fixing the most important errors! I could take another look but beforehand, I'd like to see the newline issue to be solved (by itemizing those paragraphs, see my previous post) since it's crucial IMHO and can easily be fixed in the Markdown version. Note that I don't see no other way to solve that problem (see my previous post). Trying to fix it in the RST version won't be easier than fixing it in the Markdown version. If you give me your "Go!", I can help you by solving the newline issue in the Markdown version. (I ask for your „Go!“, because I want to avoid double work). |
@tokideveloper yeah, sure! let's sync work tho |
Status update: now i am going over all the minor formatting errors/mishaps and fix them where it is easy to do so. Here is an overall final TODO list: https://github.com/maiska/qubes-translation-utilz/blob/main/README.md#final-todos |
@tokideveloper thank you very much, i'll take a look :) |
@maiska Thanks for good work.
I've been offline for a while and have a number of PRs that I will be
pushing up over the weekend. I should be done by 11/04.
So I would suggest that you rebuild the site for comparison after that.
Good with you?
unman
|
Hey @unman |
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.
Currently the site is pushed to https://qubes-doc-rst.readthedocs.io/en/latest/index.html, but when agreed, I'd put it on https://doc.qubes-os.org (I'll simply configure it as a custom domain on the readthedocs hosting).
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.