Use console lexer instead of bash with a prompt

user/how-to-guides/backup-emergency-restore-v2.rst

@@ -11,7 +11,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
 1. Untar the main backup file.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ tar -i -xvf qubes-backup-2013-12-26-123456
          backup-header
@@ -33,7 +33,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
 2. Set the backup passphrase environment variable. While this isn’t strictly required, it will be handy later and will avoid saving the passphrase in the shell’s history.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ read -r backup_pass
 
@@ -41,7 +41,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
 3. Verify the integrity of the ``private.img`` file which houses your data.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ cd vm1/
          [user@restore vm1]$ openssl dgst -sha512 -hmac "$backup_pass" private.img.000
@@ -59,7 +59,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
 4. Decrypt the ``private.img`` file.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore vm1]$ openssl enc -d -md MD5 -pass pass:"$backup_pass" -aes-256-cbc -in private.img.000 -out private.img.dec.000
 
@@ -84,7 +84,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
 5. Decompress the decrypted ``private.img`` file.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore vm1]$ zforce private.img.dec.*
          [user@restore vm1]$ gunzip private.img.dec.000.gz
@@ -99,7 +99,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
 6. Untar the decrypted and decompressed ``private.img`` file.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore vm1]$ tar -M -xvf private.img.dec.000
          vm1/private.img
@@ -126,7 +126,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
 7. Mount the private.img file and access your data.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore vm1]$ sudo mkdir /mnt/img
          [user@restore vm1]$ sudo mount -o loop vm1/private.img /mnt/img/

user/how-to-guides/backup-emergency-restore-v3.rst

@@ -11,7 +11,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
 1. Untar the main backup file.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ tar -i -xvf qubes-backup-2015-06-05T123456
          backup-header
@@ -33,7 +33,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
 2. Set the backup passphrase environment variable. While this isn’t strictly required, it will be handy later and will avoid saving the passphrase in the shell’s history.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ read -r backup_pass
 
@@ -41,7 +41,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
 3. Verify the integrity of the ``backup-header`` file, which contains basic information about your backup.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ openssl dgst -sha512 -hmac "$backup_pass" backup-header
          HMAC-SHA512(backup-header)= 5b266783e116fe3b2601a54c249ca5f5f96d421dfe6828eeaeb2dcd014e9e945c27b3d7b0f952f5d55c927318906d9c360f387b0e1f069bb8195e96543e2969c
@@ -58,7 +58,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
 4. Read the ``backup-header``. You’ll need some of this information later. The file will look similar to this:
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ cat backup-header
          version=3
@@ -73,7 +73,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
 5. Verify the integrity of the ``private.img`` file which houses your data.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ cd vm1/
          [user@restore vm1]$ openssl dgst -sha512 -hmac "$backup_pass" private.img.000
@@ -91,7 +91,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
 6. Decrypt the ``private.img`` file.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore vm1]$ find -name 'private.img.*[0-9]' | sort -V | xargs cat | openssl enc -d -md MD5 -pass pass:"$backup_pass" -aes-256-cbc -out private.img.dec
 
@@ -100,7 +100,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
 7. Decompress the decrypted ``private.img`` file.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore vm1]$ zforce private.img.dec
          private.img.dec -- replaced with private.img.dec.gz
@@ -109,7 +109,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
    **Note:** If your backup was compressed with a program other than ``gzip``, you must substitute the correct compression program. This information is contained in the ``backup-header`` file (see step 4). For example, if you used ``bzip2``, then you should do this:
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore vm1]$ mv private.img.dec private.img.dec.bz2
          [user@restore vm1]$ bunzip2 private.img.dec.bz2
@@ -118,7 +118,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
 8. Untar the decrypted and decompressed ``private.img`` file.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore vm1]$ tar -xvf private.img.dec
          vm1/private.img
@@ -127,7 +127,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
 
 9. Mount the private.img file and access your data.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore vm1]$ sudo mkdir /mnt/img
          [user@restore vm1]$ sudo mount -o loop vm1/private.img /mnt/img/

user/how-to-guides/backup-emergency-restore-v4.rst

@@ -19,7 +19,7 @@ Here are instructions for obtaining a compiled ``scrypt`` binary. This example u
 
 1. If you’re not on Qubes 4.X, :ref:`import and authenticate the Release 4 Signing Key <project-security/verifying-signatures:how to import and authenticate release signing keys>`.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ sudo rpm --import qubes-release-4-signing-key.asc
 
