diff --git a/doc/cli/introduction.md b/doc/cli/introduction.md index 4630c356..aeb7f065 100644 --- a/doc/cli/introduction.md +++ b/doc/cli/introduction.md @@ -164,7 +164,7 @@ interfaces { } } admin@host-12-34-56:/config/interface/eth0/> leave -admin@host-12-34-56:/> show interfaces +admin@host-12-34-56:/> show interface INTERFACE PROTOCOL STATE DATA lo loopback UNKNOWN 00:00:00:00:00:00 ipv4 127.0.0.1/8 (static) diff --git a/doc/dhcp.md b/doc/dhcp.md index c2792930..6898ebd9 100644 --- a/doc/dhcp.md +++ b/doc/dhcp.md @@ -109,11 +109,11 @@ When configuring, e.g., `dns-server`, or `router` options with the value `auto`, the system uses the IP address from the interface matching the subnet. For example: -
admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA                                    
-eth0            ethernet   UP          02:00:00:00:00:00
+
admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA                                    
+eth0            ethernet      UP          02:00:00:00:00:00
                 ipv4                   192.168.1.1/24 (static)
-eth1            ethernet   UP          02:00:00:00:00:01
+eth1            ethernet      UP          02:00:00:00:00:01
                 ipv4                   192.168.2.1/24 (static)
 
 admin@example:/config/dhcp-server/subnet/192.168.1.0/24/> edit option dns-server
diff --git a/doc/ethernet.md b/doc/ethernet.md
index fef871b7..8abe5b8f 100644
--- a/doc/ethernet.md
+++ b/doc/ethernet.md
@@ -56,22 +56,41 @@ top of a bridge interface *br0* is named *vlan10*.
 Physical Ethernet interfaces provide low-level settings for speed/duplex as
 well as packet status and [statistics](#ethernet-statistics).
 
-By default, Ethernet interfaces defaults to auto-negotiating
-speed/duplex modes, advertising all speed and duplex modes available.
-In the example below, the switch would by default auto-negotiate speed
-1 Gbit/s on port eth1 and 100 Mbit/s on port eth4, as those are the
-highest speeds supported by H1 and H2 respectively.
+By default, Ethernet interfaces defaults to auto-negotiating speed/duplex
+modes, advertising all speed and duplex modes available.  In the example
+below, the switch would by default auto-negotiate speed 1 Gbps on port eth1
+and 100 Mbps on port eth4, as those are the highest speeds supported by H1 and
+H2 respectively.
 
 ![4-port Gbit/s switch connected to Gbit and Fast Ethernet Hosts](img/ethernet-autoneg.svg)
 
-The speed and duplex status for the links can be listed as shown
-below, assuming the link operational status is 'up'.
+A quick at-a-glance view of the physical link is available in the summary
+listing.  When a port is up, a physical-layer row appears above the ethernet
+row, naming the IEEE PMD type (e.g. `1000baseT`, `10GbaseLR`) in the PROTOCOL
+column and the negotiated duplex in DATA.  When the link is down the row is
+omitted and the interface name falls onto the ethernet row.
+
+
admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA             
+eth1            1000baseT     UP          duplex: full
+                ethernet                  00:53:00:06:11:01
+eth2            1000baseT     UP          duplex: full
+                ethernet                  00:53:00:06:11:02
+eth3            ethernet      DOWN        00:53:00:06:11:03
+eth4            100baseTX     UP          duplex: full
+                ethernet                  00:53:00:06:11:04
+...
+

+
+The detail view spells everything out, including auto-negotiation
+state and the speed in Mbit/s.
 
 
admin@example:/> show interface eth1
 name                : eth1
 index               : 2
 mtu                 : 1500
 operational status  : up
+link mode           : 1000baseT
 auto-negotiation    : on
 duplex              : full
 speed               : 1000
@@ -86,6 +105,7 @@ name                : eth4
 index               : 5
 mtu                 : 1500
 operational status  : up
+link mode           : 100baseTX
 auto-negotiation    : on
 duplex              : full
 speed               : 100
@@ -174,6 +194,7 @@ name                : eth1
 index               : 2
 mtu                 : 1500
 operational status  : up
+link mode           : 1000baseT
 auto-negotiation    : on
 duplex              : full
 speed               : 1000
diff --git a/doc/iface.md b/doc/iface.md
index 9cecd8da..94a549f3 100644
--- a/doc/iface.md
+++ b/doc/iface.md
@@ -61,13 +61,19 @@ admin@example:/config/interface/eth0/> leave
 The operational status can be inspected to see both administrative and
 actual link state:
 
-
admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA
-eth0            ethernet   DISABLED    02:00:00:00:00:00
-eth1            ethernet   UP          02:00:00:00:00:01
+
admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA             
+eth0            ethernet      DISABLED    02:00:00:00:00:00
+eth1            1000baseT     UP          duplex: full
+                ethernet                  02:00:00:00:00:01
 ...
 

 
+The rows are layered bottom-up by protocol: a physical-medium row (only
+emitted when the link is up) on top, then the ethernet row carrying the
+bare MAC, then any ipv4/ipv6 sub-rows.  See [Ethernet](ethernet.md) for the
+full set of summary fields.
+
 
 ## Description
 
diff --git a/doc/ip.md b/doc/ip.md
index a42302ff..e53f334f 100644
--- a/doc/ip.md
+++ b/doc/ip.md
@@ -117,11 +117,11 @@ will be ignored. For details on how to enable the NTP client, see the
 
 ![Switch example (eth0 and lo)](img/ip-address-example-switch.svg)
 
-
admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA                                    
-eth0            ethernet   UP          02:00:00:00:00:00
+
admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA                                    
+eth0            ethernet      UP          02:00:00:00:00:00
                 ipv6                   fe80::ff:fe00:0/64 (link-layer)
-lo              ethernet   UP          00:00:00:00:00:00
+lo              ethernet      UP          00:00:00:00:00:00
                 ipv4                   127.0.0.1/8 (static)
                 ipv6                   ::1/128 (static)
 admin@example:/>
@@ -153,13 +153,13 @@ admin@example:/config/interface/eth0/ipv4/> diff
 +  }
 +}
 admin@example:/config/interface/eth0/ipv4/> leave
-admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA                                    
-eth0            ethernet   UP          02:00:00:00:00:00
+admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA                                    
+eth0            ethernet      UP          02:00:00:00:00:00
                 ipv4                   169.254.1.3/16 (random)
                 ipv4                   10.0.1.1/24 (static)
                 ipv6                   fe80::ff:fe00:0/64 (link-layer)
-lo              ethernet   UP          00:00:00:00:00:00
+lo              ethernet      UP          00:00:00:00:00:00
                 ipv4                   127.0.0.1/8 (static)
                 ipv6                   ::1/128 (static)
 admin@example:/>
@@ -188,12 +188,12 @@ admin@example:/config/interface/eth0/ipv4/autoconf/> leave
 admin@example:/config/> edit interface eth0 ipv4
 admin@example:/config/interface/eth0/ipv4/> set dhcp
 admin@example:/config/interface/eth0/ipv4/> leave
-admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA                                    
-eth0            ethernet   UP          02:00:00:00:00:00
+admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA                                    
+eth0            ethernet      UP          02:00:00:00:00:00
                 ipv4                   10.1.2.100/24 (dhcp)
                 ipv6                   fe80::ff:fe00:0/64 (link-layer)
-lo              ethernet   UP          00:00:00:00:00:00
+lo              ethernet      UP          00:00:00:00:00:00
                 ipv4                   127.0.0.1/8 (static)
                 ipv6                   ::1/128 (static)
 admin@example:/>
@@ -235,11 +235,11 @@ admin@example:/config/> edit interface eth0 ipv6
 admin@example:/config/interface/eth0/ipv6/> set dhcp
 admin@example:/config/interface/eth0/ipv6/> leave
 admin@example:/> show interface
-INTERFACE       PROTOCOL   STATE       DATA                                    
-eth0            ethernet   UP          02:00:00:00:00:00
+INTERFACE       PROTOCOL      STATE       DATA                                    
+eth0            ethernet      UP          02:00:00:00:00:00
                 ipv6                   2001:db8::42/128 (dhcp)
                 ipv6                   fe80::ff:fe00:0/64 (link-layer)
