From b651b05e49eb0217d300145e6d8859f705dc6f1d Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Mon, 4 Jul 2022 20:13:46 +0200
Subject: [PATCH] VPN: OpenVPN: Client Specific Overrides - Align help text to
 logic underneath. for https://github.com/opnsense/core/issues/5852

---
 src/www/vpn_openvpn_csc.php | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/www/vpn_openvpn_csc.php b/src/www/vpn_openvpn_csc.php
index ba537d68a..d441e8787 100644
--- a/src/www/vpn_openvpn_csc.php
+++ b/src/www/vpn_openvpn_csc.php
@@ -463,13 +463,16 @@ include("fbegin.inc");
                     <td>
                       <input name="tunnel_network" type="text" size="20" value="<?=$pconfig['tunnel_network'];?>" />
                       <div class="hidden" data-for="help_for_tunnel_network">
-                        <?=gettext("This is the IPv4 virtual network used for private " .
-                                                "communications between this client and the " .
-                                                "server expressed using CIDR (eg. 10.0.8.0/24). " .
-                                                "The first network address is assumed to be the " .
-                                                "server address and the second network address " .
-                                                "will be assigned to the client virtual " .
-                                                "interface"); ?>.
+                        <?=sprintf(
+                            gettext(
+                              "This defines the %s network used for this client in CIDR format, the addressing depends on ".
+                              "the device mode (tun, tap) and the choice for topology. <br/><br/>".
+                              "When topology is unset for a server in tun mode, the  first network address is ".
+                              "assumed to be the server address and the second network address will be assigned to the client virtual ".
+                              "interface. </br><br/>".
+                              "Otherwise the configured address is used for this clients virtual interface using the configured netmask."
+                            ),
+                            gettext("IPv4"));?>
                       </div>
                     </td>
                   </tr>
@@ -478,13 +481,16 @@ include("fbegin.inc");
                     <td>
                       <input name="tunnel_networkv6" type="text" value="<?=$pconfig['tunnel_networkv6'];?>" />
                       <div class="hidden" data-for="help_for_tunnel_networkv6">
-                          <?=gettext("This is the IPv6 virtual network used for private " .
-                                                "communications between this server and client " .
-                                                "hosts expressed using CIDR (eg. fe80::/64). " .
-                                                "The first network address will be assigned to " .
-                                                "the server virtual interface. The remaining " .
-                                                "network addresses can optionally be assigned " .
-                                                "to connecting clients. (see Address Pool)"); ?>
+                        <?=sprintf(
+                            gettext(
+                              "This defines the %s network used for this client in CIDR format, the addressing depends on ".
+                              "the device mode (tun, tap) and the choice for topology. <br/><br/>".
+                              "When topology is unset for a server in tun mode, the  first network address is ".
+                              "assumed to be the server address and the second network address will be assigned to the client virtual ".
+                              "interface. </br><br/>".
+                              "Otherwise the configured address is used for this clients virtual interface using the configured netmask."
+                            ),
+                            gettext("IPv6"));?>
                       </div>
                     </td>
                   </tr>