diff --git a/interface-definitions/system_frr.xml.in b/interface-definitions/system_frr.xml.in
index 76001b392..28242dfe4 100644
--- a/interface-definitions/system_frr.xml.in
+++ b/interface-definitions/system_frr.xml.in
@@ -1,91 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<interfaceDefinition>
<node name="system">
<children>
<node name="frr" owner="${vyos_conf_scripts_dir}/system_frr.py">
<properties>
- <help>Configure FRR parameters</help>
+ <help>Configure FRRouting parameters</help>
<!-- Before components that use FRR -->
<priority>150</priority>
</properties>
<children>
<leafNode name="bmp">
<properties>
<help>Enable BGP Monitoring Protocol support</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="descriptors">
<properties>
<help>Number of open file descriptors a process is allowed to use</help>
<valueHelp>
<format>u32:1024-8192</format>
<description>Number of file descriptors</description>
</valueHelp>
<constraint>
<validator name="numeric" argument="--range 1024-8192"/>
</constraint>
<constraintErrorMessage>Port number must be in range 1024 to 8192</constraintErrorMessage>
</properties>
<defaultValue>1024</defaultValue>
</leafNode>
<leafNode name="irdp">
<properties>
<help>Enable ICMP Router Discovery Protocol support</help>
<valueless/>
</properties>
</leafNode>
<node name="snmp">
<properties>
<help>Enable SNMP integration for next daemons</help>
</properties>
<children>
<leafNode name="bgpd">
<properties>
<help>BGP</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="isisd">
<properties>
<help>IS-IS</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="ldpd">
<properties>
<help>LDP</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="ospf6d">
<properties>
<help>OSPFv3</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="ospfd">
<properties>
<help>OSPFv2</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="ripd">
<properties>
<help>RIP</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="zebra">
<properties>
<help>Zebra (IP routing manager)</help>
<valueless/>
</properties>
</leafNode>
</children>
</node>
</children>
</node>
</children>
</node>
</interfaceDefinition>
diff --git a/op-mode-definitions/show-system.xml.in b/op-mode-definitions/show-system.xml.in
index 116c7460f..6873b816b 100644
--- a/op-mode-definitions/show-system.xml.in
+++ b/op-mode-definitions/show-system.xml.in
@@ -1,268 +1,268 @@
<?xml version="1.0"?>
<interfaceDefinition>
<node name="show">
<children>
<node name="system">
<properties>
<help>Show system information</help>
</properties>
<children>
<node name="commit">
<properties>
<help>Show commit revision log</help>
</properties>
<command>${vyos_op_scripts_dir}/config_mgmt.py show_commit_log</command>
<children>
<tagNode name="diff">
<properties>
<help>Show commit revision diff</help>
</properties>
<command>${vyos_op_scripts_dir}/config_mgmt.py show_commit_diff --rev "$5"</command>
</tagNode>
<tagNode name="file">
<properties>
<help>Show commit revision file</help>
</properties>
<command>${vyos_op_scripts_dir}/config_mgmt.py show_commit_file --rev "$5"</command>
<children>
<tagNode name="compare">
<properties>
<help>Compare config file revisions</help>
</properties>
<command>${vyos_op_scripts_dir}/config_mgmt.py show_commit_diff --rev "$5" --rev2 "$7"</command>
<children>
<leafNode name="commands">
<properties>
<help>Compare config file revision commands</help>
</properties>
<command>${vyos_op_scripts_dir}/config_mgmt.py show_commit_diff --rev "$5" --rev2 "$7" --commands</command>
</leafNode>
</children>
</tagNode>
</children>
</tagNode>
</children>
</node>
<node name="connections">
<properties>
<help>Show active network connections on the system</help>
</properties>
<command>netstat -an</command>
<children>
<node name="tcp">
<properties>
<help>Show TCP connection information</help>
</properties>
<command>ss -t -r</command>
<children>
<leafNode name="all">
<properties>
<help>Show all TCP connections</help>
</properties>
<command>ss -t -a</command>
</leafNode>
<leafNode name="numeric">
<properties>
<help>Show TCP connection without resolving names</help>
</properties>
<command>ss -t -n</command>
</leafNode>
</children>
</node>
<node name="udp">
<properties>
<help>Show UDP socket information</help>
</properties>
<command>ss -u -a -r</command>
<children>
<leafNode name="numeric">
<properties>
<help>Show UDP socket information without resolving names</help>
</properties>
<command>ss -u -a -n</command>
</leafNode>
</children>
</node>
</children>
</node>
<leafNode name="cpu">
<properties>
<help>Show CPU information</help>
</properties>
<command>${vyos_op_scripts_dir}/cpu.py show</command>
</leafNode>
<leafNode name="kernel-messages">
<properties>
<help>Show messages in kernel ring buffer</help>
</properties>
<command>sudo dmesg</command>
</leafNode>
<node name="login">
<properties>
<help>Show user accounts</help>
</properties>
<children>
<node name="authentication">
<properties>
<help>Show user account authentication information</help>
</properties>
<children>
<tagNode name="user">
<properties>
<help>Show configured user</help>
<completionHelp>
<path>system login user</path>
</completionHelp>
</properties>
<children>
<node name="otp">
<properties>
<help>Show OTP key information</help>
</properties>
<command>${vyos_op_scripts_dir}/otp.py show_login --username="$6" --info="full"</command>
<children>
<leafNode name="full">
<properties>
<help>Show full settings, including QR code and commands for VyOS</help>
</properties>
<command>${vyos_op_scripts_dir}/otp.py show_login --username="$6" --info="full"</command>
</leafNode>
<leafNode name="key-b32">
<properties>
<help>Show OTP authentication secret in Base32 (used in mobile apps)</help>
</properties>
<command>${vyos_op_scripts_dir}/otp.py show_login --username="$6" --info="key-b32"</command>
</leafNode>
<leafNode name="qrcode">
<properties>
<help>Show OTP authentication QR code</help>
</properties>
<command>${vyos_op_scripts_dir}/otp.py show_login --username="$6" --info="qrcode"</command>
</leafNode>
<leafNode name="uri">
<properties>
<help>Show OTP authentication otpauth URI</help>
</properties>
<command>${vyos_op_scripts_dir}/otp.py show_login --username="$6" --info="uri"</command>
</leafNode>
</children>
</node>
</children>
</tagNode>
</children>
- </node>
+ </node>
<node name="users">
<properties>
<help>Show user account information</help>
</properties>
<command>${vyos_libexec_dir}/vyos-sudo.py ${vyos_op_scripts_dir}/show_users.py</command>
<children>
<leafNode name="all">
<properties>
<help>Show information about all accounts</help>
</properties>
<command>${vyos_libexec_dir}/vyos-sudo.py ${vyos_op_scripts_dir}/show_users.py all</command>
</leafNode>
<leafNode name="locked">
<properties>
<help>Show information about locked accounts</help>
</properties>
<command>${vyos_libexec_dir}/vyos-sudo.py ${vyos_op_scripts_dir}/show_users.py locked</command>
</leafNode>
<leafNode name="other">
<properties>
<help>Show information about non VyOS user accounts</help>
</properties>
<command>${vyos_libexec_dir}/vyos-sudo.py ${vyos_op_scripts_dir}/show_users.py other</command>
</leafNode>
<leafNode name="vyos">
<properties>
<help>Show information about VyOS user accounts</help>
</properties>
<command>${vyos_libexec_dir}/vyos-sudo.py ${vyos_op_scripts_dir}/show_users.py vyos</command>
</leafNode>
</children>
</node>
</children>
</node>
<node name="memory">
<properties>
<help>Show system memory usage</help>
</properties>
<command>${vyos_op_scripts_dir}/memory.py show</command>
<children>
<leafNode name="cache">
<properties>
<help>Show kernel cache information</help>
</properties>
<command>sudo slabtop -o</command>
</leafNode>
<leafNode name="detail">
<properties>
<help>Show detailed system memory usage</help>
</properties>
<command>cat /proc/meminfo</command>
</leafNode>
<leafNode name="routing-daemons">
<properties>
<help>Show memory usage of all routing protocols</help>
</properties>
<command>vtysh -c "show memory"</command>
</leafNode>
</children>
</node>
<node name="processes">
<properties>
<help>Show system processes</help>
</properties>
<command>ps ax</command>
<children>
<leafNode name="extensive">
<properties>
<help>Show extensive process info</help>
</properties>
<command>top -b -n1</command>
</leafNode>
<leafNode name="summary">
<properties>
<help>Show summary of system processes</help>
</properties>
<command>${vyos_op_scripts_dir}/uptime.py show</command>
</leafNode>
<leafNode name="tree">
<properties>
<help>Show process tree</help>
</properties>
<command>ps -ejH</command>
</leafNode>
</children>
</node>
<leafNode name="routing-daemons">
<properties>
- <help>Show Quagga routing daemons</help>
+ <help>Show FRRouting daemons</help>
</properties>
<command>vtysh -c "show daemons"</command>
</leafNode>
<leafNode name="storage">
<properties>
<help>Show filesystem usage</help>
</properties>
<command>${vyos_op_scripts_dir}/storage.py show</command>
</leafNode>
<leafNode name="updates">
<properties>
<help>Show system available updates</help>
</properties>
<command>${vyos_op_scripts_dir}/system.py show_update</command>
</leafNode>
<leafNode name="uptime">
<properties>
<help>Show system uptime and load averages</help>
</properties>
<command>${vyos_op_scripts_dir}/uptime.py show</command>
</leafNode>
</children>
</node>
</children>
</node>
</interfaceDefinition>
diff --git a/op-mode-definitions/show-version.xml.in b/op-mode-definitions/show-version.xml.in
index d9c4738af..36e68ff79 100644
--- a/op-mode-definitions/show-version.xml.in
+++ b/op-mode-definitions/show-version.xml.in
@@ -1,39 +1,39 @@
<?xml version="1.0"?>
<interfaceDefinition>
<node name="show">
<children>
<node name="version">
<properties>
<help>Show system version information</help>
</properties>
<command>sudo ${vyos_op_scripts_dir}/version.py show</command>
<children>
<leafNode name="funny">
<properties>
<help>Show system version and some fun stuff</help>
</properties>
<command>sudo ${vyos_op_scripts_dir}/version.py show --funny</command>
</leafNode>
<leafNode name="all">
<properties>
<help>Show system version and versions of all packages</help>
</properties>
<command>echo "Package versions:"; dpkg -l | cat</command>
</leafNode>
<leafNode name="frr">
<properties>
- <help>Show Quagga version information</help>
+ <help>Show FRRouting version information</help>
</properties>
<command>vtysh -c "show version"</command>
</leafNode>
<leafNode name="kernel">
<properties>
<help>Show Linux Kernel version information</help>
</properties>
<command>uname -r</command>
</leafNode>
</children>
</node>
</children>
</node>
</interfaceDefinition>