-lo              ethernet   UP          00:00:00:00:00:00
+lo              ethernet      UP          00:00:00:00:00:00
                 ipv4                   127.0.0.1/8 (static)
                 ipv6                   ::1/128 (static)
 admin@example:/>
@@ -291,10 +291,10 @@ on the interface.
 admin@example:/config/> edit interface eth0 ipv6
 admin@example:/config/interface/eth0/ipv6/> set enabled false
 admin@example:/config/interface/eth0/ipv6/> leave
-admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA                                    
-eth0            ethernet   UP          02:00:00:00:00:00
-lo              ethernet   UP          00:00:00:00:00:00
+admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA                                    
+eth0            ethernet      UP          02:00:00:00:00:00
+lo              ethernet      UP          00:00:00:00:00:00
                 ipv4                   127.0.0.1/8 (static)
                 ipv6                   ::1/128 (static)
 admin@example:/>
@@ -308,12 +308,12 @@ admin@example:/>
 admin@example:/config/> edit interface eth0 ipv6
 admin@example:/config/interface/eth0/ipv6/> set address 2001:db8::1 prefix-length 64
 admin@example:/config/interface/eth0/ipv6/> leave
-admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA                                    
-eth0            ethernet   UP          02:00:00:00:00:00
+admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA                                    
+eth0            ethernet      UP          02:00:00:00:00:00
                 ipv6                   2001:db8::1/64 (static)
                 ipv6                   fe80::ff:fe00:0/64 (link-layer)
-lo              ethernet   UP          00:00:00:00:00:00
+lo              ethernet      UP          00:00:00:00:00:00
                 ipv4                   127.0.0.1/8 (static)
                 ipv6                   ::1/128 (static)
 admin@example:/>
@@ -330,12 +330,12 @@ advertised by the router (here 2001:db8:0:1::0/64) and the interface
 identifier.  The resulting address is of type *link-layer*, as it is
 formed based on the interface identifier ([ietf-ip.yang][2]).
 
-
admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA                                    
-eth0            ethernet   UP          02:00:00:00:00:00
+
admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA                                    
+eth0            ethernet      UP          02:00:00:00:00:00
                 ipv6                   2001:db8:0:1:0:ff:fe00:0/64 (link-layer)
                 ipv6                   fe80::ff:fe00:0/64 (link-layer)
-lo              ethernet   UP          00:00:00:00:00:00
+lo              ethernet      UP          00:00:00:00:00:00
                 ipv4                   127.0.0.1/8 (static)
                 ipv6                   ::1/128 (static)
 admin@example:/>
@@ -348,11 +348,11 @@ below.
 admin@example:/config/> edit interface eth0 ipv6
 admin@example:/config/interface/eth0/ipv6/> set autoconf create-global-addresses false
 admin@example:/config/interface/eth0/ipv6/> leave
-admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA                                    
-eth0            ethernet   UP          02:00:00:00:00:00
+admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA                                    
+eth0            ethernet      UP          02:00:00:00:00:00
                 ipv6                   fe80::ff:fe00:0/64 (link-layer)
-lo              ethernet   UP          00:00:00:00:00:00
+lo              ethernet      UP          00:00:00:00:00:00
                 ipv4                   127.0.0.1/8 (static)
                 ipv6                   ::1/128 (static)
 admin@example:/>
@@ -366,12 +366,12 @@ admin@example:/>
 By default, the auto-configured link-local and global IPv6 addresses
 are formed from a link-identifier based on the MAC address.
 
-
admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA                                    
-eth0            ethernet   UP          02:00:00:00:00:00
+
admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA                                    
+eth0            ethernet      UP          02:00:00:00:00:00
                 ipv6                   2001:db8:0:1:0:ff:fe00:0/64 (link-layer)
                 ipv6                   fe80::ff:fe00:0/64 (link-layer)
-lo              ethernet   UP          00:00:00:00:00:00
+lo              ethernet      UP          00:00:00:00:00:00
                 ipv4                   127.0.0.1/8 (static)
                 ipv6                   ::1/128 (static)
 admin@example:/>
