17 files changed, 81 insertions, 80 deletions

diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php
index a8301b0..9707292 100644
--- a/src/usr/local/www/services_dhcp.php
+++ b/src/usr/local/www/services_dhcp.php
@@ -1058,8 +1058,8 @@ $section->addInput(new Form_Input(
 	'DDNS Domain',
 	'text',
 	$pconfig['ddnsdomain']
-))->setHelp('Leave blank to disable dynamic DNS registration.' . '<br />' .
-			'Enter the dynamic DNS domain which will be used to register client names in the DNS server.');
+))->setHelp('Leave blank to disable dynamic DNS registration.%1$s' .
+			'Enter the dynamic DNS domain which will be used to register client names in the DNS server.', '<br />');
 
 $section->addInput(new Form_Checkbox(
 	'ddnsforcehostname',
@@ -1272,7 +1272,7 @@ $section->addClass('adnlopts');
 $section->addInput(new Form_StaticText(
 	null,
 	'<div class="alert alert-info"> ' . gettext('Enter the DHCP option number and the value for each item to include in the DHCP lease information.') . ' ' .
-	sprintf(gettext('For a list of available options please visit this %1$s URL%2$s'), '<a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_blank">', '</a>.</div>')
+	sprintf(gettext('For a list of available options please visit this %1$s URL%2$s.%3$s'), '<a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_blank">', '</a>', '</div>')
 ));
 
 if (!$pconfig['numberoptions']) {
diff --git a/src/usr/local/www/services_dhcp_edit.php b/src/usr/local/www/services_dhcp_edit.php
index c347630..269acf4 100644
--- a/src/usr/local/www/services_dhcp_edit.php
+++ b/src/usr/local/www/services_dhcp_edit.php
@@ -443,8 +443,8 @@ $section->addInput(new Form_IpAddress(
 	'IP Address',
 	$pconfig['ipaddr'],
 	'V4'
-))->setHelp('If an IPv4 address is entered, the address must be outside of the pool.' . '<br />' .
-			'If no IPv4 address is given, one will be dynamically allocated from the pool.');
+))->setHelp('If an IPv4 address is entered, the address must be outside of the pool.%1$s' .
+			'If no IPv4 address is given, one will be dynamically allocated from the pool.', '<br />');
 
 $section->addInput(new Form_Input(
 	'hostname',
diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php
index a433698..a044a20 100644
--- a/src/usr/local/www/services_dhcpv6.php
+++ b/src/usr/local/www/services_dhcpv6.php
@@ -718,16 +718,16 @@ $section->addInput(new Form_Input(
 	'Default lease time',
 	'text',
 	$pconfig['deftime']
-))->setHelp('Lease time in seconds. Used for clients that do not ask for a specific expiration time. ' . ' <br />' .
-			'The default is 7200 seconds.');
+))->setHelp('Lease time in seconds. Used for clients that do not ask for a specific expiration time. %1$s' .
+			'The default is 7200 seconds.', '<br />');
 
 $section->addInput(new Form_Input(
 	'maxtime',
 	'Max lease time',
 	'text',
 	$pconfig['maxtime']
-))->setHelp('Maximum lease time for clients that ask for a specific expiration time.' . ' <br />' .
-			'The default is 86400 seconds.');
+))->setHelp('Maximum lease time for clients that ask for a specific expiration time. %1$s' .
+			'The default is 86400 seconds.', '<br />');
 
 $section->addInput(new Form_Checkbox(
 	'dhcpv6leaseinlocaltime',
diff --git a/src/usr/local/www/services_dhcpv6_edit.php b/src/usr/local/www/services_dhcpv6_edit.php
index ee354ff..09b3051 100644
--- a/src/usr/local/www/services_dhcpv6_edit.php
+++ b/src/usr/local/www/services_dhcpv6_edit.php
@@ -227,8 +227,8 @@ $section->addInput(new Form_Input(
 	'IPv6 address',
 	'text',
 	$pconfig['ipaddrv6']
-))->setHelp('If an IPv6 address is entered, the address must be outside of the pool.' . '<br />' .
-			'If no IPv6 address is given, one will be dynamically allocated from the pool.');
+))->setHelp('If an IPv6 address is entered, the address must be outside of the pool.%1$s' .
+			'If no IPv6 address is given, one will be dynamically allocated from the pool.', '<br />');
 
 $section->addInput(new Form_Input(
 	'hostname',
diff --git a/src/usr/local/www/services_dnsmasq.php b/src/usr/local/www/services_dnsmasq.php
index e964e07..090f54a 100644
--- a/src/usr/local/www/services_dnsmasq.php
+++ b/src/usr/local/www/services_dnsmasq.php
@@ -259,7 +259,7 @@ $section->addInput(new Form_Checkbox(
 			' their hostname when requesting a DHCP lease will be registered'.
 			' in the DNS forwarder, so that their name can be resolved.'.
 			' The domain in %1$sSystem: General Setup%2$s should also'.
-			' be set to the proper value.','<a href="system.php">','</a>')
+			' be set to the proper value.', '<a href="system.php">', '</a>')
 	->addClass('toggle-dhcp');
 
 $section->addInput(new Form_Checkbox(
@@ -270,7 +270,7 @@ $section->addInput(new Form_Checkbox(
 ))->setHelp('If this option is set, DHCP static mappings will '.
 					'be registered in the DNS forwarder, so that their name can be '.
 					'resolved. The domain in %1$sSystem: General Setup%2$s should also '.
-					'be set to the proper value.','<a href="system.php">','</a>')
+					'be set to the proper value.', '<a href="system.php">', '</a>')
 	->addClass('toggle-dhcp');
 
 $section->addInput(new Form_Checkbox(
@@ -290,9 +290,9 @@ $group->add(new Form_Checkbox(
 	'DNS Query Forwarding',
 	'Query DNS servers sequentially',
 	$pconfig['strict_order']
-))->setHelp("If this option is set %s DNS Forwarder (dnsmasq) will ".
-					"query the DNS servers sequentially in the order specified (<i>System - General Setup - DNS Servers</i>), ".
-					"rather than all at once in parallel. ", $g['product_name']);
+))->setHelp('If this option is set %1$s DNS Forwarder (dnsmasq) will '.
+					'query the DNS servers sequentially in the order specified (%2$sSystem - General Setup - DNS Servers%3$s), '.
+					'rather than all at once in parallel. ', $g['product_name'], '<i>', '</i>');
 
 $group->add(new Form_Checkbox(
 	'domain_needed',
@@ -340,8 +340,8 @@ $section->addInput(new Form_Checkbox(
 	'Strict interface binding',
 	$pconfig['strictbind']
 ))->setHelp('If this option is set, the DNS forwarder will only bind to the interfaces containing the IP addresses selected above, ' .
-					'rather than binding to all interfaces and discarding queries to other addresses.' . '<br /><br />' .
-					'This option does NOT work with IPv6. If set, dnsmasq will not bind to IPv6 addresses.');
+					'rather than binding to all interfaces and discarding queries to other addresses.%1$s' .
+					'This option does NOT work with IPv6. If set, dnsmasq will not bind to IPv6 addresses.', '<br /><br />');
 
 $section->addInput(new Form_Textarea(
 	'custom_options',
diff --git a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php
index 6df731c..4f6df88 100644
--- a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php
+++ b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php
@@ -135,18 +135,18 @@ $section->addInput(new Form_Input(
 	'*Domain',
 	'text',
 	$pconfig['domain']
-))->setHelp('Domain to override (NOTE: this does not have to be a valid TLD!)' . '<br />' .
-			'e.g.: test or mycompany.localdomain or 1.168.192.in-addr.arpa');
+))->setHelp('Domain to override (NOTE: this does not have to be a valid TLD!)%1$s' .
+			'e.g.: test or mycompany.localdomain or 1.168.192.in-addr.arpa', '<br />');
 
 $section->addInput(new Form_IpAddress(
 	'ip',
 	'*IP Address',
 	$pconfig['ip']
 ))->setPattern('[a-f0-9:.#!]*')
-  ->setHelp('IP address of the authoritative DNS server for this domain' . '<br />' .
-			'e.g.: 192.168.100.100' . '<br />' .
-			'Or enter # for an exclusion to pass through this host/subdomain to standard nameservers instead of a previous override.' . '<br />' .
-			'Or enter ! for lookups for this host/subdomain to NOT be forwarded anywhere.');
+  ->setHelp('IP address of the authoritative DNS server for this domain%1$s' .
+			'e.g.: 192.168.100.100%1$s' .
+			'Or enter # for an exclusion to pass through this host/subdomain to standard nameservers instead of a previous override.%1$s' .
+			'Or enter ! for lookups for this host/subdomain to NOT be forwarded anywhere.', '<br />');
 
 $section->addInput(new Form_IpAddress(
 	'dnssrcip',
diff --git a/src/usr/local/www/services_dnsmasq_edit.php b/src/usr/local/www/services_dnsmasq_edit.php
index ec27418..d6b58b2 100644
--- a/src/usr/local/www/services_dnsmasq_edit.php
+++ b/src/usr/local/www/services_dnsmasq_edit.php
@@ -200,23 +200,23 @@ $section->addInput(new Form_Input(
 	'Host',
 	'text',
 	$pconfig['host']
-))->setHelp('Name of the host, without the domain part' . '<br />' .
-			'e.g.: "myhost"');
+))->setHelp('Name of the host, without the domain part%1$s' .
+			'e.g.: "myhost"', '<br />');
 
 $section->addInput(new Form_Input(
 	'domain',
 	'*Domain',
 	'text',
 	$pconfig['domain']
-))->setHelp('Domain of the host' . '<br />' .
-			'e.g.: "example.com"');
+))->setHelp('Domain of the host%1$s' .
+			'e.g.: "example.com"', '<br />');
 
 $section->addInput(new Form_IpAddress(
 	'ip',
 	'*IP Address',
 	$pconfig['ip']
-))->setHelp('IP address of the host' . '<br />' .
-			'e.g.: 192.168.100.100 or fd00:abcd::1');
+))->setHelp('IP address of the host%1$s' .
+			'e.g.: 192.168.100.100 or fd00:abcd::1', '<br />');
 
 $section->addInput(new Form_Input(
 	'descr',
diff --git a/src/usr/local/www/services_dyndns.php b/src/usr/local/www/services_dyndns.php
index 49009c7..1178bc9 100644
--- a/src/usr/local/www/services_dyndns.php
+++ b/src/usr/local/www/services_dyndns.php
@@ -216,7 +216,7 @@ foreach ($a_dyndns as $dyndns):
 </nav>
 
 <div>
-	<?=gettext('IP addresses appearing in <span class="text-success">green</span> are up to date with Dynamic DNS provider. ')?>
+	<?=sprintf(gettext('IP addresses appearing in %1$sgreen%2$s are up to date with Dynamic DNS provider. '), '<span class="text-success">', '</span>')?>
 	<?=gettext('An update for an IP address can be forced on the edit page for that service.')?>
 </div>
 
diff --git a/src/usr/local/www/services_dyndns_edit.php b/src/usr/local/www/services_dyndns_edit.php
index 292590f..c14869e 100644
--- a/src/usr/local/www/services_dyndns_edit.php
+++ b/src/usr/local/www/services_dyndns_edit.php
@@ -298,11 +298,11 @@ $group->add(new Form_Input(
 	$pconfig['domainname']
 ));
 
-$group->setHelp('Enter the complete fully qualified domain name. Example: myhost.dyndns.org'. '<br />' .
-			'he.net tunnelbroker: Enter the tunnel ID.' . '<br />' .
-			'GleSYS: Enter the record ID.' . '<br />' .
-			'DNSimple: Enter only the domain name.' . '<br />' .
-			'Namecheap, Cloudflare, GratisDNS: Enter the hostname and the domain separately, with the domain being the domain or subdomain zone being handled by the provider.');
+$group->setHelp('Enter the complete fully qualified domain name. Example: myhost.dyndns.org%1$s' .
+			'he.net tunnelbroker: Enter the tunnel ID.%1$s' .
+			'GleSYS: Enter the record ID.%1$s' .
+			'DNSimple: Enter only the domain name.%1$s' .
+			'Namecheap, Cloudflare, GratisDNS: Enter the hostname and the domain separately, with the domain being the domain or subdomain zone being handled by the provider.', '<br />');
 
 $section->add($group);
 
@@ -356,28 +356,28 @@ $section->addInput(new Form_Input(
 	'Username',
 	'text',
 	$pconfig['username']
-))->setHelp('Username is required for all types except Namecheap, FreeDNS and Custom Entries.' . '<br />' .
-			'Route 53: Enter the Access Key ID.' . '<br />' .
-			'GleSYS: Enter the API user.' . '<br />' .
-			'For Custom Entries, Username and Password represent HTTP Authentication username and passwords.');
+))->setHelp('Username is required for all types except Namecheap, FreeDNS and Custom Entries.%1$s' .
+			'Route 53: Enter the Access Key ID.%1$s' .
+			'GleSYS: Enter the API user.%1$s' .
+			'For Custom Entries, Username and Password represent HTTP Authentication username and passwords.', '<br />');
 
 $section->addPassword(new Form_Input(
 	'passwordfld',
 	'Password',
 	'password',
 	$pconfig['password']
-))->setHelp('FreeDNS (freedns.afraid.org): Enter the "Authentication Token" provided by FreeDNS.' . '<br />' .
-			'Route 53: Enter the Secret Access Key.' . '<br />' .
-			'GleSYS: Enter the API key.' . '<br />' .
-			'DNSimple: Enter the API token.');
+))->setHelp('FreeDNS (freedns.afraid.org): Enter the "Authentication Token" provided by FreeDNS.%1$s' .
+			'Route 53: Enter the Secret Access Key.%1$s' .
+			'GleSYS: Enter the API key.%1$s' .
+			'DNSimple: Enter the API token.', '<br />');
 
 $section->addInput(new Form_Input(
 	'zoneid',
 	'Zone ID',
 	'text',
 	$pconfig['zoneid']
-))->setHelp('Route53: Enter AWS Region and Zone ID in the form REGION/ZONEID (example: "us-east-1/A1B2C3D4E5F6Z").' . '<br />' .
-			'DNSimple: Enter the Record ID of record to update.');
+))->setHelp('Route53: Enter AWS Region and Zone ID in the form REGION/ZONEID (example: "us-east-1/A1B2C3D4E5F6Z").%1$s' .
+			'DNSimple: Enter the Record ID of record to update.', '<br />');
 
 $section->addInput(new Form_Input(
 	'updateurl',
@@ -390,10 +390,10 @@ $section->addInput(new Form_Textarea(
 	'resultmatch',
 	'Result Match',
 	$pconfig['resultmatch']
-))->sethelp('This field should be identical to what the DDNS Provider will return if the update succeeds, leave it blank to disable checking of returned results.' . '<br />' .
-			'To include the new IP in the request, put %%IP%% in its place.' . '<br />' .
-			'To include multiple possible values, separate them with a |. If the provider includes a |, escape it with \\|)' . '<br />' .
-			'Tabs (\\t), newlines (\\n) and carriage returns (\\r) at the beginning or end of the returned results are removed before comparison.');
+))->sethelp('This field should be identical to what the DDNS Provider will return if the update succeeds, leave it blank to disable checking of returned results.%1$s' .
+			'To include the new IP in the request, put %%IP%% in its place.%1$s' .
+			'To include multiple possible values, separate them with a |. If the provider includes a |, escape it with \\|)%1$s' .
+			'Tabs (\\t), newlines (\\n) and carriage returns (\\r) at the beginning or end of the returned results are removed before comparison.', '<br />');
 
 $section->addInput(new Form_Input(
 	'ttl',
diff --git a/src/usr/local/www/services_igmpproxy_edit.php b/src/usr/local/www/services_igmpproxy_edit.php
index c28c5f5..e0abca1 100644
--- a/src/usr/local/www/services_igmpproxy_edit.php
+++ b/src/usr/local/www/services_igmpproxy_edit.php
@@ -171,9 +171,9 @@ $section->addInput(new Form_Select(
 	$pconfig['type'],
 	['upstream' => gettext('Upstream Interface'), 'downstream' => gettext('Downstream Interface')]
 ))->setHelp('The upstream network interface is the outgoing interface which is responsible for communicating to available multicast data sources. ' .
-			'There can only be one upstream interface.' . '<br />' .
+			'There can only be one upstream interface.%1$s' .
 			'Downstream network interfaces are the distribution	interfaces to the destination networks, where multicast clients can join groups and '.
-			'receive multicast data. One or more downstream interfaces must be configured.');
+			'receive multicast data. One or more downstream interfaces must be configured.', '<br />');
 
 $section->addInput(new Form_Input(
 	'threshold',
diff --git a/src/usr/local/www/services_ntpd.php b/src/usr/local/www/services_ntpd.php
index 9c40909..a5fc9f4 100644
--- a/src/usr/local/www/services_ntpd.php
+++ b/src/usr/local/www/services_ntpd.php
@@ -218,9 +218,9 @@ $section->addInput(new Form_Select(
 	$iflist['selected'],
 	$iflist['options'],
 	true
-))->setHelp('Interfaces without an IP address will not be shown.' . '<br />' .
-			'Selecting no interfaces will listen on all interfaces with a wildcard.' . '<br />' .
-			'Selecting all interfaces will explicitly listen on only the interfaces/IPs specified.');
+))->setHelp('Interfaces without an IP address will not be shown.%1$s' .
+			'Selecting no interfaces will listen on all interfaces with a wildcard.%1$s' .
+			'Selecting all interfaces will explicitly listen on only the interfaces/IPs specified.', '<br />');
 
 $timeservers = explode(' ', $config['system']['timeservers']);
 $maxrows = max(count($timeservers), 1);
@@ -281,10 +281,11 @@ $section->addInput(new Form_Button(
 $section->addInput(new Form_StaticText(
 	null,
 	$btnaddrow
-))->setHelp('For best results three to five servers should be configured here, or at least one pool.' . '<br />' .
-			'The <b>Prefer</b> option indicates that NTP should favor the use of this server more than all others.' . '<br />' .
-			'The <b>No Select</b> option indicates that NTP should not use this server for time, but stats for this server will be collected and displayed.' . '<br />' .
-			'The <b>Is a Pool</b> option indicates this entry is a pool of NTP servers and not a single address. This is assumed for *.pool.ntp.org.');
+))->setHelp('For best results three to five servers should be configured here, or at least one pool.%1$s' .
+			'The %2$sPrefer%3$s option indicates that NTP should favor the use of this server more than all others.%1$s' .
+			'The %2$sNo Select%3$s option indicates that NTP should not use this server for time, but stats for this server will be collected and displayed.%1$s' .
+			'The %2$sIs a Pool%3$s option indicates this entry is a pool of NTP servers and not a single address. This is assumed for *.pool.ntp.org.',
+			'<br />', '<b>', '</b>');
 
 $section->addInput(new Form_Input(
 	'ntporphan',
@@ -315,8 +316,8 @@ $section->addInput(new Form_Checkbox(
 	null,
 	'Log system messages (default: disabled).',
 	$pconfig['logsys']
-))->setHelp('These options enable additional messages from NTP to be written to the System Log ' .
-			'<a href="status_logs.php?logfile=ntpd">' . 'Status > System Logs > NTP' . '</a>.');
+))->setHelp('These options enable additional messages from NTP to be written to the System Log %1$sStatus > System Logs > NTP%2$s',
+			'<a href="status_logs.php?logfile=ntpd">', '</a>.');
 
 // Statistics logging section
 $btnadv = new Form_Button(
diff --git a/src/usr/local/www/services_ntpd_gps.php b/src/usr/local/www/services_ntpd_gps.php
index 1b4970d..4305c47 100644
--- a/src/usr/local/www/services_ntpd_gps.php
+++ b/src/usr/local/www/services_ntpd_gps.php
@@ -344,8 +344,8 @@ $section->addInput(new Form_Select(
 	$pconfig['type'],
 	array_combine($gpstypes, $gpstypes)
 ))->setHelp('This option allows a predefined configuration to be selected. ' .
-			'Default is the configuration of pfSense 2.1 and earlier (not recommended). Select Generic if the GPS is not listed.' . '<br /><br />' .
-			'The predefined configurations assume the GPS has already been set to NMEA mode.');
+			'Default is the configuration of pfSense 2.1 and earlier (not recommended). Select Generic if the GPS is not listed.%1$s' .
+			'The predefined configurations assume the GPS has already been set to NMEA mode.', '<br /><br />');
 
 $serialports = glob("/dev/cua?[0-9]{,.[0-9]}", GLOB_BRACE);
 
diff --git a/src/usr/local/www/services_pppoe_edit.php b/src/usr/local/www/services_pppoe_edit.php
index c58b9e5..0f1ee42 100644
--- a/src/usr/local/www/services_pppoe_edit.php
+++ b/src/usr/local/www/services_pppoe_edit.php
@@ -324,9 +324,9 @@ $section->addInput(new Form_IpAddress(
 	'localip',
 	'*Server Address',
 	$pconfig['localip']
-))->setHelp('Enter the IP address the PPPoE server should give to clients for use as their "gateway".' . '<br />' .
-			'Typically this is set to an unused IP just outside of the client range.'. '<br />' .
-			'NOTE: This should NOT be set to any IP address currently in use on this firewall.');
+))->setHelp('Enter the IP address the PPPoE server should give to clients for use as their "gateway".%1$s' .
+			'Typically this is set to an unused IP just outside of the client range.%1$s' .
+			'NOTE: This should NOT be set to any IP address currently in use on this firewall.', '<br />');
 
 $section->addInput(new Form_IpAddress(
 	'remoteip',
diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php
index 8af551f..57b3d17 100644
--- a/src/usr/local/www/services_router_advertisements.php
+++ b/src/usr/local/www/services_router_advertisements.php
@@ -358,16 +358,16 @@ $section->addInput(new Form_Input(
 	'number',
 	$pconfig['ravalidlifetime'],
 	['min' => 1, 'max' => 655350]
-))->setHelp('The length of time in seconds (relative to the time the packet is sent) that the prefix is valid for the purpose of on-link determination.' . ' <br />' .
-'The default is 86400 seconds.');
+))->setHelp('The length of time in seconds (relative to the time the packet is sent) that the prefix is valid for the purpose of on-link determination.%1$s' .
+'The default is 86400 seconds.', '<br />');
 
 $section->addInput(new Form_Input(
 	'rapreferredlifetime',
 	'Default preferred lifetime',
 	'text',
 	$pconfig['rapreferredlifetime']
-))->setHelp('Seconds. The length of time in seconds (relative to the time the packet is sent) that addresses generated from the prefix via stateless address autoconfiguration remain preferred.' . ' <br />' .
-			'The default is 14400 seconds.');
+))->setHelp('Seconds. The length of time in seconds (relative to the time the packet is sent) that addresses generated from the prefix via stateless address autoconfiguration remain preferred.%1$s' .
+			'The default is 14400 seconds.', '<br />');
 
 $section->addInput(new Form_Input(
 	'raminrtradvinterval',
diff --git a/src/usr/local/www/services_unbound_advanced.php b/src/usr/local/www/services_unbound_advanced.php
index eebf380..7c1571e 100644
--- a/src/usr/local/www/services_unbound_advanced.php
+++ b/src/usr/local/www/services_unbound_advanced.php
@@ -237,7 +237,7 @@ $section->addInput(new Form_Checkbox(
 	'Prefetch DNS Key Support',
 	'DNSKEYs are fetched earlier in the validation process when a Delegation signer is encountered',
 	$pconfig['prefetchkey']
-))->setHelp('This helps lower the latency of requests but does utilize a little more CPU. See: <a href="http://en.wikipedia.org/wiki/List_of_DNS_record_types">Wikipedia</a>');
+))->setHelp('This helps lower the latency of requests but does utilize a little more CPU. See: %1$sWikipedia%2$s', '<a href="http://en.wikipedia.org/wiki/List_of_DNS_record_types">', '</a>');
 
 $section->addInput(new Form_Checkbox(
 	'dnssecstripped',
@@ -354,7 +354,7 @@ $section->addInput(new Form_Checkbox(
 	'Experimental Bit 0x20 Support',
 	'Use 0x-20 encoded random bits in the DNS query to foil spoofing attempts.',
 	$pconfig['use_caps']
-))->setHelp('See the implementation <a href="https://tools.ietf.org/html/draft-vixie-dnsext-dns0x20-00">draft dns-0x20</a> for more information.');
+))->setHelp('See the implementation %1$sdraft dns-0x20%2$s for more information.', '<a href="https://tools.ietf.org/html/draft-vixie-dnsext-dns0x20-00">', '</a>');
 
 $form->add($section);
 print($form);
