From 9f312bf1e58efc64ed2800ffc9a6d2aa1df22fc1 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Sun, 11 Nov 2018 18:30:51 +0100
Subject: [PATCH] net/haproxy: fixes for #970

---
 .../app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml    | 2 +-
 .../mvc/app/controllers/OPNsense/HAProxy/forms/dialogUser.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
index 744615c4a..e00da8571 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
@@ -232,7 +232,7 @@
         <id>backend.basicAuthEnabled</id>
         <label>Enable</label>
         <type>checkbox</type>
-        <help><![CDATA[Enable HTTP Basic Authentication.]]></help>
+        <help>Enable HTTP Basic Authentication.</help>
     </field>
     <field>
         <id>backend.basicAuthUsers</id>
diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogUser.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogUser.xml
index 000bd9a65..7644058ee 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogUser.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogUser.xml
@@ -21,6 +21,6 @@
         <id>user.password</id>
         <label>Password</label>
         <type>password</type>
-        <help><![CDATA[Both secure (encrypted) and insecure (unencrypted) passwords can be used. Most systems support MD5, SHA-256, SHA-512, and, of course, the classic DES-based method of encrypting passwords.<br/><div class="text-info"><b>NOTE:</b> Avoid using unencrypted passwords that start with a $-sign, because this indicates an encrypted password and will make it impossible to authenticate.</div>]]></help>
+        <help><![CDATA[Both encrypted and unencrypted passwords can be used. Most systems support MD5, SHA-256, SHA-512, and, of course, the classic DES-based method of encrypting passwords.<br/><div class="text-info"><b>NOTE:</b> Avoid using unencrypted passwords that start with a $-sign, because this indicates an encrypted password and will make it impossible to authenticate.</div>]]></help>
     </field>
 </form>