diff --git a/doc/user/basic.rst b/doc/user/basic.rst
index 8fbea29ee7..f55b1b9d73 100644
--- a/doc/user/basic.rst
+++ b/doc/user/basic.rst
@@ -287,8 +287,8 @@ Terminal Mode Commands
 
    Write current configuration to configuration file.
 
-.. index:: configure terminal
-.. clicmd:: configure terminal
+.. index:: configure [terminal]
+.. clicmd:: configure [terminal]
 
    Change to configuration mode. This command is the first step to
    configuration.
diff --git a/doc/user/static.rst b/doc/user/static.rst
index 1705b6379e..09bdc9cbea 100644
--- a/doc/user/static.rst
+++ b/doc/user/static.rst
@@ -123,7 +123,7 @@ but this time, the route command will apply to the VRF.
 .. code-block:: frr
 
    # case with VRF
-   configure terminal
+   configure
    vrf r1-cust1
     ip route 10.0.0.0/24 10.0.0.2
    exit-vrf