diff --git a/src/usr/local/www/services_unbound_domainoverride_edit.php b/src/usr/local/www/services_unbound_domainoverride_edit.php
index 4268186..4d46435 100644
--- a/src/usr/local/www/services_unbound_domainoverride_edit.php
+++ b/src/usr/local/www/services_unbound_domainoverride_edit.php
@@ -133,8 +133,8 @@ $section->addInput(new Form_IpAddress(
 	'ip',
 	'*IP Address',
 	$pconfig['ip']
-))->setHelp('IP address of the authoritative DNS server for this domain. e.g.: 192.168.100.100' . '<br />' .
-			'To use a non-default port for communication, append an \'@\' with the port number.')->setPattern('[a-zA-Z0-9@.:]+');
+))->setHelp('IP address of the authoritative DNS server for this domain. e.g.: 192.168.100.100%1$s' .
+			'To use a non-default port for communication, append an \'@\' with the port number.', '<br />')->setPattern('[a-zA-Z0-9@.:]+');
 
 $section->addInput(new Form_Input(
 	'descr',
diff --git a/src/usr/local/www/services_unbound_host_edit.php b/src/usr/local/www/services_unbound_host_edit.php
index 173c563..9b54292 100644
--- a/src/usr/local/www/services_unbound_host_edit.php
+++ b/src/usr/local/www/services_unbound_host_edit.php
@@ -215,23 +215,23 @@ $section->addInput(new Form_Input(
 	'Host',
 	'text',
 	$pconfig['host']
-))->setHelp('Name of the host, without the domain part' . '<br />' .
-			'e.g.: "myhost"');
+))->setHelp('Name of the host, without the domain part%1$s' .
+			'e.g.: "myhost"', '<br />');
 
 $section->addInput(new Form_Input(
 	'domain',
 	'*Domain',
 	'text',
 	$pconfig['domain']
-))->setHelp('Domain of the host' . '<br />' .
-			'e.g.: "example.com"');
+))->setHelp('Domain of the host%1$s' .
+			'e.g.: "example.com"', '<br />');
 
 $section->addInput(new Form_IpAddress(
 	'ip',
 	'*IP Address',
 	$pconfig['ip']
-))->setHelp('IP address of the host' . '<br />' .
-			'e.g.: 192.168.100.100 or fd00:abcd::1');
+))->setHelp('IP address of the host%1$s' .
+			'e.g.: 192.168.100.100 or fd00:abcd::1', '<br />');
 
 $section->addInput(new Form_Input(
 	'descr',