Add/fix wording of descriptions in OpenVPN wizard.

While I'm here, convert leading spaces to tabs.

2 files changed, 455 insertions, 416 deletions

diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc
index 2e01e6a..cba0d10 100644
--- a/usr/local/www/wizards/openvpn_wizard.inc
+++ b/usr/local/www/wizards/openvpn_wizard.inc
@@ -1,30 +1,30 @@
 <?php
 /*
-        Copyright (C) 2010 Ermal Luçi
-        All rights reserved.
-
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions are met:
-
-        1. Redistributions of source code must retain the above copyright notice,
-           this list of conditions and the following disclaimer.
-
-        2. Redistributions in binary form must reproduce the above copyright
-           notice, this list of conditions and the following disclaimer in the
-           documentation and/or other materials provided with the distribution.
-
-        THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-        AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-        AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-        OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-        SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-        INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-        CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-        ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-        POSSIBILITY OF SUCH DAMAGE.
-
-        pfSense_MODULE: openvpn
+	Copyright (C) 2010 Ermal Luçi
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+
+	pfSense_MODULE: openvpn
 */
 require_once("openvpn.inc");
 
@@ -46,7 +46,7 @@ function step2_stepbeforeformdisplay() {
 	global $pkg, $stepid;
 
 	$fields =& $pkg['step'][1]['fields']['field'];
-	
+
 	$found = false;
 	$authlist = auth_get_authserver_list();
 	$fields[1]['options']['option'] = array();
@@ -54,13 +54,13 @@ function step2_stepbeforeformdisplay() {
 		if ($auth['type'] != "ldap")
 			continue;
 		$found = true;
-               	$opts = array();
-               	$opts['name'] = $auth['name'];
-               	$opts['value'] = $auth['name'];
-               	$fields[1]['options']['option'][] = $opts;
+		$opts = array();
+		$opts['name'] = $auth['name'];
+		$opts['value'] = $auth['name'];
+		$fields[1]['options']['option'][] = $opts;
 	}
 	if ($found == false) {
-                $stepid = 2;
+		$stepid = 2;
 	}
 }
 
