diff options
author | gnhb <gnoahb@gmail.com> | 2010-05-21 07:34:23 +0700 |
---|---|---|
committer | gnhb <gnoahb@gmail.com> | 2010-05-21 07:34:23 +0700 |
commit | d9e2c1714bc55f546702a8660f62e8cff2716aa4 (patch) | |
tree | 069b2f5369ad4bf9c7e60806b47f5dd42e409c78 /usr/local/www/interfaces.php | |
parent | 30ade8461e65922c8d8a22d3b9ba5b07bb2912e0 (diff) | |
parent | c0ed686f9441b7019722954020057b23fe2f6603 (diff) | |
download | pfsense-d9e2c1714bc55f546702a8660f62e8cff2716aa4.zip pfsense-d9e2c1714bc55f546702a8660f62e8cff2716aa4.tar.gz |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Conflicts:
usr/local/www/interfaces.php
Not sure why there was a conflict since the last change to this file was May 20.
Diffstat (limited to 'usr/local/www/interfaces.php')
-rwxr-xr-x | usr/local/www/interfaces.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index b496d45..22055f8 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -1698,6 +1698,7 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "pppoe" <td class="vtable"> <input name="ieee8021x" type="checkbox" value="yes" class="formfld" id="ieee8021x" <? if ($pconfig['ieee8021x']) echo "checked";?>> <br/>Setting this option will enable 802.1x authentication. + <br/><span class="red"><strong>NOTE:</strong</span> this option requires checking the "Enable WPA box". </td> </tr> <tr> |