diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-09 09:54:25 -0300 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-09 09:54:25 -0300 |
commit | c3ff89b45889c4228002807479f9d607fcc98552 (patch) | |
tree | a614ebb692ab312def9d3fea3beaab0cfc4f402d /usr/local/www/vpn_l2tp.php | |
parent | 3dbd3be91272c4fa095c3478ef06a7b004b272ba (diff) | |
parent | c708bdd490c2652ec055b543cc60a7ad391ef63a (diff) | |
download | pfsense-c3ff89b45889c4228002807479f9d607fcc98552.zip pfsense-c3ff89b45889c4228002807479f9d607fcc98552.tar.gz |
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/status_captiveportal.php
usr/local/www/status_rrd_graph.php
usr/local/www/status_wireless.php
Diffstat (limited to 'usr/local/www/vpn_l2tp.php')
-rw-r--r-- | usr/local/www/vpn_l2tp.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/local/www/vpn_l2tp.php b/usr/local/www/vpn_l2tp.php index 2e941c0..5d20383 100644 --- a/usr/local/www/vpn_l2tp.php +++ b/usr/local/www/vpn_l2tp.php @@ -350,7 +350,7 @@ function enable_change(enable_over) { </td> </tr> <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Encyrption type");?></td> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Encryption type");?></td> <td width="78%" class="vtable"> <?=$mandfldhtml;?><select name="paporchap" id="paporchap"> <option value='chap'<?php if($pconfig['paporchap'] == "chap") echo " SELECTED"; ?>><?=gettext("CHAP"); ?></option> |