Merge pull request #742 from erkin/current

op-mode: Correct help messages

4 files changed, 30 insertions, 30 deletions

diff --git a/op-mode-definitions/ipoe-server.xml.in b/op-mode-definitions/ipoe-server.xml.in
index 18178f0b0..89cefa08d 100644
--- a/op-mode-definitions/ipoe-server.xml.in
+++ b/op-mode-definitions/ipoe-server.xml.in
@@ -4,17 +4,17 @@
     <children>
       <node name="ipoe-server">
         <properties>
-          <help>Clear ipoe-server sessions or process</help>
+          <help>Clear IPoE server sessions or process</help>
         </properties>
         <children>
           <node name="session">
             <properties>
-              <help>Clear ipoe-server session</help>
+              <help>Clear IPoE server session</help>
             </properties>
             <children>
               <tagNode name="username">
                 <properties>
-                  <help>Clear ipoe-server session by username</help>
+                  <help>Clear IPoE server session by username</help>
                   <completionHelp>
                     <script>${vyos_completion_dir}/list_ipoe.py --selector="username"</script>
                   </completionHelp>
@@ -23,7 +23,7 @@
               </tagNode>
               <tagNode name="sid">
                 <properties>
-                  <help>Clear ipoe-server session by Session ID</help>
+                  <help>Clear IPoE server session by Session ID</help>
                   <completionHelp>
                     <script>${vyos_completion_dir}/list_ipoe.py --selector="sid"</script>
                   </completionHelp>
@@ -32,7 +32,7 @@
               </tagNode>
               <tagNode name="interface">
                 <properties>
-                  <help>Clear ipoe-server session by interface</help>
+                  <help>Clear IPoE server session by interface</help>
                   <completionHelp>
                     <script>${vyos_completion_dir}/list_ipoe.py --selector="ifname"</script>
                   </completionHelp>
@@ -49,7 +49,7 @@
     <children>
       <node name="ipoe-server">
         <properties>
-          <help>show ipoe-server status</help>
+          <help>Show IPoE server status</help>
         </properties>
         <children>
           <leafNode name="sessions">
diff --git a/op-mode-definitions/openconnect.xml.in b/op-mode-definitions/openconnect.xml.in
index 9b82b114e..36f23239e 100644
--- a/op-mode-definitions/openconnect.xml.in
+++ b/op-mode-definitions/openconnect.xml.in
@@ -4,12 +4,12 @@
     <children>
       <node name="openconnect-server">
         <properties>
-          <help>show openconnect-server information</help>
+          <help>Show OpenConnect server information</help>
         </properties>
         <children>
           <leafNode name="sessions">
             <properties>
-              <help>Show active openconnect server sessions</help>
+              <help>Show active OpenConnect server sessions</help>
             </properties>
             <command>${vyos_op_scripts_dir}/openconnect-control.py --action="show_sessions"</command>
           </leafNode>
diff --git a/op-mode-definitions/pppoe-server.xml.in b/op-mode-definitions/pppoe-server.xml.in
index 6d89b3e77..6efdc5a48 100644
--- a/op-mode-definitions/pppoe-server.xml.in
+++ b/op-mode-definitions/pppoe-server.xml.in
@@ -4,7 +4,7 @@
     <children>
       <node name="pppoe-server">
         <properties>
-          <help>Show pppoe-server status</help>
+          <help>Show PPPoE server status</help>
         </properties>
         <children>
           <leafNode name="sessions">
@@ -21,7 +21,7 @@
           </leafNode>
           <leafNode name="interfaces">
             <properties>
-              <help>Show interfaces where pppoe-server listens on</help>
+              <help>Show interfaces where PPPoE server listens on</help>
             </properties>
             <command>${vyos_op_scripts_dir}/ppp-server-ctrl.py --proto="pppoe" --action="pppoe interface show"</command>
           </leafNode>
@@ -51,13 +51,13 @@
         <children>
           <leafNode name="all">
             <properties>
-              <help>Terminate all pppoe-server users</help>
+              <help>Terminate all PPPoE server users</help>
             </properties>
             <command>${vyos_op_scripts_dir}/ppp-server-ctrl.py --proto="pppoe" --action="terminate all"</command>
           </leafNode>
           <tagNode name="interface">
             <properties>
-              <help>Terminate a ppp interface</help>
+              <help>Terminate a PPP interface</help>
             </properties>
             <command>${vyos_op_scripts_dir}/ppp-server-ctrl.py --proto="pppoe" --action="terminate if $4"</command>
           </tagNode>
@@ -85,7 +85,7 @@
             <children>
               <leafNode name="enable">
                 <properties>