@@ -385,12 +385,12 @@ possible to specify use of a random identifier ([ietf-ip.yang][2] and
 admin@example:/config/> edit interface eth0 ipv6
 admin@example:/config/interface/eth0/ipv6/> set autoconf create-temporary-addresses true
 admin@example:/config/interface/eth0/ipv6/> leave
-admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA                                    
-eth0            ethernet   UP          02:00:00:00:00:00
+admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA                                    
+eth0            ethernet      UP          02:00:00:00:00:00
                 ipv6                   2001:db8:0:1:b705:8374:638e:74a8/64 (random)
                 ipv6                   fe80::ad3d:b274:885a:9ffb/64 (random)
-lo              ethernet   UP          00:00:00:00:00:00
+lo              ethernet      UP          00:00:00:00:00:00
                 ipv4                   127.0.0.1/8 (static)
                 ipv6                   ::1/128 (static)
 admin@example:/>
diff --git a/doc/lag.md b/doc/lag.md
index b4c6b4f8..93f2b9ef 100644
--- a/doc/lag.md
+++ b/doc/lag.md
@@ -87,34 +87,34 @@ Like other interfaces, link aggregates are also available in the general
 interfaces overview in the CLI admin-exec context.  Here is the above
 static mode aggregate:
 
-
admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA                                    
-lo              ethernet   UP          00:00:00:00:00:00
-                ipv4                   127.0.0.1/8 (static)
-                ipv6                   ::1/128 (static)
+
admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA                                    
+lo              ethernet      UP          00:00:00:00:00:00
+                ipv4                      127.0.0.1/8 (static)
+                ipv6                      ::1/128 (static)
 .
 .
 .
-lag0            lag        UP          static: balance-xor, hash: layer2
-│               ethernet   UP          00:a0:85:00:02:00
-├ eth7          lag        ACTIVE
-└ eth8          lag        ACTIVE
+lag0            lag           UP          static: balance-xor, hash: layer2
+│               ethernet      UP          00:a0:85:00:02:00
+├ eth7          lag           ACTIVE
+└ eth8          lag           ACTIVE
 

 
 Same aggregate, but in LACP mode:
 
-
admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA                                    
-lo              ethernet   UP          00:00:00:00:00:00
-                ipv4                   127.0.0.1/8 (static)
-                ipv6                   ::1/128 (static)
+
admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA                                    
+lo              ethernet      UP          00:00:00:00:00:00
+                ipv4                      127.0.0.1/8 (static)
+                ipv6                      ::1/128 (static)
 .
 .
 .
-lag0            lag        UP          lacp: active, rate: fast (1s), hash: layer2
-│               ethernet   UP          00:a0:85:00:02:00
-├ eth7          lag        ACTIVE      active, short_timeout, aggregating, in_sync, collecting, distributing
-└ eth8          lag        ACTIVE      active, short_timeout, aggregating, in_sync, collecting, distributing
+lag0            lag           UP          lacp: active, rate: fast (1s), hash: layer2
+│               ethernet      UP          00:a0:85:00:02:00
+├ eth7          lag           ACTIVE      active, short_timeout, aggregating, in_sync, collecting, distributing
+└ eth8          lag           ACTIVE      active, short_timeout, aggregating, in_sync, collecting, distributing
 

 
 
diff --git a/doc/management.md b/doc/management.md
index 2a75214c..677fd996 100644
--- a/doc/management.md
+++ b/doc/management.md
@@ -109,13 +109,13 @@ CLI can be entered from shell in the same way as for SSH.
 
 See the 'help' command for an introduction to the system
 
-admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA                                    
-lo              ethernet   UP          00:00:00:00:00:00
+admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA                                    
+lo              ethernet      UP          00:00:00:00:00:00
                 ipv4                   127.0.0.1/8 (static)
                 ipv6                   ::1/128 (static)
-e1              ethernet   LOWER-DOWN  00:53:00:06:03:01
-e2              ethernet   LOWER-DOWN  00:53:00:06:03:02
+e1              ethernet      LOWER-DOWN  00:53:00:06:03:01
+e2              ethernet      LOWER-DOWN  00:53:00:06:03:02
 ...
 admin@example:/>
 

diff --git a/doc/scripting-prod.md b/doc/scripting-prod.md
index 70fd1da4..7379636f 100644
--- a/doc/scripting-prod.md
+++ b/doc/scripting-prod.md
@@ -39,20 +39,20 @@ Starting out, we assume a configuration where all ports are network
 interfaces (possibly with IPv6 enabled).
 
 ```
-admin@example:/> show interfaces
-lo              ethernet   UP          00:00:00:00:00:00
+admin@example:/> show interface
+lo              ethernet      UP          00:00:00:00:00:00
                 ipv4                   127.0.0.1/8 (static)
                 ipv6                   ::1/128 (static)
-e1              ethernet   LOWER-DOWN  00:53:00:06:11:01
-e2              ethernet   LOWER-DOWN  00:53:00:06:11:02
-e3              ethernet   LOWER-DOWN  00:53:00:06:11:03
-e4              ethernet   LOWER-DOWN  00:53:00:06:11:04
-e5              ethernet   LOWER-DOWN  00:53:00:06:11:05
-e6              ethernet   LOWER-DOWN  00:53:00:06:11:06
-e7              ethernet   LOWER-DOWN  00:53:00:06:11:07
-e8              ethernet   LOWER-DOWN  00:53:00:06:11:08
-e9              ethernet   LOWER-DOWN  00:53:00:06:11:09
-e10             ethernet   UP          00:53:00:06:11:0a
+e1              ethernet      LOWER-DOWN  00:53:00:06:11:01
+e2              ethernet      LOWER-DOWN  00:53:00:06:11:02
+e3              ethernet      LOWER-DOWN  00:53:00:06:11:03
+e4              ethernet      LOWER-DOWN  00:53:00:06:11:04
+e5              ethernet      LOWER-DOWN  00:53:00:06:11:05
+e6              ethernet      LOWER-DOWN  00:53:00:06:11:06
+e7              ethernet      LOWER-DOWN  00:53:00:06:11:07
+e8              ethernet      LOWER-DOWN  00:53:00:06:11:08
+e9              ethernet      LOWER-DOWN  00:53:00:06:11:09
+e10             ethernet      UP          00:53:00:06:11:0a
                 ipv6                   fe80::0053:00ff:fe06:110a/64 (link-layer)
 admin@example:/>
 ```
@@ -80,7 +80,7 @@ admin@example:/config/> set interface e10 bridge-port bridge br0
 admin@example:/config/>
 ```
 
-The interface status can be viewed using `show interfaces` after leaving
+The interface status can be viewed using `show interface` after leaving
 configuration context.  When configuring via SSH, first assign an IP
 address to `br0` *before leaving* configuration context, e.g.
 
@@ -95,10 +95,10 @@ setup, including [setting IP address](#set-ip-address).
 ```
 admin@example:/config/> leave
 admin@example:/>
-admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA
+admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA
 br0             bridge
-│               ethernet   UP          00:53:00:06:11:01
+│               ethernet      UP          00:53:00:06:11:01
 ├ e1            bridge     LOWER-DOWN
 ├ e2            bridge     LOWER-DOWN
 ├ e3            bridge     LOWER-DOWN
@@ -109,7 +109,7 @@ br0             bridge
 ├ e8            bridge     LOWER-DOWN
 ├ e9            bridge     LOWER-DOWN
 └ e10           bridge     FORWARDING
-lo              ethernet   UP          00:00:00:00:00:00
+lo              ethernet      UP          00:00:00:00:00:00
                 ipv4                   127.0.0.1/8 (static)
                 ipv6                   ::1/128 (static)
 admin@example:/>
@@ -154,21 +154,21 @@ admin@example:/>
 Interface status would now should something like the following
 
 ```
-admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA
+admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA
 br0             bridge
-│               ethernet   UP          00:53:00:06:11:01
-├ e1            bridge     LOWER-DOWN  vlan:10u pvid:10
-├ e2            bridge     LOWER-DOWN  vlan:10u pvid:10
-├ e3            bridge     LOWER-DOWN  vlan:20u pvid:20
-├ e4            bridge     LOWER-DOWN  vlan:20u pvid:20
-├ e5            bridge     LOWER-DOWN  vlan:30u pvid:30
-├ e6            bridge     LOWER-DOWN  vlan:30u pvid:30
-├ e7            bridge     LOWER-DOWN  vlan:40u pvid:40
-├ e8            bridge     LOWER-DOWN  vlan:40u pvid:40
-├ e9            bridge     LOWER-DOWN  vlan:50u pvid:50
-└ e10           bridge     FORWARDING  vlan:50u pvid:50
-lo              ethernet   UP          00:00:00:00:00:00
+│               ethernet      UP          00:53:00:06:11:01
+├ e1            bridge     LOWER-DOWN  vlan:10u pvid: 10
+├ e2            bridge     LOWER-DOWN  vlan:10u pvid: 10
+├ e3            bridge     LOWER-DOWN  vlan:20u pvid: 20
+├ e4            bridge     LOWER-DOWN  vlan:20u pvid: 20
+├ e5            bridge     LOWER-DOWN  vlan:30u pvid: 30
+├ e6            bridge     LOWER-DOWN  vlan:30u pvid: 30
+├ e7            bridge     LOWER-DOWN  vlan:40u pvid: 40
+├ e8            bridge     LOWER-DOWN  vlan:40u pvid: 40
+├ e9            bridge     LOWER-DOWN  vlan:50u pvid: 50
+└ e10           bridge     FORWARDING  vlan:50u pvid: 50
+lo              ethernet      UP          00:00:00:00:00:00
                 ipv4                   127.0.0.1/8 (static)
                 ipv6                   ::1/128 (static)
 admin@example:/>
@@ -181,21 +181,21 @@ patched according to [above](#vlan-snake).  We should see link up and
 *FORWARDING* on all ports in the bridge.
 
 ```
-admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA
+admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA
 br0             bridge
-│               ethernet   UP          00:53:00:06:11:01
-├ e1            bridge     FORWARDING  vlan:10u pvid:10
-├ e2            bridge     FORWARDING  vlan:10u pvid:10
-├ e3            bridge     FORWARDING  vlan:20u pvid:20
-├ e4            bridge     FORWARDING  vlan:20u pvid:20
-├ e5            bridge     FORWARDING  vlan:30u pvid:30
-├ e6            bridge     FORWARDING  vlan:30u pvid:30
-├ e7            bridge     FORWARDING  vlan:40u pvid:40
-├ e8            bridge     FORWARDING  vlan:40u pvid:40
-├ e9            bridge     FORWARDING  vlan:50u pvid:50
-└ e10           bridge     FORWARDING  vlan:50u pvid:50
-lo              ethernet   UP          00:00:00:00:00:00
+│               ethernet      UP          00:53:00:06:11:01
+├ e1            bridge     FORWARDING  vlan:10u pvid: 10
+├ e2            bridge     FORWARDING  vlan:10u pvid: 10
+├ e3            bridge     FORWARDING  vlan:20u pvid: 20
+├ e4            bridge     FORWARDING  vlan:20u pvid: 20
+├ e5            bridge     FORWARDING  vlan:30u pvid: 30
+├ e6            bridge     FORWARDING  vlan:30u pvid: 30
+├ e7            bridge     FORWARDING  vlan:40u pvid: 40
+├ e8            bridge     FORWARDING  vlan:40u pvid: 40
+├ e9            bridge     FORWARDING  vlan:50u pvid: 50
+└ e10           bridge     FORWARDING  vlan:50u pvid: 50
+lo              ethernet      UP          00:00:00:00:00:00
                 ipv4                   127.0.0.1/8 (static)
                 ipv6                   ::1/128 (static)
 admin@example:/>
@@ -284,26 +284,26 @@ admin@example:/>
 Interface *vlan10* with an auto-configured IPv6 address should appear.
 
 ```
-admin@example:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA
+admin@example:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA
 br0             bridge                 vlan:10t
-│               ethernet   UP          00:53:00:06:11:01
-├ e1            bridge     FORWARDING  vlan:10u pvid:10
-├ e2            bridge     FORWARDING  vlan:10u pvid:10
-├ e3            bridge     FORWARDING  vlan:20u pvid:20
-├ e4            bridge     FORWARDING  vlan:20u pvid:20
-├ e5            bridge     FORWARDING  vlan:30u pvid:30
-├ e6            bridge     FORWARDING  vlan:30u pvid:30
-├ e7            bridge     FORWARDING  vlan:40u pvid:40
-├ e8            bridge     FORWARDING  vlan:40u pvid:40
-├ e9            bridge     FORWARDING  vlan:50u pvid:50
-└ e10           bridge     FORWARDING  vlan:50u pvid:50
-lo              ethernet   UP          00:00:00:00:00:00
+│               ethernet      UP          00:53:00:06:11:01
+├ e1            bridge     FORWARDING  vlan:10u pvid: 10
+├ e2            bridge     FORWARDING  vlan:10u pvid: 10
+├ e3            bridge     FORWARDING  vlan:20u pvid: 20
+├ e4            bridge     FORWARDING  vlan:20u pvid: 20
+├ e5            bridge     FORWARDING  vlan:30u pvid: 30
+├ e6            bridge     FORWARDING  vlan:30u pvid: 30
+├ e7            bridge     FORWARDING  vlan:40u pvid: 40
+├ e8            bridge     FORWARDING  vlan:40u pvid: 40
+├ e9            bridge     FORWARDING  vlan:50u pvid: 50
+└ e10           bridge     FORWARDING  vlan:50u pvid: 50
+lo              ethernet      UP          00:00:00:00:00:00
                 ipv4                   127.0.0.1/8 (static)
                 ipv6                   ::1/128 (static)
-vlan10          ethernet   UP          00:53:00:06:11:01
+vlan10          ethernet      UP          00:53:00:06:11:01
 │               ipv6                   fe80::0053:00ff:fe06:1101/64 (link-layer)
-└ br0           ethernet   UP          00:53:00:06:11:01
+└ br0           ethernet      UP          00:53:00:06:11:01
 admin@example:/>
 ```
 
diff --git a/doc/vpn-wireguard.md b/doc/vpn-wireguard.md
index 10255847..8db1e4e4 100644
--- a/doc/vpn-wireguard.md
+++ b/doc/vpn-wireguard.md
@@ -345,12 +345,12 @@ tunnel endpoints use IPv4 or IPv6.
 
 Check WireGuard interface status and peer connections:
 
-
admin@example:/> show interfaces
+
admin@example:/> show interface
 wg0             wireguard  UP          2 peers (1 up)
                 ipv4                   10.0.0.1/24 (static)
                 ipv6                   fd00::1/64 (static)
 
-admin@example:/> show interfaces wg0
+admin@example:/> show interface wg0
 name                : wg0
 type                : wireguard
 index               : 12
diff --git a/src/landing/index.html b/src/landing/index.html
index 2a0a4ec5..e481dfe1 100644
--- a/src/landing/index.html
+++ b/src/landing/index.html
@@ -106,14 +106,15 @@ interfaces {
   }
 }
 admin@infix-12-34-56:/config/interface/eth0/> leave
-admin@infix-12-34-56:/> show interfaces
-INTERFACE       PROTOCOL   STATE       DATA
-eth0            ethernet   UP          52:54:00:12:34:56
-                ipv4                   192.168.2.200/24 (static)
-                ipv6                   fe80::5054:ff:fe12:3456/64 (link-layer)
-lo              ethernet   UP          00:00:00:00:00:00
-                ipv4                   127.0.0.1/8 (static)
-                ipv6                   ::1/128 (static)
+admin@infix-12-34-56:/> show interface
+INTERFACE       PROTOCOL      STATE       DATA
+eth0            1000baseT     UP          duplex: full
+                ethernet                  52:54:00:12:34:56
+                ipv4                      192.168.2.200/24 (static)
+                ipv6                      fe80::5054:ff:fe12:3456/64 (link-layer)
+lo              loopback      UP
+                ipv4                      127.0.0.1/8 (static)
+                ipv6                      ::1/128 (static)
 admin@infix-12-34-56:/> copy running-config startup-config

 Click here for more details.