7 files changed, 13 insertions, 22 deletions
diff --git a/docs/configuration/highavailability/index.rst b/docs/configuration/highavailability/index.rst
index 2f20e783..7f06faa8 100644
--- a/docs/configuration/highavailability/index.rst
+++ b/docs/configuration/highavailability/index.rst
@@ -450,7 +450,7 @@ Port "0" is required if multiple ports are used.
   set high-availability virtual-server vyos real-server 192.0.2.12 health-check script '/config/scripts/check-real-server-second.sh'
   set high-availability virtual-server vyos real-server 192.0.2.12 port '0'
 
-  set nat source rule 100 outbound-interface 'eth0'
+  set nat source rule 100 outbound-interface name 'eth0'
   set nat source rule 100 source address '192.0.2.0/24'
   set nat source rule 100 translation address 'masquerade'
 
diff --git a/docs/configuration/nat/nat44.rst b/docs/configuration/nat/nat44.rst
index b42c6cfe..98b230a9 100644
--- a/docs/configuration/nat/nat44.rst
+++ b/docs/configuration/nat/nat44.rst
@@ -663,7 +663,7 @@ We will use source and destination address for hash generation.
 
 .. code-block:: none
 
-  set nat destination rule 10 inbound-interface inbound-interface eth0
+  set nat destination rule 10 inbound-interface name eth0
   set nat destination rule 10 protocol tcp
   set nat destination rule 10 destination port 80
   set nat destination rule 10 load-balance hash source-address
diff --git a/docs/configuration/pki/index.rst b/docs/configuration/pki/index.rst
index e83272f5..66ad84a3 100644
--- a/docs/configuration/pki/index.rst
+++ b/docs/configuration/pki/index.rst
@@ -148,11 +148,11 @@ WireGuard
     ``interface`` is used for the VyOS CLI command to identify the WireGuard
     interface where this private key is to be used.
 
-.. opcmd:: generate pki wireguard pre-shared-key
+.. opcmd:: generate pki wireguard preshared-key
 
   Generate a WireGuard pre-shared secret used for peers to communicate.
 
-.. opcmd:: generate pki wireguard pre-shared-key install <peer>
+.. opcmd:: generate pki wireguard preshared-key install <peer>
 
   Generate a WireGuard pre-shared secret used for peers to communicate.
 
diff --git a/docs/configuration/service/https.rst b/docs/configuration/service/https.rst
index 08b16575..eb2e30eb 100644
--- a/docs/configuration/service/https.rst
+++ b/docs/configuration/service/https.rst
@@ -20,28 +20,19 @@ Configuration
 
 .. cfgcmd:: set service https api debug
 
-   To enable debug messages. Available via :opcmd:`show log` or 
+   To enable debug messages. Available via :opcmd:`show log` or
    :opcmd:`monitor log`
 
-.. cfgcmd:: set service https api port
-
-   Set the listen port of the local API, this has no effect on the
-   webserver. The default is port 8080
-
-.. cfgcmd:: set service https api socket
-
-   Use local socket for API
-
 .. cfgcmd:: set service https api strict
 
    Enforce strict path checking
 
-.. cfgcmd:: set service https virtual-host <vhost> listen-address 
+.. cfgcmd:: set service https virtual-host <vhost> listen-address
             <ipv4 or ipv6 address>
 
    Address to listen for HTTPS requests
 
-.. cfgcmd:: set service https virtual-host <vhost> listen-port <1-65535>
+.. cfgcmd:: set service https virtual-host <vhost> port <1-65535>
 
    Port to listen for HTTPS requests; default 443
 
@@ -91,6 +82,6 @@ To use this full configuration we asume a public accessible hostname.
    set service https certificates certbot domain-name rtr01.example.com
    set service https certificates certbot email mail@example.com
    set service https virtual-host rtr01 listen-address 198.51.100.2
-   set service https virtual-host rtr01 listen-port 11443
+   set service https virtual-host rtr01 port 11443
    set service https virtual-host rtr01 server-name rtr01.example.com
    set service https api-restrict virtual-host rtr01
diff --git a/docs/configuration/vpn/l2tp.rst b/docs/configuration/vpn/l2tp.rst
index 6ea1cc7d..26de47b3 100644
--- a/docs/configuration/vpn/l2tp.rst
+++ b/docs/configuration/vpn/l2tp.rst
@@ -60,7 +60,7 @@ To allow VPN-clients access via your external address, a NAT rule is required:
 
 .. code-block:: none
 
-  set nat source rule 110 outbound-interface 'eth0'
+  set nat source rule 110 outbound-interface name 'eth0'
   set nat source rule 110 source address '192.168.255.0/24'
   set nat source rule 110 translation address masquerade
 
diff --git a/docs/configuration/vpn/site2site_ipsec.rst b/docs/configuration/vpn/site2site_ipsec.rst
index 2b3403f5..8c0af774 100644
--- a/docs/configuration/vpn/site2site_ipsec.rst
+++ b/docs/configuration/vpn/site2site_ipsec.rst
@@ -245,13 +245,13 @@ If there is SNAT rules on eth1, need to add exclude rule
   # server side
   set nat source rule 10 destination address '10.0.0.0/24'
   set nat source rule 10 'exclude'
-  set nat source rule 10 outbound-interface 'eth1'
+  set nat source rule 10 outbound-interface name 'eth1'
   set nat source rule 10 source address '192.168.0.0/24'
 
   # remote office side
   set nat source rule 10 destination address '192.168.0.0/24'
   set nat source rule 10 'exclude'
-  set nat source rule 10 outbound-interface 'eth1'
+  set nat source rule 10 outbound-interface name 'eth1'
   set nat source rule 10 source address '10.0.0.0/24'
 
 To allow traffic to pass through to clients, you need to add the following
diff --git a/docs/configuration/vrf/index.rst b/docs/configuration/vrf/index.rst
index dea53321..7a50bfb2 100644
--- a/docs/configuration/vrf/index.rst
+++ b/docs/configuration/vrf/index.rst
@@ -295,11 +295,11 @@ Configuration
 
     set nat destination rule 110 description 'NAT ssh- INSIDE'
     set nat destination rule 110 destination port '2022'
-    set nat destination rule 110 inbound-interface 'eth0'
+    set nat destination rule 110 inbound-interface name 'eth0'
     set nat destination rule 110 protocol 'tcp'
     set nat destination rule 110 translation address '192.168.130.40'
 
-    set nat source rule 100 outbound-interface 'eth0'
+    set nat source rule 100 outbound-interface name 'eth0'
     set nat source rule 100 protocol 'all'
     set nat source rule 100 source address '192.168.130.0/24'
     set nat source rule 100 translation address 'masquerade'