From f7a00e40f18c0c9db28aeb0ec9be82479bb8dd7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Kr=C3=A1tk=C3=BD?= Date: Fri, 6 Oct 2023 13:45:34 +0200 Subject: [PATCH] FR-5578: Add support for variable substitutions. --- doc/custom_conf.py | 6 ++++-- doc/howto/autoinstall-quickstart-s390x.rst | 12 +++++------- doc/reuse/substitutions.txt | 2 ++ 3 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 doc/reuse/substitutions.txt diff --git a/doc/custom_conf.py b/doc/custom_conf.py index 96749fd0..b4b1f60f 100644 --- a/doc/custom_conf.py +++ b/doc/custom_conf.py @@ -142,8 +142,10 @@ custom_html_js_files = [] # Specify a reST string that is included at the end of each file. # If commented out, use the default (which pulls the reuse/links.txt # file into each reST file). -# custom_rst_epilog = '' - +custom_rst_epilog = ''' +.. include:: /reuse/substitutions.txt +.. include:: /reuse/links.txt +''' # By default, the documentation includes a feedback button at the top. # You can disable it by setting the following configuration to True. disable_feedback_button = False diff --git a/doc/howto/autoinstall-quickstart-s390x.rst b/doc/howto/autoinstall-quickstart-s390x.rst index a73b4c03..54f2abd1 100644 --- a/doc/howto/autoinstall-quickstart-s390x.rst +++ b/doc/howto/autoinstall-quickstart-s390x.rst @@ -12,21 +12,19 @@ adapted for s390x. Download an ISO =============== -At the time of writing (just after the Kinetic release), the best place to go -is here: -https://cdimage.ubuntu.com/ubuntu/releases/22.10/release/ +Download an ISO image of the latest release from the `release page `_ (currently |ubuntu-latest-version| (|ubuntu-latest-codename|)). -..code-block:: bash +.. parsed-literal:: - wget https://cdimage.ubuntu.com/ubuntu/releases/22.10/release/ubuntu-22.10-live-server-s390x.iso -P ~/Downloads + wget https:\ //cdimage.ubuntu.com/ubuntu/releases/|ubuntu-latest-version|/release/ubuntu-|ubuntu-latest-version|-live-server-s390x.iso -P ~/Downloads Mount the ISO ============= -.. code-block:: bash +.. parsed-literal:: mkdir -p ~/iso - sudo mount -r ~/Downloads/ubuntu-22.10-live-server-s390x.iso ~/iso + sudo mount -r ~/Downloads/ubuntu-|ubuntu-latest-version|-live-server-s390x.iso ~/iso Write your autoinstall config ============================= diff --git a/doc/reuse/substitutions.txt b/doc/reuse/substitutions.txt new file mode 100644 index 00000000..916bac40 --- /dev/null +++ b/doc/reuse/substitutions.txt @@ -0,0 +1,2 @@ +.. |ubuntu-latest-version| replace:: 23.04 +.. |ubuntu-latest-codename| replace:: Lunar Lobster