diff --git a/include/class.mailer.php b/include/class.mailer.php
index b4ec97c243718f1b86b3a669c8bc901a6c947096..94c92626f3efd4f5d8536f67b10c8bd181532c72 100644
--- a/include/class.mailer.php
+++ b/include/class.mailer.php
@@ -2,7 +2,7 @@
 /*********************************************************************
     class.mailer.php
 
-    osTicket mailer 
+    osTicket mailer
 
     It's mainly PEAR MAIL wrapper for now (more improvements planned).
 
@@ -27,10 +27,10 @@ class Mailer {
 
     var $smtp = array();
     var $eol="\n";
-    
+
     function Mailer($email=null, $options=null) {
         global $cfg;
-       
+
         if(is_object($email) && $email->isSMTPEnabled() && ($info=$email->getSMTPInfo())) { //is SMTP enabled for the current email?
             $this->smtp = $info;
         } elseif($cfg && ($e=$cfg->getDefaultSMTPEmail()) && $e->isSMTPEnabled()) { //What about global SMTP setting?
@@ -54,7 +54,7 @@ class Mailer {
     function getEmail() {
         return $this->email;
     }
-    
+
     function getSMTPInfo() {
         return $this->smtp;
     }
@@ -117,7 +117,7 @@ class Mailer {
                     'X-Auto-Response-Suppress' => 'ALL, AutoReply',
                     'Auto-Submitted' => 'auto-replied');
 
-            if($options['bulk']) 
+            if($options['bulk'])
                 $headers+= array('Precedence' => 'bulk');
             else
                 $headers+= array('Precedence' => 'auto_reply');
@@ -134,7 +134,7 @@ class Mailer {
                     $mime->addAttachment($attachment['file'],$attachment['type'],$attachment['name']);
             }
         }
-        
+
         //Desired encodings...
         $encodings=array(
                 'head_encoding' => 'quoted-printable',
@@ -176,7 +176,7 @@ class Mailer {
 
     function logError($error) {
         global $ost;
-        //NOTE: Admin alert overwrite - don't email when having email trouble!
+        //NOTE: Admin alert override - don't email when having email trouble!
         $ost->logError('Mailer Error', $error, false);
     }
 
diff --git a/include/class.osticket.php b/include/class.osticket.php
index 7d75834d414e13be63e155548d118b6d6b2a701e..8755d3278fda537bd02e4454251b35a1dcbc1e58 100644
--- a/include/class.osticket.php
+++ b/include/class.osticket.php
@@ -375,7 +375,7 @@ class osTicket {
         if(!($ost = new osTicket()))
             return null;
 
-        //Set default time zone... user/staff settting will overwrite it (on login).
+        //Set default time zone... user/staff settting will override it (on login).
         $_SESSION['TZ_OFFSET'] = $ost->getConfig()->getTZoffset();
         $_SESSION['TZ_DST'] = $ost->getConfig()->observeDaylightSaving();
 
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 2c6f52676d10dacf0b34f505797b9ebf6e0d6388..f5731deddf41b267e222e33adc9ca82a0dccecf7 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -597,7 +597,7 @@ class Ticket {
      */
     function selectSLAId($trump=null) {
         global $cfg;
-        # XXX Should the SLA be overwritten if it was originally set via an
+        # XXX Should the SLA be overridden if it was originally set via an
         #     email filter? This method doesn't consider such a case
         if ($trump && is_numeric($trump)) {
             $slaId = $trump;
@@ -1815,7 +1815,7 @@ class Ticket {
     /*
      * The mother of all functions...You break it you fix it!
      *
-     *  $autorespond and $alertstaff overwrites config settings...
+     *  $autorespond and $alertstaff overrides config settings...
      */
     function create($vars, &$errors, $origin, $autorespond=true, $alertstaff=true) {
         global $ost, $cfg, $thisclient, $_FILES;
@@ -1928,7 +1928,7 @@ class Ticket {
         $priorityId=$vars['priorityId'];
         $source=ucfirst($vars['source']);
         $topic=NULL;
-        // Intenal mapping magic...see if we need to overwrite anything
+        // Intenal mapping magic...see if we need to override anything
         if(isset($vars['topicId']) && ($topic=Topic::lookup($vars['topicId']))) { //Ticket created via web by user/or staff
             $deptId=$deptId?$deptId:$topic->getDeptId();
             $priorityId=$priorityId?$priorityId:$topic->getPriorityId();
@@ -2010,7 +2010,7 @@ class Ticket {
             $ticket->assignToTeam($vars['teamId'], 'Auto Assignment');
 
         /**********   double check auto-response  ************/
-        //Overwrite auto responder if the FROM email is one of the internal emails...loop control.
+        //Override auto responder if the FROM email is one of the internal emails...loop control.
         if($autorespond && (Email::getIdByEmail($ticket->getEmail())))
             $autorespond=false;
 
diff --git a/include/class.variable.php b/include/class.variable.php
index ce82dc868dc72219f14a4bfcfc78cb1e9b551f63..3a71bd66de4239c47439cbd196061d1557ebf0f6 100644
--- a/include/class.variable.php
+++ b/include/class.variable.php
@@ -2,8 +2,8 @@
 /*********************************************************************
     class.variable.php
 
-    Variable replacer 
-    
+    Variable replacer
+
     Used to parse, resolve and replace variables.
 
     Peter Rotich <peter@osticket.com>
@@ -42,17 +42,17 @@ class VariableReplacer {
     function getErrors() {
         return $this->errors;
     }
-    
+
     function getObj($tag) {
         return @$this->objects[$tag];
     }
 
     function assign($var, $val='') {
-        
+
         if($val && is_object($val)) {
             $this->objects[$var] = $val;
         } elseif($var && is_array($var)) {
-            foreach($var as $k => $v) 
+            foreach($var as $k => $v)
                 $this->assign($k, $v);
         } elseif($var) {
             $this->variables[$var] = $val;
@@ -74,7 +74,7 @@ class VariableReplacer {
 
             return $this->getVar($rv, $part);
         }
-       
+
         if(!$var || !is_callable(array($obj, 'getVar')))
             return "";
 
@@ -84,9 +84,9 @@ class VariableReplacer {
 
         if(!is_object($rv))
             return $rv;
-            
+
         list(, $part) = explode('.', $var, 2);
-        
+
         return $this->getVar($rv, $part);
     }
 
@@ -110,7 +110,7 @@ class VariableReplacer {
         $parts = explode('.', $var, 2);
         if($parts && ($obj=$this->getObj($parts[0])))
             return $this->getVar($obj, $parts[1]);
-        elseif($parts[0] && @isset($this->variables[$parts[0]])) //root overwrite
+        elseif($parts[0] && @isset($this->variables[$parts[0]])) //root override
             return $this->variables[$parts[0]];
 
         //Unknown object or variable - leavig it alone.
diff --git a/include/staff/department.inc.php b/include/staff/department.inc.php
index ab22f94ec3074e88c37c8ef509336dbf192bf611..b43806b0b99bd65ec8be77b68b2db7e803ab410b 100644
--- a/include/staff/department.inc.php
+++ b/include/staff/department.inc.php
@@ -158,7 +158,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <th colspan="2">
-                <em><strong>Auto Response Settings</strong>: Overwrite global auto-response settings for tickets routed to the Dept.</em>
+                <em><strong>Auto Response Settings</strong>: Override global auto-response settings for tickets routed to the Dept.</em>
             </th>
         </tr>
         <tr>
diff --git a/include/staff/email.inc.php b/include/staff/email.inc.php
index 75e400c7ccff1a5f02f7a82fd5f5d37cf4717fd0..58ecb35a8cd6b1cad83377fdfbf68a6f8541fbc9 100644
--- a/include/staff/email.inc.php
+++ b/include/staff/email.inc.php
@@ -109,7 +109,8 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <input type="checkbox" name="noautoresp" value="1" <?php echo $info['noautoresp']?'checked="checked"':''; ?> >
-                <strong>Disable</strong> new ticket auto-response for this email. Overwrite global and dept. settings.
+                <strong>Disable</strong> new ticket auto-response for this
+                email. Override global and dept. settings.
             </td>
         </tr>
         <tr>
diff --git a/include/staff/filter.inc.php b/include/staff/filter.inc.php
index 7ccecd79b85172ba7cda8e7d7b34fe179839ed71..d82c1ca85d2e2fd0998be5154a9de778dc996eeb 100644
--- a/include/staff/filter.inc.php
+++ b/include/staff/filter.inc.php
@@ -157,7 +157,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         } ?>
         <tr>
             <th colspan="2">
-                <em><strong>Filter Actions</strong>: Can be overwriten by other filters depending on processing order.&nbsp;</em>
+                <em><strong>Filter Actions</strong>: Can be overridden by other filters depending on processing order.&nbsp;</em>
             </th>
         </tr>
         <tr>
@@ -184,7 +184,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <input type="checkbox" name="disable_autoresponder" value="1" <?php echo $info['disable_autoresponder']?'checked="checked"':''; ?> >
-                    <strong>Disable</strong> auto-response. <em>(Overwrites Dept. settings)</em>
+                    <strong>Disable</strong> auto-response. <em>(Override Dept. settings)</em>
             </td>
         </tr>
         <tr>
@@ -249,7 +249,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     ?>
                 </select>
                 &nbsp;<span class="error">*&nbsp;<?php echo $errors['priority_id']; ?></span>
-                <em>(Overwrites department's priority)</em>
+                <em>(Overrides department's priority)</em>
             </td>
         </tr>
         <tr>
@@ -269,7 +269,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     ?>
                 </select>
                 &nbsp;<span class="error">&nbsp;<?php echo $errors['sla_id']; ?></span>
-                <em>(Overwrites department's SLA)</em>
+                <em>(Overrides department's SLA)</em>
             </td>
         </tr>
         <tr>
diff --git a/include/staff/helptopic.inc.php b/include/staff/helptopic.inc.php
index e54323ac491f61eb8ea4044440523369446ed5e0..5dafc452d1d05ac9531383ecc7e7a43d6939d65d 100644
--- a/include/staff/helptopic.inc.php
+++ b/include/staff/helptopic.inc.php
@@ -146,7 +146,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     ?>
                 </select>
                 &nbsp;<span class="error">&nbsp;<?php echo $errors['sla_id']; ?></span>
-                <em>(Overwrites department's SLA)</em>
+                <em>(Overrides department's SLA)</em>
             </td>
         </tr>
         <tr>
@@ -166,7 +166,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     }
                     ?>
                 </select>&nbsp;<font class="error"><?php echo $errors['page_id']; ?></font>
-                <em>(Overwrites global setting. Applies to web tickets only.)</em>
+                <em>(Overrides global setting. Applies to web tickets only.)</em>
             </td>
         </tr>
         <tr>
@@ -213,7 +213,8 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <input type="checkbox" name="noautoresp" value="1" <?php echo $info['noautoresp']?'checked="checked"':''; ?> >
-                    <strong>Disable</strong> new ticket auto-response for this topic (Overwrites Dept. settings).
+                    <strong>Disable</strong> new ticket auto-response for
+                    this topic (Overrides Dept. settings).
             </td>
         </tr>
 
diff --git a/include/staff/settings-autoresp.inc.php b/include/staff/settings-autoresp.inc.php
index b5815915fc346bb97fbfa318db9416bda6bfccce..0ad893b3fb97c4515ca407e9318a164cdc37454e 100644
--- a/include/staff/settings-autoresp.inc.php
+++ b/include/staff/settings-autoresp.inc.php
@@ -28,7 +28,7 @@
                 <input type="radio" name="ticket_notice_active"  value="1"   <?php echo $config['ticket_notice_active']?'checked="checked"':''; ?> /><b>Enable</b>
                 <input type="radio" name="ticket_notice_active"  value="0"   <?php echo !$config['ticket_notice_active']?'checked="checked"':''; ?> />Disable
                  &nbsp;&nbsp;&nbsp;
-                 <em>(Notice sent when staff creates a ticket on behalf of the user (Staff can overwrite))</em>
+                 <em>(Notice sent when staff creates a ticket on behalf of the user (Staff can override))</em>
             </td>
         </tr>
         <tr>
diff --git a/include/staff/settings-emails.inc.php b/include/staff/settings-emails.inc.php
index b7175a06e6b9c5b6768690de5d233bdd6a43f5fc..e433cd7a2d9eb0d10243d886ce06e941d8dc7773 100644
--- a/include/staff/settings-emails.inc.php
+++ b/include/staff/settings-emails.inc.php
@@ -10,7 +10,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
         <tr>
             <th colspan="2">
                 <h4>Email Settings</h4>
-                <em>Note that some of the global settings can be overwritten at department/email level.</em>
+                <em>Note that some of the global settings can be overridden at department/email level.</em>
             </th>
         </tr>
     </thead>
@@ -58,7 +58,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
             <td>
                 <input type="text" size=40 name="admin_email" value="<?php echo $config['admin_email']; ?>">
                     &nbsp;<font class="error">*&nbsp;<?php echo $errors['admin_email']; ?></font>
-                &nbsp;&nbsp;<em>(System administrator's email)</em> 
+                &nbsp;&nbsp;<em>(System administrator's email)</em>
             </td>
         </tr>
         <tr><th colspan=2><em><strong>Incoming Emails</strong>: For mail fetcher (polling) to work you must set an external cron job or enable auto-cron polling</em></th>
diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php
index 4d3f47f6f90849c6b4b6ed313fa95bcb96df2cc4..0c29ca73a1c6bbc4d478e3e71433031ed2754c22 100644
--- a/include/staff/settings-tickets.inc.php
+++ b/include/staff/settings-tickets.inc.php
@@ -80,7 +80,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
                     <td width="180">Web Tickets Priority:</td>
                     <td>
                         <input type="checkbox" name="allow_priority_change" value="1" <?php echo $config['allow_priority_change'] ?'checked="checked"':''; ?>>
-                        <em>(Allow user to overwrite/set priority)</em>
+                        <em>(Allow user to override/set priority)</em>
                     </td>
                 </tr>
                 <tr>
diff --git a/include/staff/slaplan.inc.php b/include/staff/slaplan.inc.php
index 541050ce846f9a65ddcf35baf868f3e4436f5275..94f1fb1c61a9bf805758339f36d5885f003fa1ee 100644
--- a/include/staff/slaplan.inc.php
+++ b/include/staff/slaplan.inc.php
@@ -80,7 +80,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <input type="checkbox" name="transient" value="1" <?php echo $info['transient']?'checked="checked"':''; ?> >
-                SLA can be overwritten on ticket transfer or help topic
+                SLA can be overridden on ticket transfer or help topic
                 change
             </td>
         </tr>
@@ -90,10 +90,10 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <input type="checkbox" name="disable_overdue_alerts" value="1" <?php echo $info['disable_overdue_alerts']?'checked="checked"':''; ?> >
-                    <strong>Disable</strong> overdue alerts notices. <em>(Overwrite global setting)</em>
+                    <strong>Disable</strong> overdue alerts notices.
+                    <em>(Override global setting)</em>
             </td>
         </tr>
-
         <tr>
             <th colspan="2">
                 <em><strong>Admin Notes</strong>: Internal notes.&nbsp;</em>
diff --git a/include/staff/team.inc.php b/include/staff/team.inc.php
index 916582d8e7d95b4d5d188f0174aca1f3bd3411b8..4ca688ac5ae3702b80f2478e67c407330b809bf7 100644
--- a/include/staff/team.inc.php
+++ b/include/staff/team.inc.php
@@ -81,7 +81,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <input type="checkbox" name="noalerts" value="1" <?php echo $info['noalerts']?'checked="checked"':''; ?> >
-                <strong>Disable</strong> assignment alerts for this team (<i>overwrite global settings.</i>)
+                <strong>Disable</strong> assignment alerts for this team (<i>override global settings.</i>)
             </td>
         </tr>
         <?php
@@ -97,8 +97,8 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                             <b><a href="staff.php?id=%d">%s</a></span></b>
                             &nbsp;<input type="checkbox" name="remove[]" value="%d"><i>Remove</i></td></tr>',
                           $staff->getId(),$staff->getName(),$staff->getId());
-               
-            
+
+
             }
         } ?>
         <tr>
diff --git a/include/staff/teams.inc.php b/include/staff/teams.inc.php
index 0d33d7dfb036bcbcae2e2c467ad65d07ca0d3d4b..9724714f71956fcdc0fb3ddb9f4cd5e3fb3a26f5 100644
--- a/include/staff/teams.inc.php
+++ b/include/staff/teams.inc.php
@@ -52,7 +52,7 @@ else
     <caption><?php echo $showing; ?></caption>
     <thead>
         <tr>
-            <th width="7px">&nbsp;</th>        
+            <th width="7px">&nbsp;</th>
             <th width="250"><a <?php echo $name_sort; ?> href="teams.php?<?php echo $qstr; ?>&sort=name">Team Name</a></th>
             <th width="80"><a  <?php echo $status_sort; ?> href="teams.php?<?php echo $qstr; ?>&sort=status">Status</a></th>
             <th width="80"><a  <?php echo $members_sort; ?>href="teams.php?<?php echo $qstr; ?>&sort=members">Members</a></th>
@@ -73,7 +73,7 @@ else
                 ?>
             <tr id="<?php echo $row['team_id']; ?>">
                 <td width=7px>
-                  <input type="checkbox" class="ckb" name="ids[]" value="<?php echo $row['team_id']; ?>" 
+                  <input type="checkbox" class="ckb" name="ids[]" value="<?php echo $row['team_id']; ?>"
                             <?php echo $sel?'checked="checked"':''; ?>> </td>
                 <td><a href="teams.php?id=<?php echo $row['team_id']; ?>"><?php echo $row['name']; ?></a> &nbsp;</td>
                 <td>&nbsp;<?php echo $row['isenabled']?'Active':'<b>Disabled</b>'; ?></td>
diff --git a/include/staff/ticket-edit.inc.php b/include/staff/ticket-edit.inc.php
index 5f5a0a4d2e2e86816e64039bfb6ede821f5379b5..93fc68bad4f957eb3044b503eb5dc0c6df8ae4d9 100644
--- a/include/staff/ticket-edit.inc.php
+++ b/include/staff/ticket-edit.inc.php
@@ -50,7 +50,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$ticket->getUpdateInfo());
         </tr>
         <tr>
             <th colspan="2">
-                <em><strong>Ticket Information</strong>: Due date overwrites SLA's grace period.</em>
+                <em><strong>Ticket Information</strong>: Due date overrides SLA's grace period.</em>
             </th>
         </tr>
         <tr>
@@ -146,7 +146,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$ticket->getUpdateInfo());
                 $min=$hr=null;
                 if($info['time'])
                     list($hr, $min)=explode(':', $info['time']);
-                    
+
                 echo Misc::timeDropdown($hr, $min, 'time');
                 ?>
                 &nbsp;<font class="error">&nbsp;<?php echo $errors['duedate']; ?>&nbsp;<?php echo $errors['time']; ?></font>
diff --git a/main.inc.php b/main.inc.php
index b980d87ed93f3ec2f81a09af97c21c67ba0d5f0a..4b69b3e1638a2fc8f90f9d9533c092f31a9dffbd 100644
--- a/main.inc.php
+++ b/main.inc.php
@@ -198,7 +198,7 @@
     define('API_KEY_TABLE',TABLE_PREFIX.'api_key');
     define('TIMEZONE_TABLE',TABLE_PREFIX.'timezone');
 
-    #Global overwrite
+    #Global override
     if (isset($_SERVER['HTTP_X_FORWARDED_FOR']))
         // Take the left-most item for X-Forwarded-For
         $_SERVER['REMOTE_ADDR'] = array_pop(
@@ -235,7 +235,7 @@
     $session = $ost->getSession();
 
     //System defaults we might want to make global//
-    #pagenation default - user can overwrite it!
+    #pagenation default - user can override it!
     define('DEFAULT_PAGE_LIMIT', $cfg->getPageSize()?$cfg->getPageSize():25);
 
     #Cleanup magic quotes crap.
diff --git a/scp/admin.inc.php b/scp/admin.inc.php
index 19d2d5fbcf97008b689ee6a07204c1780e3ad455..97dc168406af6c36909cdcfd135eca8947fc5624 100644
--- a/scp/admin.inc.php
+++ b/scp/admin.inc.php
@@ -34,11 +34,11 @@ if($ost->isUpgradePending()) {
         exit;
     }
 } else {
-    
+
     if(!strcasecmp(basename(CONFIG_FILE), 'settings.php')) {
         $sysnotice=sprintf('Please rename config file include/%s to include/ost-config.php to avoid possible conflicts',
                                 basename(CONFIG_FILE));
-        //Die gracefully - otherwise upgraded RC5 installations will die with confusing message. 
+        //Die gracefully - otherwise upgraded RC5 installations will die with confusing message.
         if(!strcasecmp(basename($_SERVER['SCRIPT_NAME']), 'settings.php'))
             die($sysnotice);
 
diff --git a/scp/js/ticket.js b/scp/js/ticket.js
index 56b02f20136a6218ee937c63de3705ccc8916285..ab83eab43ae8be4a65af0b15177d4ea93b9f5fe4 100644
--- a/scp/js/ticket.js
+++ b/scp/js/ticket.js
@@ -14,7 +14,7 @@
     vim: expandtab sw=4 ts=4 sts=4:
 **********************************************************************/
 var autoLock = {
-    
+
     addEvent: function(elm, evType, fn, useCapture) {
         if(elm.addEventListener) {
             elm.addEventListener(evType, fn, useCapture);
@@ -55,7 +55,7 @@ var autoLock = {
                 return "Any changes or info you've entered will be discarded!";
              });
         }
-        
+
         autoLock.lasteventTime=new Date().getTime();
     },
 
@@ -75,7 +75,7 @@ var autoLock = {
                     break;
                 case 'select-one':
                 case 'select-multiple':
-                    if(fObj.name!='reply') //Bug on double ajax call since select make it's own ajax call. TODO: fix it 
+                    if(fObj.name!='reply') //Bug on double ajax call since select make it's own ajax call. TODO: fix it
                         autoLock.addEvent(fObj[i],'change',autoLock.handleEvent,true);
                     break;
                 default:
@@ -98,8 +98,8 @@ var autoLock = {
 
         //make sure we are on ticket view page & locking is enabled!
         var fObj=$('form#note');
-        if(!fObj 
-                || !$(':input[name=id]',fObj).length 
+        if(!fObj
+                || !$(':input[name=id]',fObj).length
                 || !$(':input[name=locktime]',fObj).length
                 || $(':input[name=locktime]',fObj).val()==0) {
             return;
@@ -124,7 +124,7 @@ var autoLock = {
         autoLock.resetTimer();
         autoLock.addEvent(window,'unload',autoLock.releaseLock,true); //Release lock regardless of any activity.
     },
-          
+
 
     onSubmit: function(e) {
         if(e.type=='submit') { //Submit. double check!
@@ -146,8 +146,8 @@ var autoLock = {
         }
         return true;
     },
-    
-    acquireLock: function(e,warn) {      
+
+    acquireLock: function(e,warn) {
 
         if(!autoLock.tid) { return false; }
 
@@ -168,16 +168,16 @@ var autoLock = {
             .done(function() { })
             .fail(function() { });
         }
-   
+
         return autoLock.lockId;
     },
 
-    //Renewal only happens on form activity.. 
+    //Renewal only happens on form activity..
     renewLock: function(e) {
-        
+
         if(!autoLock.lockId) { return false; }
-        
-        var now= new Date().getTime(); 
+
+        var now= new Date().getTime();
         if(!autoLock.lastcheckTime || (now-autoLock.lastcheckTime)>=(autoLock.renewFreq*1000)){
             $.ajax({
                 type: 'POST',
@@ -191,8 +191,8 @@ var autoLock = {
             .done(function() {  })
             .fail(function() { });
         }
-    }, 
-     
+    },
+
     releaseLock: function(e) {
         if(!autoLock.tid) { return false; }
 
@@ -202,7 +202,7 @@ var autoLock = {
             data: 'delete',
             cache: false,
             success: function(){
-               
+
             }
         })
         .done(function() { })
@@ -211,15 +211,15 @@ var autoLock = {
 
     setLock: function(lock, action, warn) {
         var warn = warn || false;
-            
+
         if(!lock) return false;
 
         if(lock.id) {
             autoLock.renewFreq=lock.time?(lock.time/2):30;
             autoLock.lastcheckTime=new Date().getTime();
         }
-        autoLock.lockId=lock.id; //overwrite the lockid.
-        
+        autoLock.lockId=lock.id; //override the lockid.
+
         switch(action){
             case 'renew':
                 if(!lock.id && lock.retry) {
@@ -232,18 +232,18 @@ var autoLock = {
                     autoLock.lockAttempts++;
                     if(warn && (!lock.retry || autoLock.lockAttempts>=autoLock.maxattempts)) {
                         autoLock.retry=false;
-                        alert('Unable to lock the ticket. Someone else could be working on the same ticket.'); 
+                        alert('Unable to lock the ticket. Someone else could be working on the same ticket.');
                     }
-                }   
+                }
                 break;
         }
     },
-    
+
     discardWarning: function(e) {
         e.returnValue="Any changes or info you've entered will be discarded!";
     },
 
-    //TODO: Monitor events and elapsed time and warn user when the lock is about to expire. 
+    //TODO: Monitor events and elapsed time and warn user when the lock is about to expire.
     monitorEvents: function() {
        // warn user when lock is about to expire??;
         //autoLock.resetTimer();
@@ -252,7 +252,7 @@ var autoLock = {
     clearTimer: function() {
         clearTimeout(autoLock.timerId);
     },
-    
+
     resetTimer: function() {
         clearTimeout(autoLock.timerId);
         autoLock.timerId=setTimeout(function () { autoLock.monitorEvents() },30000);
@@ -283,7 +283,7 @@ jQuery(function($) {
     }
 
     $('#reply_tab').click(function() {
-       $(this).removeClass('tell'); 
+       $(this).removeClass('tell');
      });
 
     $('#note_tab').click(function() {
@@ -341,7 +341,7 @@ jQuery(function($) {
         $('.dialog#ticket-status').show();
         return false;
     });
-       
+
     //ticket actions confirmation - Delete + more
     $('a#ticket-delete, a#ticket-claim, #action-dropdown-more li a').click(function(e) {
         e.preventDefault();