From 0bbe10d9e37e589570ad1d1fb17381951f3d4885 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Mon, 6 Nov 2017 00:00:36 +0100
Subject: [PATCH] net/haproxy: rephrase for clarity, refs #264

---
 .../app/controllers/OPNsense/HAProxy/forms/dialogAction.xml  | 5 ++++-
 .../src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml
index 5d7cda972..8935c7e6a 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml
@@ -64,8 +64,11 @@
         <id>action.use_server</id>
         <label>Use server</label>
         <type>dropdown</type>
-        <help><![CDATA[HAProxy will use this server if the condition evaluates to true.]]></help>
+        <help><![CDATA[HAProxy will use this server instead of other servers that are specified in the Backend Pool. The server must exist in the context where this rule is applied.]]></help>
     </field>
+    <field>
+        <label>NOTE: The specified server must be present in the Backend Pool where this rule is applied.</label>
+        <type>info</type>
     <field>
         <label>Parameters</label>
         <type>header</type>
diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
index 37af62cb1..5829d0c53 100644
--- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
+++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
@@ -1023,8 +1023,8 @@
                     <Required>Y</Required>
                     <!-- XXX TODO: use more user-friendly names instead of HAProxys option names -->
                     <OptionValues>
-                        <use_backend>Use specified backend</use_backend>
-                        <use_server>Use specified server</use_server>
+                        <use_backend>Use specified Backend Pool</use_backend>
+                        <use_server>Override server in Backend Pool</use_server>
                         <http-request_allow>http-request allow</http-request_allow>
                         <http-request_deny>http-request deny</http-request_deny>
                         <http-request_tarpit>http-request tarpit</http-request_tarpit>