diff options
| author | Erik Fonnesbeck <efonnes@gmail.com> | 2010-04-28 21:17:27 -0600 |
|---|---|---|
| committer | Erik Fonnesbeck <efonnes@gmail.com> | 2010-04-28 21:17:27 -0600 |
| commit | c3c2fd205b1563976a278bd11396d055d7818d27 (patch) | |
| tree | ae0316ca6b0c8423c35fe22cfa1e8bcaf30cdd55 /usr/local/www/system_usermanager_settings.php | |
| parent | 39c0be7b5f387dffa7cbbb3dff3f2be46e6b504f (diff) | |
| parent | 1364604bb503b02e80240bda728e154394271b9c (diff) | |
| download | pfsense-c3c2fd205b1563976a278bd11396d055d7818d27.zip pfsense-c3c2fd205b1563976a278bd11396d055d7818d27.tar.gz | |
Merge branch 'master' into gettext
Resolved conflicts:
usr/local/www/system_advanced_firewall.php
usr/local/www/system_routes.php
usr/local/www/system_routes_edit.php
Diffstat (limited to 'usr/local/www/system_usermanager_settings.php')
| -rwxr-xr-x | usr/local/www/system_usermanager_settings.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/local/www/system_usermanager_settings.php b/usr/local/www/system_usermanager_settings.php index 1298852..289d7fe 100755 --- a/usr/local/www/system_usermanager_settings.php +++ b/usr/local/www/system_usermanager_settings.php @@ -125,7 +125,7 @@ if(!$pconfig['backend']) <td width="78%" class="vtable"> <input name="session_timeout" id="session_timeout" type="text" size="8" value="<?=htmlspecialchars($pconfig['session_timeout']);?>" /> <br /> - <?=gettext("Time in minutes to expire idle management sessions. The default is 4 hours (240 minutes). <br/> 0 means to never expire sessions. NOTE: This is a security risk!");?><br /> + <?=gettext("Time in minutes to expire idle management sessions. The default is 4 hours (240 minutes). <br/> Enter 0 to never expire sessions. NOTE: This is a security risk!");?><br /> </td> </tr> <tr> |