@@ -27,14 +27,14 @@ Here are instructions for obtaining a compiled ``scrypt`` binary. This example u
 
 2. Download the ``scrypt`` RPM.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ dnf download scrypt
 
 
    Or, if that doesn’t work:
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ curl -O https://yum.qubes-os.org/r4.0/current/vm/fc28/rpm/scrypt-1.2.1-1.fc28.x86_64.rpm
 
@@ -42,7 +42,7 @@ Here are instructions for obtaining a compiled ``scrypt`` binary. This example u
 
 3. Verify the signature on the ``scrypt`` RPM.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ rpm -K scrypt-*.rpm
          scrypt-*.rpm: digests signatures OK
@@ -52,7 +52,7 @@ Here are instructions for obtaining a compiled ``scrypt`` binary. This example u
 
 4. Install ``rpmdevtools``.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ sudo dnf install rpmdevtools
 
@@ -60,7 +60,7 @@ Here are instructions for obtaining a compiled ``scrypt`` binary. This example u
 
 5. Extract the ``scrypt`` binary from the RPM and make it conveniently available.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ rpmdev-extract scrypt-*.rpm
          [user@restore ~]$ alias scrypt="$PWD/scrypt-*/usr/bin/scrypt"
@@ -77,7 +77,7 @@ Emergency recovery instructions
 
 1. Untar the backup metadata from the main backup file.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ tar -i -xvf qubes-backup-2023-04-05T123456 \
              backup-header backup-header.hmac qubes.xml.000.enc
@@ -89,7 +89,7 @@ Emergency recovery instructions
 
 2. Set the backup passphrase environment variable. While this isn’t strictly required, it will be handy later and will avoid saving the passphrase in the shell’s history.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ read -r backup_pass
 
@@ -98,7 +98,7 @@ Emergency recovery instructions
 
 3. Verify the integrity of ``backup-header`` using ``backup-header.hmac`` (an encrypted *and integrity protected* version of ``backup-header``).
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ set +H
          [user@restore ~]$ echo "backup-header!$backup_pass" |\
@@ -117,7 +117,7 @@ Emergency recovery instructions
 
 4. Read ``backup-header``.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ cat backup-header
          version=4
@@ -131,7 +131,7 @@ Emergency recovery instructions
 
 5. Set ``backup_id`` to the value in the last line of ``backup-header``. (Note that there is a hyphen in ``backup-id`` in the file, whereas there is an underscore in ``backup_id`` in the variable you’re setting.)
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ backup_id=20230405T123455-1234
 
@@ -139,7 +139,7 @@ Emergency recovery instructions
 
 6. Verify and decrypt, decompress, and extract the ``qubes.xml`` file.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ echo "$backup_id!qubes.xml.000!$backup_pass" |\
              scrypt dec -P qubes.xml.000.enc | gzip -d | tar -xv
@@ -155,7 +155,7 @@ Emergency recovery instructions
 
 7. Search inside of the ``qubes.xml`` file for the ``backup-path`` of the qube whose data you wish to restore. If you install the ``xmlstarlet`` package, the following command will convert ``qubes.xml`` to a friendlier listing for this purpose:
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ xmlstarlet sel -T -t -m //domain \
              -v 'concat(.//property[@name="name"], " ", .//feature[@name="backup-path"])' \
@@ -182,7 +182,7 @@ Emergency recovery instructions
 
    The example output above shows that the backup file includes a qube named ``personal`` and a qube named ``vault``, with ``backup-path`` values of ``vm123/`` and ``vm321/`` respectively. (Every other listed qube was not selected to be included in the backup file.) Use the corresponding value to untar the necessary data files of the qube:
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ tar -i -xvf qubes-backup-2023-04-05T123456 vm123/
 
@@ -190,7 +190,7 @@ Emergency recovery instructions
 
 8. Verify and decrypt the backed up data, decompress it, and extract it.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ find vm123/ -name 'private.img.*.enc' | sort -V | while read f_enc; do \
              f_dec=${f_enc%.enc}; \
@@ -204,7 +204,7 @@ Emergency recovery instructions
 
 9. Mount ``private.img`` and access your data.
 
-   .. code:: bash
+   .. code:: console
 
          [user@restore ~]$ sudo mkdir /mnt/img
          [user@restore ~]$ sudo mount -o loop vm123/private.img /mnt/img/