@@ -91,46 +91,46 @@ function step3_submitphpaction() {
 }
 
 function step4_stepbeforeformdisplay() {
-        global $pkg, $stepid;
+	global $pkg, $stepid;
 
-        $fields =& $pkg['step'][3]['fields']['field'];
+	$fields =& $pkg['step'][3]['fields']['field'];
 
 	$found = false;
-        $authlist = auth_get_authserver_list();
-       	$fields[1]['options']['option'] = array();
-       	foreach ($authlist as $i => $auth) {
-               	if ($auth['type'] != "radius")
-                       	continue;
+	$authlist = auth_get_authserver_list();
+	$fields[1]['options']['option'] = array();
+	foreach ($authlist as $i => $auth) {
+		if ($auth['type'] != "radius")
+			continue;
 		$found = true;
-               	$opts = array();
-               	$opts['name'] = $auth['name'];
-               	$opts['value'] = $auth['name'];
-               	$fields[1]['options']['option'][] = $opts;
-        }
+		$opts = array();
+		$opts['name'] = $auth['name'];
+		$opts['value'] = $auth['name'];
+		$fields[1]['options']['option'][] = $opts;
+	}
 	if ($found == false)
-                $stepid = 4;
+		$stepid = 4;
 }
 
 function step4_submitphpaction() {
-        global $stepid;
+	global $stepid;
 
 	if (isset($_POST['next'])) {
-                $_POST['uselist'] = "";
-                $stepid++;
-        }
+		$_POST['uselist'] = "";
+		$stepid++;
+	}
 }
 
 function step5_submitphpaction() {
 	global $stepid, $savemsg, $config;
 
-        if (empty($_POST['name']) || empty($_POST['ip']) || empty($_POST['port']) ||
-            empty($_POST['secret'])) {
+	if (empty($_POST['name']) || empty($_POST['ip']) || empty($_POST['port']) ||
+	    empty($_POST['secret'])) {
 		$stepid--;
-                $savemsg = "Please enter all information for authentication server.";
+		$savemsg = "Please enter all information for authentication server.";
 	} else if (count(($authcfg = auth_get_authserver($_POST['name']))) > 0) {
 		$stepid--;
 		$savemsg = "Please choose a different name because an authentication server with this name already exists.";
-        } else {
+	} else {
 		$config['ovpnserver']['step2']['uselist'] = "on";
 		$_POST['uselist'] = "on";
 	}
@@ -148,11 +148,11 @@ function step6_submitphpaction() {
 	global $stepid, $config;
 
 	if (isset($_POST['next'])) {
-                $_POST['uselist'] = "";
-                $stepid++;
-        } else {
+		$_POST['uselist'] = "";
+		$stepid++;
+	} else {
 		$config['ovpnserver']['step6']['uselist'] = "on";
-                $_POST['uselist'] = "on";
+		$_POST['uselist'] = "on";
 	}
 }
 
@@ -160,32 +160,32 @@ function step7_submitphpaction() {
 	global $stepid, $savemsg, $_POST, $config;
 
 	if (empty($_POST['name']) || empty($_POST['keylength']) || empty($_POST['lifetime']) ||
-            empty($_POST['country']) || empty($_POST['state']) || empty($_POST['city']) ||
-            empty($_POST['organization']) || empty($_POST['email'])) {
+	    empty($_POST['country']) || empty($_POST['state']) || empty($_POST['city']) ||
+	    empty($_POST['organization']) || empty($_POST['email'])) {
 		$stepid--;
-                $savemsg = "Please enter all information for the new Certificate Authority.";
-        } else {
+		$savemsg = "Please enter all information for the new Certificate Authority.";
+	} else {
 		$config['ovpnserver']['step6']['uselist'] = "on";
 		$_POST['uselist'] = "on";
 	}
 }
 
 function step8_stepbeforeformdisplay() {
-        global $stepid, $config;
+	global $stepid, $config;
 
-        if (count($config['system']['cert']) < 1 ||
+	if (count($config['system']['cert']) < 1 ||
 		(count($config['system']['cert']) == 1 && stristr($config['system']['cert'][0]['name'], "webconf"))) {
 		$stepid++;
-        }
+	}
 }
 
 function step8_submitphpaction() {
 	global $stepid, $_POST;
 
 	if (isset($_POST['next'])) {
-                $_POST['uselist'] = "";
-                $stepid++;
-        }
+		$_POST['uselist'] = "";
+		$stepid++;
+	}
 }
 
 function step9_stepbeforeformdisplay() {
@@ -194,18 +194,18 @@ function step9_stepbeforeformdisplay() {
 	$pconfig = $config['ovpnserver'];
 
 	if (isset($pconfig['step6']['uselist'])) {
-                $country = $pconfig['step6']['country'];
-                $state = $pconfig['step6']['state'];
-                $city = $pconfig['step6']['city'];
-                $org = $pconfig['step6']['organization'];
-        } else {
+		$country = $pconfig['step6']['country'];
+		$state = $pconfig['step6']['state'];
+		$city = $pconfig['step6']['city'];
+		$org = $pconfig['step6']['organization'];
+	} else {
 		$ca = lookup_ca($pconfig['step6']['authcertca']);
 		$cavl = cert_get_subject_array($ca['crt']);
 		$country = $cavl[0]['v'];
 		$state = $cavl[1]['v'];
 		$city = $cavl[2]['v'];
 		$org = $cavl[3]['v'];
-        }
+	}
 	$fields =& $pkg['step'][$stepid]['fields']['field'];
 
 	foreach ($fields as $idx => $field) {
@@ -229,12 +229,12 @@ function step9_stepbeforeformdisplay() {
 function step9_submitphpaction() {
 	global $stepid, $savemsg, $_POST, $config;
 
-        if (empty($_POST['name']) || empty($_POST['keylength']) || empty($_POST['lifetime']) ||
+	if (empty($_POST['name']) || empty($_POST['keylength']) || empty($_POST['lifetime']) ||
 	    empty($_POST['country']) || empty($_POST['state']) || empty($_POST['city']) ||
 	    empty($_POST['organization']) || empty($_POST['email'])) {
 		$stepid--;
-                $savemsg = "Please enter all information for the new certificate.";
-        } else {
+		$savemsg = "Please enter all information for the new certificate.";
+	} else {
 		$config['ovpnserver']['step9']['uselist'] = "on";
 		$_POST['uselist'] = "on";
 	}
@@ -245,21 +245,21 @@ function step10_stepbeforeformdisplay() {
 
 	foreach ($pkg['step'][$stepid]['fields']['field'] as $idx => $field) {
 		if ($field['name'] == "crypto") {
-                        $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'] = array();
+			$pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'] = array();
 			$cipherlist = openvpn_get_cipherlist();
 			foreach ($cipherlist as $name => $desc) {
 				$opt = array();
-                                $opt['name'] = $desc;
-                                $opt['value'] = $name;
-                        $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'][] = $opt;
+				$opt['name'] = $desc;
+				$opt['value'] = $name;
+			$pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'][] = $opt;
 			}
 		} else if ($field['name'] == "nbttype") {
-                        $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'] = array();
+			$pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'] = array();
 			foreach ($netbios_nodetypes as $type => $name) {
 				$opt = array();
 				$opt['name'] = $name;
 				$opt['value'] = $type;
-                        $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'][] = $opt;
+			$pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'][] = $opt;
 			}
 		} else if ($field['name'] == "localport") {
 			if (count($config['openvpn']['openvpn-server']) < 1)
@@ -271,27 +271,31 @@ function step10_stepbeforeformdisplay() {
 function step10_submitphpaction() {
 	global $savemsg, $stepid;
 
+	/* Default OpenVPN port to 1194 if left empty. */
+	if (empty($_POST['localport']))
+		$_POST['localport'] = 1194;
+
 	/* input validation */
-        if ($result = openvpn_validate_port($_POST['localport'], 'Local port'))
-                $input_errors[] = $result;
+	if ($result = openvpn_validate_port($_POST['localport'], 'Local port'))
+		$input_errors[] = $result;
 
-        if ($result = openvpn_validate_cidr($_POST['tunnelnet'], 'Tunnel network'))
-                $input_errors[] = $result;
+	if ($result = openvpn_validate_cidr($_POST['tunnelnet'], 'Tunnel network'))
+		$input_errors[] = $result;
 
-        if ($result = openvpn_validate_cidr($_POST['remotenet'], 'Remote network'))
-                $input_errors[] = $result;
+	if ($result = openvpn_validate_cidr($_POST['remotenet'], 'Remote network'))
+		$input_errors[] = $result;
 
-        if ($result = openvpn_validate_cidr($_POST['localnet'], 'Local network'))
-                $input_errors[] = $result;
+	if ($result = openvpn_validate_cidr($_POST['localnet'], 'Local network'))
+		$input_errors[] = $result;
 
 	$portused = openvpn_port_used($_POST['protocol'], $_POST['localport']);
 	if ($portused != 0)
-                $input_errors[] = "The specified 'Local port' is in use. Please select another value";
-	
+		$input_errors[] = "The specified 'Local port' is in use. Please select another value";
+
 	if (!isset($_POST['generatetlskey']) && isset($_POST['tlsauthentication']))
 		if (!strstr($_POST['tlssharedkey'], "-----BEGIN OpenVPN Static key V1-----") ||
 			!strstr($_POST['tlssharedkey'], "-----END OpenVPN Static key V1-----"))
-                        $input_errors[] = "The field 'TLS Authentication Key' does not appear to be valid";
+			$input_errors[] = "The field 'TLS Authentication Key' does not appear to be valid";
 
 	if (!empty($_POST['dnsserver1']) && !is_ipaddr(trim($_POST['dnsserver1'])))
 		$input_errors[] = "The field 'DNS Server #1' must contain a valid IP address";
@@ -313,7 +317,7 @@ function step10_submitphpaction() {
 		$input_errors[] = "The field 'WINS Server #2' must contain a valid IP address";
 
 	if ($_POST['concurrentcon'] && !is_numeric($_POST['concurrentcon']))
-                $input_errors[] = "The field 'Concurrent connections' must be numeric.";
+		$input_errors[] = "The field 'Concurrent connections' must be numeric.";
 
 	if (empty($_POST['tunnelnet']))
 		$input_errors[] = "You must specify a 'Tunnel network'.";
@@ -331,8 +335,8 @@ function step12_submitphpaction() {
 
 	if (!is_array($config['ovpnserver'])) {
 		$message = "No configuration found please retry again.";
-                header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=1&message={$message}");
-                exit;
+		header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=1&message={$message}");
+		exit;
 	}
 
 	if ($pconfig['step1']['type'] == "local") {
@@ -344,7 +348,7 @@ function step12_submitphpaction() {
 		$auth['type'] = $pconfig['step1']['type'];
 		$auth['refid'] = uniqid();
 		$auth['name'] = $pconfig['step2']['authtype'];
-		
+
 		if ($auth['type'] == "ldap") {
 			$auth['host'] = $pconfig['step2']['ip'];
 			$auth['ldap_port'] = $pconfig['step2']['port'];
@@ -372,12 +376,12 @@ function step12_submitphpaction() {
 		$config['system']['authserver'][] = $auth;
 	} else if (!isset($pconfig['step2']['uselist']) && empty($pconfig['step2']['authserv'])) {
 		$message = "Please choose an authentication server .";
-                header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=1&message={$message}");
-                exit;
+		header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=1&message={$message}");
+		exit;
 	} else if (!($auth = auth_get_authserver($pconfig['step2']['authserv']))) {
 		$message = "Not a valid authentication server has been specified.";
-                header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=1&message={$message}");
-                exit;
+		header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=1&message={$message}");
+		exit;
 	}
 
 	if (isset($pconfig['step6']['uselist'])) {
@@ -399,55 +403,55 @@ function step12_submitphpaction() {
 		$config['system']['ca'][] = $ca;
 	} else if (!isset($pconfig['step6']['uselist']) && empty($pconfig['step6']['authcertca'])) {
 		$message = "Please choose a Certificate Authority.";
-                header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=5&message={$message}");
-                exit;
+		header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=5&message={$message}");
+		exit;
 	} else if (!($ca = lookup_ca($pconfig['step6']['authcertca']))) {
 		$message = "Not a valid Certificate Authority specified.";
-                header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=5&message={$message}");
-                exit;
+		header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=5&message={$message}");
+		exit;
 	}
 
 	if (isset($pconfig['step9']['uselist'])) {
-                $cert = array();
-                $cert['refid'] = uniqid();
-                $cert['name'] = $pconfig['step9']['certname'];
-                $dn = array(
-                        'countryName' => $pconfig['step9']['country'],
-                        'stateOrProvinceName' => $pconfig['step9']['state'],
-                        'localityName' => $pconfig['step9']['city'],
-                        'organizationName' => $pconfig['step9']['organization'],
-                        'emailAddress' => $pconfig['step9']['email'],
-                        'commonName' => $pconfig['step9']['certname']);
-
-                cert_create($cert, $ca['refid'], $pconfig['step9']['keylength'], $pconfig['step9']['lifetime'], $dn);
-                if (!is_array($config['system']['cert']))
-                        $config['system']['cert'] = array();
-
-                $config['system']['cert'][] = $cert;
+		$cert = array();
+		$cert['refid'] = uniqid();
+		$cert['name'] = $pconfig['step9']['certname'];
+		$dn = array(
+			'countryName' => $pconfig['step9']['country'],
+			'stateOrProvinceName' => $pconfig['step9']['state'],
+			'localityName' => $pconfig['step9']['city'],
+			'organizationName' => $pconfig['step9']['organization'],
+			'emailAddress' => $pconfig['step9']['email'],
+			'commonName' => $pconfig['step9']['certname']);
+
+		cert_create($cert, $ca['refid'], $pconfig['step9']['keylength'], $pconfig['step9']['lifetime'], $dn);
+		if (!is_array($config['system']['cert']))
+			$config['system']['cert'] = array();
+
+		$config['system']['cert'][] = $cert;
 	} else if (!isset($pconfig['step6']['uselist']) && empty($pconfig['step9']['authcertname'])) {
 		$message = "Please choose a Certificate.";
-                header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=7&message={$message}");
-                exit;
+		header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=7&message={$message}");
+		exit;
 	} else if (!($cert = lookup_cert($pconfig['step9']['authcertname']))) {
-                $message = "Not a valid Certificate specified.";
-                header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=7&message={$message}");
-                exit;
-        }
+		$message = "Not a valid Certificate specified.";
+		header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=7&message={$message}");
+		exit;
+	}
 	$server = array();
 	$server['vpnid'] = openvpn_vpnid_next();
 	switch ($auth['type']) {
 		case "ldap":
-                	$server['authmode'] = $auth['name'];
-                        $server['mode'] = "server_user";
-                        break;
-                case "radius":
-                        $server['authmode'] = $auth['name'];
-                        $server['mode'] = "server_user";
-                        break;
-                default:
-                        $server['authmode'] = "Local Database";
-                        $server['mode'] = "server_tls_user";
-                        break;
+			$server['authmode'] = $auth['name'];
+			$server['mode'] = "server_user";
+			break;
+		case "radius":
+			$server['authmode'] = $auth['name'];
+			$server['mode'] = "server_user";
+			break;
+		default:
+			$server['authmode'] = "Local Database";
+			$server['mode'] = "server_tls_user";
+			break;
 	}
 	$server['caref'] = $ca['refid'];
 	$server['certref'] = $cert['refid'];
@@ -522,17 +526,17 @@ function step12_submitphpaction() {
 		$config['filter']['rule'][] = $rule;
 	}
 	if (isset($pconfig['step11']['ovpnallow'])) {
-                $rule = array();
-                $rule['descr'] = gettext("OpenVPN {$server['description']} wizard rules.");
-                $rule['source']['any'] = TRUE;
-                $rule['destination']['any'] = TRUE;
-                $rule['interface'] = "openvpn";
-                //$rule['protocol'] = $server['protocol'];
-                $rule['type'] = "pass";
-                $rule['enabled'] = "on";
-                $config['filter']['rule'][] = $rule;
-        }
-	
+		$rule = array();
+		$rule['descr'] = gettext("OpenVPN {$server['description']} wizard rules.");
+		$rule['source']['any'] = TRUE;
+		$rule['destination']['any'] = TRUE;
+		$rule['interface'] = "openvpn";
+		//$rule['protocol'] = $server['protocol'];
+		$rule['type'] = "pass";
+		$rule['enabled'] = "on";
+		$config['filter']['rule'][] = $rule;
+	}
+
 	if (!is_array($config['openvpn']['openvpn-server']))
 		$config['openvpn']['openvpn-server'] = array();
 
diff --git a/usr/local/www/wizards/openvpn_wizard.xml b/usr/local/www/wizards/openvpn_wizard.xml
index 58164af..9768ccf 100644
--- a/usr/local/www/wizards/openvpn_wizard.xml
+++ b/usr/local/www/wizards/openvpn_wizard.xml
@@ -3,31 +3,31 @@
 <copyright>
 /* $Id$ */
 /*
-        part of pfSense (http://www.pfsense.org/)
+	part of pfSense (http://www.pfsense.org/)
 
 	Copyright (C) 2010 Ermal Lui
-        All rights reserved.
+	All rights reserved.
 
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions are met:
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
 
-        1. Redistributions of source code must retain the above copyright notice,
-           this list of conditions and the following disclaimer.
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
 
-        2. Redistributions in binary form must reproduce the above copyright
-           notice, this list of conditions and the following disclaimer in the
-           documentation and/or other materials provided with the distribution.
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
 
-        THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-        AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-        AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-        OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-        SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-        INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-        CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-        ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-        POSSIBILITY OF SUCH DAMAGE.
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
 */
 </copyright>
 <totalsteps>12</totalsteps>
@@ -40,7 +40,7 @@
 			<type>select</type>
 			<displayname>Type of Server</displayname>
 			<name>authtype</name>
-			<description>Choose authentication backend type.</description>
+			<description>Choose authentication backend type. &lt;br/&gt;&lt;b&gt;NOTE:&lt;/b&gt; If you are unsure, leave this set to "Local User Aceess."</description>
 			<bindstofield>ovpnserver->step1->type</bindstofield>
 			<options>
 				<option>
@@ -63,7 +63,7 @@
 		</field>
 	</fields>
 	<stepsubmitphpaction>step1_submitphpaction();</stepsubmitphpaction>
-        <includefile>/usr/local/www/wizards/openvpn_wizard.inc</includefile>
+	<includefile>/usr/local/www/wizards/openvpn_wizard.inc</includefile>
 </step>
 <step>
 	<id>2</id>
@@ -75,17 +75,17 @@
 			<name>Authentication Servers list</name>
 		</field>
 		<field>
-                        <name>authserv</name>
-                        <displayname>Authentication servers</displayname>
-                        <type>select</type>
-                        <bindstofield>ovpnserver->step2->authserv</bindstofield>
+			<name>authserv</name>
+			<displayname>Authentication servers</displayname>
+			<type>select</type>
+			<bindstofield>ovpnserver->step2->authserv</bindstofield>
 			<options>
-                                <option>
-                                        <name>dummy</name>
-                                        <value>dummy</value>
-                                </option>
-                        </options>
-                </field>
+				<option>
+					<name>dummy</name>
+					<value>dummy</value>
+				</option>
+			</options>
+		</field>
 		<field>
 			<type>submit</type>
 			<name>Add new LDAP server</name>
@@ -96,9 +96,9 @@
 		</field>
 	</fields>
 	<stepbeforeformdisplay>step2_stepbeforeformdisplay();</stepbeforeformdisplay>
-        <stepsubmitphpaction>step2_submitphpaction();</stepsubmitphpaction>
-        <javascriptafterformdisplay>enablechange();</javascriptafterformdisplay>
-        <includefile>/usr/local/www/wizards/openvpn_wizard.inc</includefile>
+	<stepsubmitphpaction>step2_submitphpaction();</stepsubmitphpaction>
+	<javascriptafterformdisplay>enablechange();</javascriptafterformdisplay>
+	<includefile>/usr/local/www/wizards/openvpn_wizard.inc</includefile>
 </step>
 <step>
 	<id>3</id>
@@ -180,17 +180,17 @@
 			<bindstofield>ovpnserver->step2->nameattr</bindstofield>
 		</field>
 		<field>
-                        <name>memberattr</name>
-                        <displayname>Member naming attribute</displayname>
-                        <type>input</type>
-                        <bindstofield>ovpnserver->step2->memberattr</bindstofield>
-                </field>
+			<name>memberattr</name>
+			<displayname>Member naming attribute</displayname>
+			<type>input</type>
+			<bindstofield>ovpnserver->step2->memberattr</bindstofield>
+		</field>
 		<field>
-                        <name>groupattr</name>
-                        <displayname>Group naming attribute</displayname>
-                        <type>input</type>
-                        <bindstofield>ovpnserver->step2->groupattr</bindstofield>
-                </field>
+			<name>groupattr</name>
+			<displayname>Group naming attribute</displayname>
+			<type>input</type>
+			<bindstofield>ovpnserver->step2->groupattr</bindstofield>
+		</field>
 		<field>
 			<type>submit</type>
 			<name>Add new Server</name>
@@ -201,75 +201,75 @@
 	<includefile>/usr/local/www/wizards/openvpn_wizard.inc</includefile>
 </step>
 <step>
-        <id>4</id>
+	<id>4</id>
 	<description>OpenVPN Remote Access Server Setup Wizard</description>
 	<disableheader>on</disableheader>
-        <fields>
-		<field>
-                        <type>listtopic</type>
-                        <name>Authentication Servers list</name>
-                </field>
-                <field>
-                        <name>authserv</name>
-                        <displayname>Authentication servers</displayname>
-                        <type>select</type>
-                        <bindstofield>ovpnserver->step2->authserv</bindstofield>
-                        <options>
-                                <option>
-                                        <name>dummy</name>
-                                        <value>dummy</value>
-                                </option>
-                        </options>
-                </field>
-		<field>
-                        <type>submit</type>
-                        <name>Add new RADIUS server</name>
-                </field>
-                <field>
-                        <type>submit</type>
-                        <name>Next</name>
-                </field>
+	<fields>
+		<field>
+			<type>listtopic</type>
+			<name>Authentication Servers list</name>
+		</field>
+		<field>
+			<name>authserv</name>
+			<displayname>Authentication servers</displayname>
+			<type>select</type>
+			<bindstofield>ovpnserver->step2->authserv</bindstofield>
+			<options>
+				<option>
+					<name>dummy</name>
+					<value>dummy</value>
+				</option>
+			</options>
+		</field>
+		<field>
+			<type>submit</type>
+			<name>Add new RADIUS server</name>
+		</field>
+		<field>
+			<type>submit</type>
+			<name>Next</name>
+		</field>
 	</fields>
-        <stepbeforeformdisplay>step4_stepbeforeformdisplay();</stepbeforeformdisplay>
-        <stepsubmitphpaction>step4_submitphpaction();</stepsubmitphpaction>
-        <javascriptafterformdisplay>enablechange();</javascriptafterformdisplay>
-        <includefile>/usr/local/www/wizards/openvpn_wizard.inc</includefile>
+	<stepbeforeformdisplay>step4_stepbeforeformdisplay();</stepbeforeformdisplay>
+	<stepsubmitphpaction>step4_submitphpaction();</stepsubmitphpaction>
+	<javascriptafterformdisplay>enablechange();</javascriptafterformdisplay>
+	<includefile>/usr/local/www/wizards/openvpn_wizard.inc</includefile>
 </step>
 <step>
 	<id>5</id>
 	<description>OpenVPN Remote Access Server Setup Wizard</description>
 	<disableheader>on</disableheader>
 	<fields>
-                <field>
-                        <type>listtopic</type>
-                        <name>Add a new authentication server</name>
-                </field>
-                <field>
-                        <name>name</name>
-                        <displayname>Name</displayname>
-                        <type>input</type>
+		<field>
+			<type>listtopic</type>
+			<name>Add a new authentication server</name>
+		</field>
+		<field>
+			<name>name</name>
+			<displayname>Name</displayname>
+			<type>input</type>
 			<bindstofield>ovpnserver->step2->authtype</bindstofield>
-                </field>
-                <field>
-                        <name>ip</name>
-                        <displayname>Hostname or IP address</displayname>
-                        <type>input</type>
+		</field>
+		<field>
+			<name>ip</name>
+			<displayname>Hostname or IP address</displayname>
+			<type>input</type>
 			<bindstofield>ovpnserver->step2->ip</bindstofield>
-                </field>
-                <field>
-                        <name>port</name>
-                        <displayname>Authentication Port</displayname>
-                        <type>input</type>
-                        <size>8</size>
+		</field>
+		<field>
+			<name>port</name>
+			<displayname>Authentication Port</displayname>
+			<type>input</type>
+			<size>8</size>
 			<bindstofield>ovpnserver->step2->port</bindstofield>
-                </field>
-                <field>
-                        <name>secret</name>
-                        <displayname>Shared Secret</displayname>
-                        <type>password</type>
-                        <size>20</size>
+		</field>
+		<field>
+			<name>secret</name>
+			<displayname>Shared Secret</displayname>
+			<type>password</type>
+			<size>20</size>
 			<bindstofield>ovpnserver->step2->password</bindstofield>
-                </field>
+		</field>
 		<field>
 			<name>Add new Server</name>
 			<type>submit</type>
@@ -284,7 +284,7 @@
 	<disableheader>on</disableheader>
 	<fields>
 		<field>
-			<name>Choose Certificate Authority</name>
+			<name>Choose Certificate Authority (CA)</name>
 			<type>listtopic</type>
 		</field>
 		<field>
@@ -294,58 +294,59 @@
 			<bindstofield>ovpnserver->step6->authcertca</bindstofield>
 		</field>
 		<field>
-                        <type>submit</type>
-                        <name>Add new CA</name>
-                </field>
+			<type>submit</type>
+			<name>Add new CA</name>
+		</field>
 		<field>
 			<name>Next</name>
 			<type>submit</type>
 		</field>
 	</fields>
-        <stepbeforeformdisplay>step6_stepbeforeformdisplay();</stepbeforeformdisplay>
-        <stepsubmitphpaction>step6_submitphpaction();</stepsubmitphpaction>
-        <includefile>/usr/local/www/wizards/openvpn_wizard.inc</includefile>
+	<stepbeforeformdisplay>step6_stepbeforeformdisplay();</stepbeforeformdisplay>
+	<stepsubmitphpaction>step6_submitphpaction();</stepsubmitphpaction>
+	<includefile>/usr/local/www/wizards/openvpn_wizard.inc</includefile>
 </step>
 <step>
 	<id>7</id>
 	<description>OpenVPN Remote Access Server Setup Wizard</description>
 	<disableheader>on</disableheader>
-        <fields>
+	<fields>
 		<field>
-			<name>Create a new CA certificate</name>
+			<name>Create a new Certificate Authority (CA) certificate</name>
 			<type>listtopic</type>
 		</field>
 		<field>
 			<name>name</name>
 			<displayname>Descriptive name</displayname>
-			<description>This is the same as common-name for Certificates</description>
+			<description>A name for your reference, to identify this certificate. This is the same as common-name field for other Certificates.</description>
 			<type>input</type>
 			<bindstofield>ovpnserver->step6->certca</bindstofield>
 		</field>
 		<field>
 			<name>keylength</name>
 			<displayname>Key length</displayname>
+			<description>&lt;br/&gt;Size of the key which will be generated. The larger the key, the more security is offers, but larger keys are generally slower to use.</description>
 			<type>select</type>
 			<value>2048</value>
 			<bindstofield>ovpnserver->step6->keylength</bindstofield>
 			<options>
-                                <option>
-                                        <name>512</name>
-                                        <value>512</value>
-                                </option>
-                                <option>
-                                        <name>1024</name>
-                                        <value>1024</value>
-                                </option>
-                                <option>
-                                        <name>2048</name>
-                                        <value>2048</value>
-                                </option>
-                                <option>
-                                        <name>4096</name>
-                                        <value>4096</value>
-                                </option>
-                        </options>
+				<option>
+					<name>512 bit</name>
+					<value>512</value>
+				</option>
+				<option>
+					<name>1024 bit</name>
+					<value>1024</value>
+				</option>
+				<option>
+					<name>2048 bit</name>
+					<value>2048</value>
+				</option>
+				<option>
+					<name>4096 bit</name>
+					<value>4096</value>
+				</option>
+			</options>
 		</field>
 		<field>
 			<name>lifetime</name>
@@ -353,12 +354,13 @@
 			<type>input</type>
 			<size>10</size>
 			<value>3650</value>
-			<description>Lifetime in days</description>
+			<description>Lifetime in days. This is commonly set to 3650 (Approximately 10 years.)</description>
 			<bindstofield>ovpnserver->step6->lifetime</bindstofield>
 		</field>
 		<field>
 			<name>country</name>
 			<displayname>Country Code</displayname>
+			<description>Two-letter ISO country code (e.g. US, AU, CA) </description>
 			<type>input</type>
 			<size>5</size>
 			<bindstofield>ovpnserver->step6->country</bindstofield>
@@ -366,6 +368,7 @@
 		<field>
 			<name>state</name>
 			<displayname>State or Province</displayname>
+			<description>Full State of Province name, not abbreviated (e.g. Kentucky, Indiana, Ontario).</description>
 			<type>input</type>
 			<size>30</size>
 			<bindstofield>ovpnserver->step6->state</bindstofield>
@@ -373,6 +376,7 @@
 		<field>
 			<name>city</name>
 			<displayname>City</displayname>
+			<description>City or other Locality name (e.g. Louisville, Indianapolis, Toronto).</description>
 			<type>input</type>
 			<size>30</size>
 			<bindstofield>ovpnserver->step6->city</bindstofield>
@@ -380,6 +384,7 @@
 		<field>
 			<name>organization</name>
 			<displayname>Organization</displayname>
+			<description>Organization name, often the Company or Group name.</description>
 			<type>input</type>
 			<size>30</size>
 			<bindstofield>ovpnserver->step6->organization</bindstofield>
@@ -387,6 +392,7 @@
 		<field>
 			<name>email</name>
 			<displayname>E-mail</displayname>
+			<description>E-mail address for the Certificate contact. Often the e-mail of the person generating the certificate (i.e. You.)</description>
 			<type>input</type>
 			<size>30</size>
 			<bindstofield>ovpnserver->step6->email</bindstofield>
@@ -406,9 +412,9 @@
 	<disableheader>on</disableheader>
 	<fields>
 		<field>
-                        <name>Choose Certificate</name>
-                        <type>listtopic</type>
-                </field>
+			<name>Choose a Server Certificate</name>
+			<type>listtopic</type>
+		</field>
 		<field>
 			<type>cert_selection</type>
 			<name>certname</name>
@@ -416,9 +422,9 @@
 			<bindstofield>ovpnserver->step9->authcertname</bindstofield>
 		</field>
 		<field>
-                        <type>submit</type>
-                        <name>Add new Certificate</name>
-                </field>
+			<type>submit</type>
+			<name>Add new Certificate</name>
+		</field>
 		<field>
 			<name>Next</name>
 			<type>submit</type>
@@ -426,60 +432,63 @@
 	</fields>
 	<stepbeforeformdisplay>step8_stepbeforeformdisplay();</stepbeforeformdisplay>
 	<stepsubmitphpaction>step8_submitphpaction();</stepsubmitphpaction>
-        <includefile>/usr/local/www/wizards/openvpn_wizard.inc</includefile>
+	<includefile>/usr/local/www/wizards/openvpn_wizard.inc</includefile>
 </step>
 <step>
-        <id>9</id>
+	<id>9</id>
 	<description>OpenVPN Remote Access Server Setup Wizard</description>
 	<disableheader>on</disableheader>
-        <fields>
+	<fields>
 		<field>
-			<name>Create a new certificate</name>
+			<name>Create a new server certificate</name>
 			<type>listtopic</type>
 		</field>
 		<field>
 			<name>name</name>
 			<displayname>Descriptive name</displayname>
+			<description>A name for your reference, to identify this certificate. This is also known as the certificate's "Common Name."</description>
 			<type>input</type>
 			<bindstofield>ovpnserver->step9->certname</bindstofield>
 		</field>
 		<field>
 			<name>keylength</name>
 			<displayname>Key length</displayname>
+			<description>&lt;br/&gt;Size of the key which will be generated. The larger the key, the more security is offers, but larger keys are generally slower to use.</description>
 			<type>select</type>
 			<value>2048</value>
 			<bindstofield>ovpnserver->step9->keylength</bindstofield>
 			<options>
-                                <option>
-                                        <name>512</name>
-                                        <value>512</value>
-                                </option>
-                                <option>
-                                        <name>1024</name>
-                                        <value>1024</value>
-                                </option>
-                                <option>
-                                        <name>2048</name>
-                                        <value>2048</value>
-                                </option>
-                                <option>
-                                        <name>4096</name>
-                                        <value>4096</value>
-                                </option>
-                        </options>
+				<option>
+					<name>512 bits</name>
+					<value>512</value>
+				</option>
+				<option>
+					<name>1024 bits</name>
+					<value>1024</value>
+				</option>
+				<option>
+					<name>2048 bits</name>
+					<value>2048</value>
+				</option>
+				<option>
+					<name>4096 bits</name>
+					<value>4096</value>
+				</option>
+			</options>
 		</field>
 		<field>
 			<name>lifetime</name>
 			<displayname>Lifetime</displayname>
+			<description>Lifetime in days. This is commonly set to 3650 (Approximately 10 years.)</description>
 			<type>input</type>
 			<size>10</size>
 			<value>3650</value>
-			<description>Lifetime in days</description>
 			<bindstofield>ovpnserver->step9->lifetime</bindstofield>
 		</field>
 		<field>
 			<name>country</name>
 			<displayname>Country Code</displayname>
+			<description>Two-letter ISO country code (e.g. US, AU, CA) </description>
 			<type>input</type>
 			<size>5</size>
 			<bindstofield>ovpnserver->step9->country</bindstofield>
@@ -487,6 +496,7 @@
 		<field>
 			<name>state</name>
 			<displayname>State or Province</displayname>
+			<description>Full State of Province name, not abbreviated (e.g. Kentucky, Indiana, Ontario).</description>
 			<type>input</type>
 			<size>30</size>
 			<bindstofield>ovpnserver->step9->state</bindstofield>
@@ -494,6 +504,7 @@
 		<field>
 			<name>city</name>
 			<displayname>City</displayname>
+			<description>City or other Locality name (e.g. Louisville, Indianapolis, Toronto).</description>
 			<type>input</type>
 			<size>30</size>
 			<bindstofield>ovpnserver->step9->city</bindstofield>
@@ -501,6 +512,7 @@
 		<field>
 			<name>organization</name>
 			<displayname>Organization</displayname>
+			<description>Organization name, often the Company or Group name.</description>
 			<type>input</type>
 			<size>30</size>
 			<bindstofield>ovpnserver->step9->organization</bindstofield>
@@ -508,6 +520,7 @@
 		<field>
 			<name>email</name>
 			<displayname>E-mail</displayname>
+			<description>E-mail address for the Certificate contact. Often the e-mail of the person generating the certificate (i.e. You.)</description>
 			<type>input</type>
 			<size>30</size>
 			<bindstofield>ovpnserver->step9->email</bindstofield>
@@ -533,6 +546,7 @@
 		<field>
 			<name>interface</name>
 			<type>interfaces_selection</type>
+			<description>The interface where OpenVPN will listen for incoming connections (typically WAN.)</description>
 			<displayname>Interface</displayname>
 			<bindstofield>ovpnserver->step10->interface</bindstofield>
 		</field>
@@ -541,19 +555,21 @@
 			<type>select</type>
 			<bindstofield>ovpnserver->step10->protocol</bindstofield>
 			<options>
-                                <option>
-                                        <name>UDP</name>
-                                        <value>udp</value>
-                                </option>
-                                <option>
-                                        <name>TCP</name>
-                                        <value>tcp</value>
-                                </option>
-                        </options>
+				<option>
+					<name>UDP</name>
+					<value>udp</value>
+				</option>
+				<option>
+					<name>TCP</name>
+					<value>tcp</value>
+				</option>
+			</options>
+			<description>&lt;br/&gt;Protocol to use for OpenVPN connections. If you are unsure, leave this set to UDP.</description>
 		</field>
 		<field>
 			<name>localport</name>
 			<displayname>Local port</displayname>
+			<description>Local port upon which OpenVPN will listen for connections. The default port is 1194. Leave this blank unless you need to use a different port.</description>
 			<type>input</type>
 			<size>10</size>
 			<bindstofield>ovpnserver->step10->localport</bindstofield>
@@ -561,6 +577,7 @@
 		<field>
 			<name>description</name>
 			<displayname>Description</displayname>
+			<description>A name for this OpenVPN instance, for your reference. It can be set however you like, but is often used to distinguish the purpose of the service (e.g. "Remote Technical Staff").</description>
 			<type>input</type>
 			<size>30</size>
 			<bindstofield>ovpnserver->step10->descr</bindstofield>
@@ -577,7 +594,7 @@
 			<bindstofield>ovpnserver->step10->tlsauth</bindstofield>
 		</field>
 		<field>
-			<displayname>Automatically generate a TLS key</displayname>
+			<displayname>Generate TLS Key</displayname>
 			<name>generatetlskey</name>
 			<disablefields>tlssharedkey</disablefields>
 			<value>on</value>
@@ -586,7 +603,9 @@
 			<bindstofield>ovpnserver->step10->gentlskey</bindstofield>
 		</field>
 		<field>
+			<displayname>TLS Shared Key</displayname>
 			<name>tlssharedkey</name>
+			<description>Paste in a shared TLS key if one has already been generated.</description>
 			<type>textarea</type>
 			<cols>30</cols>
 			<rows>5</rows>
@@ -598,19 +617,20 @@
 			<type>select</type>
 			<bindstofield>ovpnserver->step10->dhkey</bindstofield>
 			<options>
-                                <option>
-                                        <name>1024</name>
-                                        <value>1024</value>
-                                </option>
-                                <option>
-                                        <name>2048</name>
-                                        <value>2048</value>
-                                </option>
-                                <option>
-                                        <name>4096</name>
-                                        <value>4096</value>
-                                </option>
-                        </options>
+				<option>
+					<name>1024 bit</name>
+					<value>1024</value>
+				</option>
+				<option>
+					<name>2048 bit</name>
+					<value>2048</value>
+				</option>
+				<option>
+					<name>4096 bit</name>
+					<value>4096</value>
+				</option>
+			</options>
+			<description>&lt;br/&gt;Length of Diffie-Hellman (DH) key exchange parameters, used for establishing a secure communications channel. As with other such settings, the larger values are more secure, but may be slower in operation.</description>
 		</field>
 		<field>
 			<name>crypto</name>
@@ -618,11 +638,12 @@
 			<displayname>Encryption algorithm</displayname>
 			<bindstofield>ovpnserver->step10->crypto</bindstofield>
 			<options>
-                                <option>
-                                        <name>dummy</name>
-                                        <value>dummy</value>
-                                </option>
+				<option>
+					<name>dummy</name>
+					<value>dummy</value>
+				</option>
 			</options>
+			<description>&lt;br/&gt;The method used to encrypt traffic between endpoints. This setting must match on the client and server side, but is otherwise set however you like. Certain algorithms will perform better on different hardware, depending on the availability of supported VPN accelerator chips.</description>
 		</field>
 		<field>
 			<type>listtopic</type>
@@ -634,6 +655,7 @@
 			<type>input</type>
 			<size>20</size>
 			<bindstofield>ovpnserver->step10->tunnelnet</bindstofield>
+			<description>This is the virtual network used for private communications between this server and client hosts expressed using CIDR notation (eg. 10.0.8.0/24). 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)</description>
 		</field>
 		<field>
 			<displayname>Redirect Gateway</displayname>
@@ -643,18 +665,20 @@
 			<bindstofield>ovpnserver->step10->rdrgw</bindstofield>
 		</field>
 		<field>
-                        <displayname>Remote network</displayname>
-                        <name>remotenet</name>
-                        <type>input</type>
-                        <size>20</size>
-                        <bindstofield>ovpnserver->step10->remotenet</bindstofield>
-                </field>
-		<field>
 			<displayname>Local network</displayname>
 			<name>localnet</name>
 			<type>input</type>
 			<size>20</size>
 			<bindstofield>ovpnserver->step10->localnet</bindstofield>
+			<description>This is the network that will be accessible from the remote endpoint, expressed as a CIDR range. You may leave this blank if you don't want to add a route to the local network through this tunnel on the remote machine. This is generally set to your LAN network.</description>
+		</field>
+		<field>
+			<displayname>Remote network</displayname>
+			<name>remotenet</name>
+			<type>input</type>
+			<size>20</size>
+			<bindstofield>ovpnserver->step10->remotenet</bindstofield>
+			<description>This is a network that will be routed through the tunnel, so that a site-to-site VPN can be established without manually changing the routing tables. Expressed as a CIDR range. If this is a site-to-site VPN, enter the remote LAN here. You may leave this blank if you don't want a site-to-site VPN.</description>
 		</field>
 		<field>
 			<displayname>Concurrent Connections</displayname>
@@ -665,116 +689,127 @@
 			<bindstofield>ovpnserver->step10->concurrentcon</bindstofield>
 		</field>
 		<field>
-                        <displayname>Compression</displayname>
-                        <name>compression</name>
-                        <type>checkbox</type>
-                        <description>Compress tunnel packets using the LZO algorithm.</description>
+			<displayname>Compression</displayname>
+			<name>compression</name>
+			<type>checkbox</type>
+			<description>Compress tunnel packets using the LZO algorithm.</description>
 			<bindstofield>ovpnserver->step10->compression</bindstofield>
-                </field>
+		</field>
 		<field>
-                        <displayname>Type-of-Service</displayname>
-                        <name>tos</name>
-                        <type>checkbox</type>
-                        <description>Set the TOS IP header value of tunnel packets to match the encapsulated packet value.</description>
+			<displayname>Type-of-Service</displayname>
+			<name>tos</name>
+			<type>checkbox</type>
+			<description>Set the TOS IP header value of tunnel packets to match the encapsulated packet value.</description>
 			<bindstofield>ovpnserver->step10->tos</bindstofield>
-                </field>
+		</field>
 		<field>
-                        <displayname>Inter-client communication</displayname>
-                        <name>interclient</name>
-                        <type>checkbox</type>
-                        <description>Allow communication between clients connected to this server.</description>
+			<displayname>Inter-client communication</displayname>
+			<name>interclient</name>
+			<type>checkbox</type>
+			<description>Allow communication between clients connected to this server.</description>
 			<bindstofield>ovpnserver->step10->interclient</bindstofield>
-                </field>
+		</field>
 		<field>
 			<type>listtopic</type>
 			<name>Client Settings</name>
 		</field>
 		<field>
-                        <displayname>Address Pool</displayname>
-                        <name>addrpool</name>
-                        <type>checkbox</type>
+			<displayname>Address Pool</displayname>
+			<name>addrpool</name>
+			<type>checkbox</type>
 			<value>on</value>
-                        <description>Provide a virtual adapter IP address to clients (see Tunnel Network).</description>
+			<description>Provide a virtual adapter IP address to clients (see Tunnel Network).</description>
 			<bindstofield>ovpnserver->step10->addrpool</bindstofield>
-                </field>
-                <field>
-                        <displayname>DNS Default Domain</displayname>
-                        <name>defaultdomain</name>
-                        <type>input</type>
-                        <description>Provide a default domain name to clients.</description>
+		</field>
+		<field>
+			<displayname>DNS Default Domain</displayname>
+			<name>defaultdomain</name>
+			<type>input</type>
+			<description>Provide a default domain name to clients.</description>
 			<bindstofield>ovpnserver->step10->defaultdomain</bindstofield>
-                </field>
-                <field>
-                        <displayname>DNS Server 1</displayname>
-                        <name>dnsserver1</name>
-                        <type>input</type>
+		</field>
+		<field>
+			<displayname>DNS Server 1</displayname>
+			<name>dnsserver1</name>
+			<type>input</type>
 			<bindstofield>ovpnserver->step10->dns1</bindstofield>
+			<description>DNS server to provide for connecting client systems.</description>
 		</field>
 		<field>
-                        <displayname>DNS Server 2</displayname>
+			<displayname>DNS Server 2</displayname>
 			<name>dnserver2</name>
 			<type>input</type>
 			<bindstofield>ovpnserver->step10->dns2</bindstofield>
+			<description>DNS server to provide for connecting client systems.</description>
 		</field>
 		<field>
-                        <displayname>DNS Server 3</displayname>
+			<displayname>DNS Server 3</displayname>
 			<name>dnserver3</name>
 			<type>input</type>
 			<bindstofield>ovpnserver->step10->dns3</bindstofield>
+			<description>DNS server to provide for connecting client systems.</description>
 		</field>
 		<field>
-                        <displayname>DNS Server 4</displayname>
+			<displayname>DNS Server 4</displayname>
 			<name>dnserver4</name>
 			<type>input</type>
 			<bindstofield>ovpnserver->step10->dns4</bindstofield>
-                </field>
+			<description>DNS server to provide for connecting client systems.</description>
+		</field>
 		<field>
-                        <displayname>NTP Server</displayname>
-                        <name>ntpserver1</name>
-                        <type>input</type>
+			<displayname>NTP Server</displayname>
+			<name>ntpserver1</name>
+			<type>input</type>
 			<bindstofield>ovpnserver->step10->ntp1</bindstofield>
-                </field>
-                <field>
-                        <displayname>NTP Server 2</displayname>
-                        <name>ntpserver2</name>
+			<description>Network Time Protocol server to provide for connecting client systems.</description>
+		</field>
+		<field>
+			<displayname>NTP Server 2</displayname>
+			<name>ntpserver2</name>
 			<type>input</type>
 			<bindstofield>ovpnserver->step10->ntp2</bindstofield>
-                </field>
+			<description>Network Time Protocol server to provide for connecting client systems.</description>
+		</field>
 		<field>
 			<name>nbtenable</name>
 			<type>checkbox</type>
-			<displayname>Enable NetBios option</displayname>
-		</field>
-		<field>
-                        <displayname>NetBios Node Type</displayname>
-                        <name>nbttype</name>
-                        <type>select</type>
-                        <bindstofield>ovpnserver->step10->nbttype</bindstofield>
-                        <options>
-                                <option>
-                                        <name>dummy</name>
-                                        <value>dummy</value>
-                                </option>
-                        </options>
-                </field>
-		<field>
-                        <displayname>NetBios Scope</displayname>
-                        <name>nbtscope</name>
-                        <type>input</type>
-                        <bindstofield>ovpnserver->step10->nbtscope</bindstofield>
-                </field>
-		<field>
-                        <displayname>WINS Server 1</displayname>
-                        <name>winsserver1</name>
-                        <type>input</type>
-                        <bindstofield>ovpnserver->step10->wins1</bindstofield>
-                </field>
-                <field>
-                        <displayname>WINS Server 2</displayname>
-                        <name>winsserver2</name>
-                        <type>input</type>
-                        <bindstofield>ovpnserver->step10->wins2</bindstofield>
-                </field>
+			<displayname>NetBIOS Options</displayname>
+			<description>Enable NetBIOS over TCP/IP. &lt;br/&gt;If this option is not set, all NetBIOS-over-TCP/IP options (including WINS) will be disabled. </description>
+		</field>
+		<field>
+			<displayname>NetBIOS Node Type</displayname>
+			<name>nbttype</name>
+			<type>select</type>
+			<bindstofield>ovpnserver->step10->nbttype</bindstofield>
+			<options>
+				<option>
+					<name>dummy</name>
+					<value>dummy</value>
+				</option>
+			</options>
+			<description>&lt;br/&gt;Possible options: b-node (broadcasts), p-node (point-to-point name queries to a WINS server), m-node (broadcast then query name server), and h-node (query name server, then broadcast).</description>
+		</field>
+		<field>
+			<displayname>NetBIOS Scope ID</displayname>
+			<name>nbtscope</name>
+			<type>input</type>
+			<bindstofield>ovpnserver->step10->nbtscope</bindstofield>
+			<description>A NetBIOS Scope ID provides an extended naming service for NetBIOS over TCP/IP. The NetBIOS scope ID isolates NetBIOS traffic on a single network to only those nodes with the same NetBIOS scope ID.</description>
+		</field>
+		<field>
+			<displayname>WINS Server 1</displayname>
+			<name>winsserver1</name>
+			<type>input</type>
+			<bindstofield>ovpnserver->step10->wins1</bindstofield>
+			<description>A Windows Internet Name Service (WINS) server to provide for connecting clients, which allows them to browse Windows shares. This is typically an Active Directory Domain Controller, designated WINS server, or Samba server.</description>
+		</field>
+		<field>
+			<displayname>WINS Server 2</displayname>
+			<name>winsserver2</name>
+			<type>input</type>
+			<bindstofield>ovpnserver->step10->wins2</bindstofield>
+			<description>A Windows Internet Name Service (WINS) server to provide for connecting clients, which allows them to browse Windows shares. This is typically an Active Directory Domain Controller, designated WINS server, or Samba server.</description>
+		</field>
 		<field>
 			<name>Advanced</name>
 			<type>textarea</type>
@@ -799,11 +834,11 @@
 	<fields>
 		<field>
 			<type>listtopic</type>
-			<name>Firewall Rules configuration</name>
+			<name>Firewall Rule Configuration</name>
 		</field>
 		<field>
 			<type>text</type>
-			<description>Firewall Rules control what network traffic is permitted. You must add rules to allow traffic to the OpenVPN server's IP and port, as well as allowing traffic from connected clients through the tunnel. These rules can be auto-added here, or configured manually after completing the wizardr.</description>
+			<description>Firewall Rules control what network traffic is permitted. You must add rules to allow traffic to the OpenVPN server's IP and port, as well as allowing traffic from connected clients through the tunnel. These rules can be automtically added here, or configured manually after completing the wizard.</description>
 		</field>
 		<field>
 			<type>listtopic</type>
@@ -812,7 +847,7 @@
 		<field>
 			<name>ovpnrule</name>
 			<displayname>Firewall Rule</displayname>
-			<description>Automatically add rule to permit</description>
+			<description>Add a rule to permit traffic from clients on the Internet to the OpenVPN server process.</description>
 			<type>checkbox</type>
 			<bindstofield>ovpnserver->step11->ovpnrule</bindstofield>
 		</field>
@@ -823,7 +858,7 @@
 		<field>
 			<name>ovpnallow</name>
 			<displayname>OpenVPN rule</displayname>
-			<description>Add a rule to allow all traffic from connected clients</description>
+			<description>Add a rule to allow all traffic from connected clients to pass across the VPN tunnel.</description>
 			<type>checkbox</type>
 			<bindstofield>ovpnserver->step11->ovpnallow</bindstofield>
 		</field>