diff --git a/doc/developer-guides/hld/hld-splitlock.rst b/doc/developer-guides/hld/hld-splitlock.rst
index 1b4bd932a..d9ec95b85 100644
--- a/doc/developer-guides/hld/hld-splitlock.rst
+++ b/doc/developer-guides/hld/hld-splitlock.rst
@@ -131,6 +131,6 @@ Disable Split-Locked Access Detection
 If the CPU supports Split-locked Access detection, the ACRN hypervisor
 uses it to prevent any VM running with potential system performance
 impacting split-locked instructions. This detection can be disabled
-(by changing the :option:`hv.FEATURES.ENFORCE_TURNOFF_AC` setting in
+(by deselecting the :term:`Enable split lock detection` option in
 the ACRN Configurator tool) for customers not
 caring about system performance.
diff --git a/doc/tutorials/rtvm_performance_tips.rst b/doc/tutorials/rtvm_performance_tips.rst
index 33ac02c55..3e4af21e0 100644
--- a/doc/tutorials/rtvm_performance_tips.rst
+++ b/doc/tutorials/rtvm_performance_tips.rst
@@ -189,8 +189,9 @@ Tip: Disable the software workaround for Machine Check Error on Page Size Change
    By default, the software workaround for Machine Check Error on Page Size
    Change is conditionally applied to the models that may be affected by the
    issue. However, the software workaround has a negative impact on
-   performance. If all guest OS kernels are trusted, the
-   :option:`hv.FEATURES.MCE_ON_PSC_DISABLED` option could be set for performance.
+   performance. If all guest OS kernels are trusted, you can disable the
+   software workaround (by deselecting the :term:`Enable MCE workaround` option
+   in the ACRN Configurator tool) for performance.
 
 .. note::
    The tips for preempt-RT Linux are mostly applicable to the Linux-based RTOS as well, such as Xenomai.
diff --git a/doc/tutorials/using_grub.rst b/doc/tutorials/using_grub.rst
index 4dd4c43e2..39a89f10d 100644
--- a/doc/tutorials/using_grub.rst
+++ b/doc/tutorials/using_grub.rst
@@ -18,8 +18,8 @@ The ACRN hypervisor can boot from the `multiboot protocol
 with the multiboot protocol, the multiboot2 protocol adds UEFI support.
 
 The multiboot protocol is supported by the ACRN hypervisor natively. The
-multiboot2 protocol is supported when :option:`hv.FEATURES.MULTIBOOT2` is
-enabled in the scenario configuration. The :option:`hv.FEATURES.MULTIBOOT2` is
+multiboot2 protocol is supported when the :term:`Multiboot2` option is
+enabled in the scenario configuration. The :term:`Multiboot2` option is
 enabled by default. To load the hypervisor with the multiboot protocol, run the
 GRUB ``multiboot`` command. To load the hypervisor with the multiboot2 protocol,
 run the ``multiboot2`` command. To load a VM kernel or ramdisk, run the
@@ -29,13 +29,14 @@ for the multiboot2 protocol.
 The ACRN hypervisor binary is built with two formats: ``acrn.32.out`` in
 ELF format and ``acrn.bin`` in RAW format. The GRUB ``multiboot``
 command supports ELF format only and does not support binary relocation,
-even if :option:`hv.FEATURES.RELOC` is set. The GRUB ``multiboot2``
-command supports
-ELF format when :option:`hv.FEATURES.RELOC` is not set, or RAW format when
-:option:`hv.FEATURES.RELOC` is set.
+even if the :term:`Hypervisor relocation` option is set in the scenario
+configuration. The GRUB ``multiboot2`` command supports
+ELF format when the :term:`Hypervisor relocation` option is not set, or RAW
+format when the :term:`Hypervisor relocation` option is set.
 
 .. note::
-   * :option:`hv.FEATURES.RELOC` is set by default, so use ``acrn.32.out`` in
+   * The :term:`Hypervisor relocation` option is set by default, so use
+     ``acrn.32.out`` in
      the multiboot protocol and ``acrn.bin`` in the multiboot2 protocol.
 
    * Per ACPI specification, the RSDP pointer is described in the EFI System