user/how-to-guides/how-to-back-up-restore-and-migrate.rst

@@ -15,7 +15,7 @@ Backing up changes to dom0
 
 When backing up dom0 using the Qubes backup tool (explained below), only the home directory is backed up. Therefore, if there are files outside of the home directory you wish to save, you should copy them into the home directory prior to creating a backup. Here is an example of how to back up Qubes config files and RPC policies:
 
-.. code:: bash
+.. code:: console
 
       $ mkdir -p ~/backup/etc/qubes/
       $ cp -a /etc/qubes/* ~/backup/etc/qubes/

user/how-to-guides/how-to-install-software.rst

@@ -52,7 +52,7 @@ If you are still using the distribution package manager, updates will likely sti
 
 If you are using another installation method fetching remote resources, you might still be able to use the updates proxy by making the tools aware of the proxy. For many tools, it is enough to export the following environment variables in your shell session before proceeding:
 
-.. code:: bash
+.. code:: console
 
       $ export HTTP_PROXY=http://127.0.0.1:8082 http_proxy=$HTTP_PROXY \
                HTTPS_PROXY=$HTTP_PROXY https_proxy=$HTTPS_PROXY \
@@ -300,7 +300,7 @@ Snap packages do not use the normal update channels for Debian and Fedora (apt a
 
 1. In the **template** you must install ``snapd`` and ``qubes-snapd-helper``. Open a terminal in the template and run:
 
-   .. code:: bash
+   .. code:: console
 
          [user@fedora-36-snap-demo ~]$ sudo dnf install snapd qubes-snapd-helper
          Last metadata expiration check: 0:33:05 ago on Thu 03 Nov 2022 04:34:06.
@@ -346,14 +346,14 @@ Snap packages do not use the normal update channels for Debian and Fedora (apt a
    This is expected and you can safely continue.
    Shutdown the template:
 
-   .. code:: bash
+   .. code:: console
 
          [user@fedora-36-snap-demo ~]$ sudo shutdown -h now
 
 
 2. Now open the **app qube** in which you would like to install the Snap application and run a terminal:
 
-   .. code:: bash
+   .. code:: console
 
          [user@snap-demo-app qube ~]$ snap install <package>
 
@@ -377,7 +377,7 @@ If you want a desktop app to start automatically every time a qube starts you ca
 
 2. List the names of the available desktop shortcuts by running the command ``ls /usr/share/applications`` and find the exact name of the shortcut to the app you want to autostart:
 
-   .. code:: bash
+   .. code:: console
 
          [user@example-app qube ~]$ ls /usr/share/applications/
          bluetooth-sendto.desktop
@@ -390,7 +390,7 @@ If you want a desktop app to start automatically every time a qube starts you ca
 
 3. Create the autostart directory:
 
-   .. code:: bash
+   .. code:: console
 
          [user@example-app qube ~]$ mkdir -p ~/.config/autostart
 
@@ -398,7 +398,7 @@ If you want a desktop app to start automatically every time a qube starts you ca
 
 4. Make a link to the desktop app file you’d like to start in the autostart directory. For example, the command below will link the Thunderbird app into the autostart directory:
 
-   .. code:: bash
+   .. code:: console
 
          [user@example-app qube ~]$ ln -s /usr/share/applications/mozilla-thunderbird.desktop ~/.config/autostart/mozilla-thunderbird.desktop
 

user/how-to-guides/how-to-update.rst

@@ -159,7 +159,7 @@ First, ensure that your UpdateVM contains the ``fwupd-qubes-vm`` package. This p
 
 In a dom0 terminal, install the ``fwupd-qubes-dom0`` package:
 
-.. code:: bash
+.. code:: console
 
       $ sudo qubes-dom0-update fwupd-qubes-dom0
 
@@ -167,7 +167,7 @@ In a dom0 terminal, install the ``fwupd-qubes-dom0`` package:
 
 Once the package is installed:
 
-.. code:: bash
+.. code:: console
 
       $ sudo qubes-fwupdmgr get-devices
 
@@ -185,7 +185,7 @@ If so, `adjust your BIOS settings <https://github.com/fwupd/fwupd/wiki/PluginFla
 
 Once resolved, in a dom0 terminal:
 
-.. code:: bash
+.. code:: console
 
       $ sudo qubes-fwupdmgr get-devices
       $ sudo qubes-fwupdmgr refresh