-                  <help>Deny new connections and stop to serve pppoe after disconnect last session</help>
+                  <help>Deny new connections and stop serving PPPoE after disconnecting the last session</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/ppp-server-ctrl.py --proto="pppoe" --action="shutdown soft"</command>
               </leafNode>
diff --git a/op-mode-definitions/wireguard.xml.in b/op-mode-definitions/wireguard.xml.in
index 69ba8043d..4aee4b1ac 100644
--- a/op-mode-definitions/wireguard.xml.in
+++ b/op-mode-definitions/wireguard.xml.in
@@ -1,28 +1,28 @@
 <?xml version="1.0"?>
-<!-- wireguard key management -->
+<!-- Wireguard key management -->
 <interfaceDefinition>
   <node name="generate">
     <children>
       <node name="wireguard">
         <properties>
-          <help>wireguard key generation utility</help>
+          <help>Generate Wireguard keys</help>
         </properties>
         <children>
           <leafNode name="default-keypair">
             <properties>
-              <help>generates the wireguard default-keypair</help>
+              <help>Generate the default Wireguard keypair</help>
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/wireguard.py --genkey</command>
           </leafNode>
           <leafNode name="preshared-key">
             <properties>
-              <help>generate a wireguard preshared key</help>
+              <help>Generate a Wireguard preshared key</help>
             </properties>
             <command>${vyos_op_scripts_dir}/wireguard.py --genpsk</command>
           </leafNode>
           <tagNode name="named-keypairs">
             <properties>
-              <help>Generates named wireguard keypairs</help>
+              <help>Generate specified Wireguard keypairs</help>
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/wireguard.py --genkey --location "$4"</command>
           </tagNode>
@@ -34,17 +34,17 @@
     <children>
       <node name="wireguard">
         <properties>
-          <help>Show wireguard properties</help>
+          <help>Show Wireguard properties</help>
         </properties>
         <children>
           <node name="keypairs">
             <properties>
-              <help>Shows named wireguard keys</help>
+              <help>Show Wireguard keys</help>
             </properties>
             <children>
               <tagNode name="pubkey">
                 <properties>
-                  <help>Show wireguard private named key</help>
+                  <help>Show specified Wireguard public key</help>
                   <completionHelp>
                     <script>${vyos_op_scripts_dir}/wireguard.py --listkdir</script>
                   </completionHelp>
@@ -53,7 +53,7 @@
               </tagNode>
               <tagNode name="privkey">
                 <properties>
-                  <help>Show wireguard public named key</help>
+                  <help>Show specified Wireguard private key</help>
                   <completionHelp>
                     <script>${vyos_op_scripts_dir}/wireguard.py --listkdir</script>
                   </completionHelp>
@@ -68,7 +68,7 @@
         <children>
           <tagNode name="wireguard">
             <properties>
-              <help>show wireguard interface information</help>
+              <help>Show Wireguard interface information</help>
               <completionHelp>
                 <script>${vyos_completion_dir}/list_interfaces.py --type wireguard</script>
               </completionHelp>
@@ -77,19 +77,19 @@
             <children>
               <leafNode name="allowed-ips">
                 <properties>
-                  <help>show all allowed-ips for the specified interface</help>
+                  <help>Show all IP addresses allowed for the specified interface</help>
                 </properties>
                 <command>sudo wg show "$4" allowed-ips</command>
               </leafNode>
               <leafNode name="endpoints">
                 <properties>
-                  <help>show all endpoints for the specified interface</help>
+                  <help>Show all endpoints for the specified interface</help>
                 </properties>
                 <command>sudo wg show "$4" endpoints</command>
               </leafNode>
               <leafNode name="peers">
                 <properties>
-                  <help>show all peer IDs for the specified interface</help>
+                  <help>Show all peer IDs for the specified interface</help>
                 </properties>
                 <command>sudo wg show "$4" peers</command>
               </leafNode>
@@ -98,13 +98,13 @@
           </tagNode>
           <node name="wireguard">
             <properties>
-              <help>Show wireguard interface information</help>
+              <help>Show Wireguard interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireguard --action=show-brief</command>
             <children>
               <leafNode name="detail">
                 <properties>
-                  <help>Show detailed wireguard interface information</help>
+                  <help>Show detailed Wireguard interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireguard --action=show</command>
               </leafNode>
@@ -118,12 +118,12 @@
     <children>
       <node name="wireguard">
         <properties>
-          <help>Delete wireguard properties</help>
+          <help>Delete Wireguard properties</help>
         </properties>
         <children>
           <tagNode name="keypair">
             <properties>
-              <help>Delete a wireguard keypair</help>
+              <help>Delete a Wireguard keypair</help>
               <completionHelp>
                 <script>${vyos_op_scripts_dir}/wireguard.py --listkdir</script>
               </completionHelp>