add info about readthedocs.yml, exchange code-block with code to be consistent

This commit is contained in:
qubedmaiska 2025-09-09 12:15:52 -04:00
parent 1be6e5f9b9
commit bd26dee6a4
No known key found for this signature in database
GPG key ID: 204BCE0FD52C0501
2 changed files with 54 additions and 50 deletions

View file

@ -454,6 +454,10 @@ It contains settings and extensions that define how the documentation will be ge
You can find it `here <https://github.com/QubesOS/qubes-doc/blob/rst/conf.py>`__. You can find it `here <https://github.com/QubesOS/qubes-doc/blob/rst/conf.py>`__.
You can also find a :file:`readthedocs.yml` `file <https://github.com/QubesOS/qubes-doc/blob/rst/.readthedocs.yaml>`__
which tells RTD how to build the documentation. It defines the build environment, Python version, required dependencies,
and which Sphinx configuration to run. Thus RTD automatically generates and hosts the docs.
Extensions Extensions
---------- ----------

View file

@ -28,10 +28,10 @@ provided by `Docutils <https://www.docutils.org/>`__ and extended by `Sphinx <ht
Directives are used to insert non-paragraph content, such as images, tables, and code blocks. Directives are used to insert non-paragraph content, such as images, tables, and code blocks.
Example directives are: Example directives are:
.. code-block:: rst .. code:: rst
.. image:: .. image::
.. code-block:: .. code::
.. figure:: .. figure::
Directives start with ``..``, followed by directive name, arguments, options, and indented content. Directives start with ``..``, followed by directive name, arguments, options, and indented content.
@ -42,7 +42,7 @@ Images
To include images (without a caption), use the ``image`` directive. To include images (without a caption), use the ``image`` directive.
You need to specify the path to the image and an alt text. You need to specify the path to the image and an alt text.
.. code-block:: rst .. code:: rst
.. image:: path/to/image.png .. image:: path/to/image.png
:alt: Alternative text :alt: Alternative text
@ -64,7 +64,7 @@ Lists
Nested lists must be separated from the parent list items by blank lines: Nested lists must be separated from the parent list items by blank lines:
.. code-block:: rst .. code:: rst
- Item 1 - Item 1
- Item 2 - Item 2
@ -76,7 +76,7 @@ Nested lists must be separated from the parent list items by blank lines:
Numbered lists can be autonumbered using the ``#`` sign. Numbered lists can be autonumbered using the ``#`` sign.
.. code-block:: rst .. code:: rst
#. Item 1 #. Item 1
#. Item 2 #. Item 2
@ -96,9 +96,9 @@ or `code <https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives
By specifying the language, you enable pygments, which show syntax color coding for that code sample (see `here <https://pygments.org/languages/>`__ for a list of supported languages). By specifying the language, you enable pygments, which show syntax color coding for that code sample (see `here <https://pygments.org/languages/>`__ for a list of supported languages).
.. code-block:: rst .. code:: rst
.. code-block:: language .. code:: language
code code
@ -108,15 +108,15 @@ Use ``[...]`` for anything omitted.
For inlining small code snippets you can use the `code role <https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-code>`__ as in For inlining small code snippets you can use the `code role <https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-code>`__ as in
.. code-block:: rst .. code:: rst
`code:`:term:`qube`` `code:`:term:`qube``
You can add line numbers to code examples with the ``:linenos:`` parameter. You can add line numbers to code examples with the ``:linenos:`` parameter.
.. code-block:: rst .. code:: rst
.. code-block:: python .. code:: python
:linenos: :linenos:
def hello_world(): def hello_world():
@ -125,50 +125,50 @@ You can add line numbers to code examples with the ``:linenos:`` parameter.
You can have certain lines with the ``:emphasize-lines:`` parameter. You can have certain lines with the ``:emphasize-lines:`` parameter.
.. code-block:: rst .. code:: rst
.. code-block:: python .. code:: python
:emphasize-lines: 1,3,4 :emphasize-lines: 1,3,4
For Python use ``python``. For Python use ``python``.
.. code-block:: rst .. code:: rst
.. code-block:: python .. code:: python
string_var = 'python' string_var = 'python'
For Bash use ``bash``. For Bash use ``bash``.
.. code-block:: rst .. code:: rst
.. code-block:: bash .. code:: bash
echo "Hello" echo "Hello"
For a terminal session use ``console``. For a terminal session use ``console``.
.. code-block:: rst .. code:: rst
.. code-block:: console .. code:: console
pygments_style = 'sphinx' pygments_style = 'sphinx'
For text output use ``output``. For text output use ``output``.
.. code-block:: rst .. code:: rst
.. code-block:: output .. code:: output
some output some output
For text use ``text``. For text use ``text``.
.. code-block:: rst .. code:: rst
.. code-block:: text .. code:: text
some text some text
@ -180,7 +180,7 @@ We adhere to the list tables directive by docutils as described `here <https://d
A simple example would be: A simple example would be:
.. code-block:: rst .. code:: rst
.. list-table:: rst .. list-table:: rst
:widths: 15 10 :widths: 15 10
@ -296,14 +296,14 @@ Cross referencing:
Use the `:doc:` role with a path Use the `:doc:` role with a path
.. code-block:: rst .. code:: rst
:doc:`contributions </introduction/contributing>`. :doc:`contributions </introduction/contributing>`.
use `:ref:` for specific sections use `:ref:` for specific sections
.. code-block:: rst .. code:: rst
:ref:`qubes <user/reference/glossary:qube>` :ref:`qubes <user/reference/glossary:qube>`
@ -340,13 +340,13 @@ Relative vs. absolute links
Always use relative rather than absolute paths for internal website links. Always use relative rather than absolute paths for internal website links.
For example, use: For example, use:
.. code-block:: rst .. code:: rst
text :doc:`contribute code </introduction/contributing>` text text :doc:`contribute code </introduction/contributing>` text
instead of: instead of:
.. code-block:: rst .. code:: rst
text :doc:`contribute code </introduction/contributing>` text text :doc:`contribute code </introduction/contributing>` text
@ -416,19 +416,19 @@ Emphasis and Italics
- *Italics*: Use single asterisks - *Italics*: Use single asterisks
.. code-block:: rst .. code:: rst
*italics* *italics*
- **Bold**: Use double asterisks. - **Bold**: Use double asterisks.
.. code-block:: rst .. code:: rst
**bold** **bold**
- ``Monospace``: Use backticks. - ``Monospace``: Use backticks.
.. code-block:: rst .. code:: rst
``monospace`` ``monospace``
@ -607,14 +607,14 @@ Incorrect Example
the most part, all fooing is fooing. the most part, all fooing is fooing.
To foo in Qubes 3.2: To foo in Qubes 3.2:
.. code-block:: console .. code:: console
$ qvm-foo <foo-bar> $ qvm-foo <foo-bar>
Note that this does not work in Qubes 4.0, where there is a special widget Note that this does not work in Qubes 4.0, where there is a special widget
for fooing, which you can find in the lower-right corner of the screen in for fooing, which you can find in the lower-right corner of the screen in
the Foo Manager. Alternatively, you can use the more general ``qubes-baz`` the Foo Manager. Alternatively, you can use the more general ``qubes-baz``
command introduced in 4.0: command introduced in 4.0:
.. code-block:: console .. code:: console
$ qubes-baz --foo <bar> $ qubes-baz --foo <bar>
Once you foo, make sure to close the baz before fooing the next bar. Once you foo, make sure to close the baz before fooing the next bar.
@ -639,7 +639,7 @@ Correct Example
To foo: To foo:
.. code-block:: console .. code:: console
$ qvm-foo <foo-bar> $ qvm-foo <foo-bar>
@ -659,7 +659,7 @@ Correct Example
corner of the screen in the Foo Manager. Alternatively, you can use the corner of the screen in the Foo Manager. Alternatively, you can use the
general ``qubes-baz`` command: general ``qubes-baz`` command:
.. code-block:: console .. code:: console
$ qubes-baz --foo <bar> $ qubes-baz --foo <bar>
@ -699,7 +699,7 @@ Headings
**Markdown:** **Markdown:**
.. code-block:: markdown .. code:: markdown
# Heading 1 # Heading 1
## Heading 2 ## Heading 2
@ -707,7 +707,7 @@ Headings
**reStructuredText:** **reStructuredText:**
.. code-block:: rst .. code:: rst
============ ============
Heading 1 Heading 1
@ -726,13 +726,13 @@ External
**Markdown:** **Markdown:**
.. code-block:: markdown .. code:: markdown
[Link Text](http://example.com) [Link Text](http://example.com)
**reStructuredText:** **reStructuredText:**
.. code-block:: rst .. code:: rst
`Link Text <http://example.com>`__ `Link Text <http://example.com>`__
@ -740,13 +740,13 @@ Internal
**Markdown:** **Markdown:**
.. code-block:: markdown .. code:: markdown
[Link Text](/doc/some-file) [Link Text](/doc/some-file)
**reStructuredText:** **reStructuredText:**
.. code-block:: rst .. code:: rst
:doc:`Link Text </path/to/file>` :doc:`Link Text </path/to/file>`
@ -758,7 +758,7 @@ Text Decoration
**Markdown:** **Markdown:**
.. code-block:: markdown .. code:: markdown
*Italic* or _Italic_ *Italic* or _Italic_
**Bold** or __Bold__ **Bold** or __Bold__
@ -766,7 +766,7 @@ Text Decoration
**reStructuredText:** **reStructuredText:**
.. code-block:: rst .. code:: rst
*Italic* *Italic*
**Bold** **Bold**
@ -777,7 +777,7 @@ Lists
**Markdown:** **Markdown:**
.. code-block:: markdown .. code:: markdown
- Item 1 - Item 1
- Item 2 - Item 2
@ -791,7 +791,7 @@ Lists
**reStructuredText:** **reStructuredText:**
.. code-block:: rst .. code:: rst
- Item 1 - Item 1
- Item 2 - Item 2
@ -808,7 +808,7 @@ Tables
**Markdown:** **Markdown:**
.. code-block:: markdown .. code:: markdown
| Header 1 | Header 2 | | Header 1 | Header 2 |
|----------|----------| |----------|----------|
@ -816,7 +816,7 @@ Tables
| Cell 3 | Cell 4 | | Cell 3 | Cell 4 |
**reStructuredText:** **reStructuredText:**
.. code-block:: rst .. code:: rst
.. list-table:: rst .. list-table:: rst
:widths: 15 10 :widths: 15 10
@ -833,7 +833,7 @@ Code Blocks
^^^^^^^^^^^ ^^^^^^^^^^^
**Markdown:** **Markdown:**
.. code-block:: markdown .. code:: markdown
```python ```python
print("Hello, world!") print("Hello, world!")
@ -841,9 +841,9 @@ Code Blocks
**reStructuredText:** **reStructuredText:**
.. code-block:: rst .. code:: rst
.. code-block:: python .. code:: python
print("Hello, world!") print("Hello, world!")
@ -855,7 +855,7 @@ Alerts and Warnings
Markdown does not have built-in support for alerts and warnings. Markdown does not have built-in support for alerts and warnings.
**reStructuredText:** **reStructuredText:**
.. code-block:: rst .. code:: rst
.. note:: .. note::
This is a note. This is a note.