diff --git a/backup/moodle2/restore_stepslib.php b/backup/moodle2/restore_stepslib.php
index 386d8f48940..12d67aec54c 100644
--- a/backup/moodle2/restore_stepslib.php
+++ b/backup/moodle2/restore_stepslib.php
@@ -194,7 +194,7 @@ class restore_gradebook_structure_step extends restore_structure_step {
             if ($data->itemtype=='course' && !empty($coursecategory)) {
                 $data->iteminstance = $coursecategory->id;
             }
-            
+
             $newitemid = $DB->insert_record('grade_items', $data);
         }
         $this->set_mapping('grade_item', $oldid, $newitemid);
@@ -310,7 +310,7 @@ class restore_gradebook_structure_step extends restore_structure_step {
             'courseid' => $this->get_courseid()
         );
         $grade_category = new stdclass();
-        
+
         $rs = $DB->get_recordset('grade_categories', $conditions);
         if (!empty($rs)) {
             //get all the parents correct first as grade_category::build_path() loads category parents from the DB
@@ -1372,7 +1372,7 @@ class restore_course_completion_structure_step extends restore_structure_step {
 
         // This may be empty if criteria could not be restored
         $data->criteriaid = $this->get_mappingid('course_completion_criteria', $data->criteriaid);
-        
+
         $data->course = $this->get_courseid();
         $data->userid = $this->get_mappingid('user', $data->userid);
 
@@ -1915,7 +1915,7 @@ abstract class restore_activity_structure_step extends restore_structure_step {
     }
 
     /**
-     * This must be invoked inmediately after creating the "module" activity record (forum, choice...)
+     * This must be invoked immediately after creating the "module" activity record (forum, choice...)
      * and will adjust the new activity id (the instance) in various places
      */
     protected function apply_activity_instance($newitemid) {
diff --git a/enrol/category/locallib.php b/enrol/category/locallib.php
index 0b8137f7506..6924eaa6ea5 100644
--- a/enrol/category/locallib.php
+++ b/enrol/category/locallib.php
@@ -260,7 +260,7 @@ function enrol_category_sync_full() {
     $params['courselevel'] = CONTEXT_COURSE;
     $params['catlevel'] = CONTEXT_COURSECAT;
 
-    // first of all add necessay enrol instances to all courses
+    // first of all add necessary enrol instances to all courses
     $parentcat = $DB->sql_concat("cat.path", "'/%'");
     $sql = "SELECT DISTINCT c.*
               FROM {course} c
diff --git a/enrol/ldap/lib.php b/enrol/ldap/lib.php
index 736a3d7a337..cc1e300fe0f 100644
--- a/enrol/ldap/lib.php
+++ b/enrol/ldap/lib.php
@@ -829,7 +829,7 @@ class enrol_ldap_plugin extends enrol_plugin {
                 $objectclass = ldap_get_values($ldapconnection, $entry, 'objectClass');
 
                 if (!in_array('group', $objectclass)) {
-                    // Not a group, so return inmediately.
+                    // Not a group, so return immediately.
                     return array($group);
                 }
 
diff --git a/mod/assignment/restorelib.php b/mod/assignment/restorelib.php
index c90d8079107..81354ae5ab0 100644
--- a/mod/assignment/restorelib.php
+++ b/mod/assignment/restorelib.php
@@ -22,7 +22,7 @@
     //-----------------------------------------------------------
 
 
-    //This function returns a log record with all the necessay transformations
+    //This function returns a log record with all the necessary transformations
     //done. It's used by restore_log_module() to restore modules log.
     function assignment_restore_logs($restore,$log) {
 
diff --git a/mod/chat/backup/moodle2/restore_chat_stepslib.php b/mod/chat/backup/moodle2/restore_chat_stepslib.php
index 89fa8539282..9c08a54d5b3 100644
--- a/mod/chat/backup/moodle2/restore_chat_stepslib.php
+++ b/mod/chat/backup/moodle2/restore_chat_stepslib.php
@@ -57,7 +57,7 @@ class restore_chat_activity_structure_step extends restore_activity_structure_st
 
         // insert the chat record
         $newitemid = $DB->insert_record('chat', $data);
-        // inmediately after inserting "activity" record, call this
+        // immediately after inserting "activity" record, call this
         $this->apply_activity_instance($newitemid);
     }
 
diff --git a/mod/chat/restorelib.php b/mod/chat/restorelib.php
index 261bf09872b..84eb13ceb8b 100644
--- a/mod/chat/restorelib.php
+++ b/mod/chat/restorelib.php
@@ -21,7 +21,7 @@
     //
     //-----------------------------------------------------------
 
-    //This function returns a log record with all the necessay transformations
+    //This function returns a log record with all the necessary transformations
     //done. It's used by restore_log_module() to restore modules log.
     function chat_restore_logs($restore,$log) {
         $status = false;
diff --git a/mod/choice/backup/moodle2/restore_choice_stepslib.php b/mod/choice/backup/moodle2/restore_choice_stepslib.php
index bbfdcf4fba4..75a56f80516 100644
--- a/mod/choice/backup/moodle2/restore_choice_stepslib.php
+++ b/mod/choice/backup/moodle2/restore_choice_stepslib.php
@@ -59,7 +59,7 @@ class restore_choice_activity_structure_step extends restore_activity_structure_
 
         // insert the choice record
         $newitemid = $DB->insert_record('choice', $data);
-        // inmediately after inserting "activity" record, call this
+        // immediately after inserting "activity" record, call this
         $this->apply_activity_instance($newitemid);
     }
 
diff --git a/mod/choice/db/upgrade.php b/mod/choice/db/upgrade.php
index e61a1489b31..4d664d627af 100644
--- a/mod/choice/db/upgrade.php
+++ b/mod/choice/db/upgrade.php
@@ -29,7 +29,7 @@ function xmldb_choice_upgrade($oldversion) {
 
     if ($oldversion < 2009042000) {
 
-    /// Rename field text on table choice to NEWNAMEGOESHERE
+    /// Rename field text on table choice to text
         $table = new xmldb_table('choice');
         $field = new xmldb_field('text', XMLDB_TYPE_TEXT, 'small', null, XMLDB_NOTNULL, null, null, 'name');
 
@@ -42,7 +42,7 @@ function xmldb_choice_upgrade($oldversion) {
 
     if ($oldversion < 2009042001) {
 
-    /// Rename field format on table choice to NEWNAMEGOESHERE
+    /// Rename field format on table choice to format
         $table = new xmldb_table('choice');
         $field = new xmldb_field('format', XMLDB_TYPE_INTEGER, '4', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'intro');
 
diff --git a/mod/choice/lib.php b/mod/choice/lib.php
index c262a911bab..02b89fec76a 100644
--- a/mod/choice/lib.php
+++ b/mod/choice/lib.php
@@ -70,6 +70,7 @@ $CHOICE_DISPLAY = array (CHOICE_DISPLAY_HORIZONTAL   => get_string('displayhoriz
 function choice_user_outline($course, $user, $mod, $choice) {
     global $DB;
     if ($answer = $DB->get_record('choice_answers', array('choiceid' => $choice->id, 'userid' => $user->id))) {
+        $result = new object();
         $result->info = "'".format_string(choice_get_option_text($choice, $answer->optionid))."'";
         $result->time = $answer->timemodified;
         return $result;
@@ -88,6 +89,7 @@ function choice_user_outline($course, $user, $mod, $choice) {
 function choice_user_complete($course, $user, $mod, $choice) {
     global $DB;
     if ($answer = $DB->get_record('choice_answers', array("choiceid" => $choice->id, "userid" => $user->id))) {
+        $result = new object();
         $result->info = "'".format_string(choice_get_option_text($choice, $answer->optionid))."'";
         $result->time = $answer->timemodified;
         echo get_string("answered", "choice").": $result->info. ".get_string("updated", '', userdate($result->time));
@@ -415,7 +417,7 @@ function prepare_choice_show_results($choice, $course, $cm, $allresponses, $forc
             if ($choice->showunanswered) {
                 echo "<td class=\"col$count data\" >";
                 // added empty row so that when the next iteration is empty,
-                // we do not get <table></table> erro from w3c validator
+                // we do not get <table></table> error from w3c validator
                 // MDL-7861
                 echo "<table class=\"choiceresponse\"><tr><td></td></tr>";
                 if (!empty($allresponses[0])) {
@@ -437,7 +439,7 @@ function prepare_choice_show_results($choice, $course, $cm, $allresponses, $forc
                     echo '<td class="col'.$count.' data" >';
 
                     // added empty row so that when the next iteration is empty,
-                    // we do not get <table></table> erro from w3c validator
+                    // we do not get <table></table> error from w3c validator
                     // MDL-7861
                     echo '<table class="choiceresponse"><tr><td></td></tr>';
                     if (isset($allresponses[$optionid])) {
diff --git a/mod/choice/renderer.php b/mod/choice/renderer.php
index 5c1eb1e73ea..c37d09ae26a 100644
--- a/mod/choice/renderer.php
+++ b/mod/choice/renderer.php
@@ -41,21 +41,21 @@ class mod_choice_renderer extends plugin_renderer_base {
         }
         $target = new moodle_url('/mod/choice/view.php');
         $attributes = array('method'=>'POST', 'target'=>$target, 'class'=> $layoutclass);
-        
+
         $html = html_writer::start_tag('form', $attributes);
         $html .= html_writer::start_tag('ul', array('class'=>'choices' ));
-        
+
         $availableoption = count($options['options']);
-        foreach ($options['options'] as $option) {            
+        foreach ($options['options'] as $option) {
             $html .= html_writer::start_tag('li', array('class'=>'option'));
             $option->attributes->name = 'answer';
             $option->attributes->type = 'radio';
-            
+
             $labeltext = $option->text;
-            if (!empty($option->attributes->disabled)) { 
+            if (!empty($option->attributes->disabled)) {
                 $labeltext .= ' ' . get_string('full', 'choice');
                 $availableoption--;
-            }            
+            }
 
             $html .= html_writer::empty_tag('input', (array)$option->attributes);
             $html .= html_writer::tag('label', $labeltext, array('for'=>$option->attributes->name));
@@ -67,7 +67,7 @@ class mod_choice_renderer extends plugin_renderer_base {
         $html .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'sesskey', 'value'=>sesskey()));
         $html .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'id', 'value'=>$coursemoduleid));
 
-        if (!empty($options['hascapability']) && ($options['hascapability'])) {            
+        if (!empty($options['hascapability']) && ($options['hascapability'])) {
             if ($availableoption < 1) {
                $html .= html_writer::tag('label', get_string('choicefull', 'choice'));
             } else {
@@ -81,10 +81,10 @@ class mod_choice_renderer extends plugin_renderer_base {
         } else {
             $html .= html_writer::tag('label', get_string('havetologin', 'choice'));
         }
-        
+
         $html .= html_writer::end_tag('ul');
-        $html .= html_writer::end_tag('form');        
-        
+        $html .= html_writer::end_tag('form');
+
         return $html;
     }
 
@@ -95,20 +95,20 @@ class mod_choice_renderer extends plugin_renderer_base {
      * @return string
      */
     public function display_result($choices, $forcepublish = false) {
-        if (empty($forcepublish)) { //alow the publish setting to be overridden
+        if (empty($forcepublish)) { //allow the publish setting to be overridden
             $forcepublish = $choices->publish;
         }
 
         $displaylayout = $choices->display;
 
-        if ($forcepublish) {  //CHOICE_PUBLISH_NAMES            
+        if ($forcepublish) {  //CHOICE_PUBLISH_NAMES
             return $this->display_publish_name_vertical($choices);
         } else { //CHOICE_PUBLISH_ANONYMOUS';
             if ($displaylayout == DISPLAY_HORIZONTAL_LAYOUT) {
                 return $this->display_publish_anonymous_horizontal($choices);
             }
             return $this->display_publish_anonymous_vertical($choices);
-        }                
+        }
     }
 
     /**
@@ -120,16 +120,16 @@ class mod_choice_renderer extends plugin_renderer_base {
     public function display_publish_name_vertical($choices) {
         $html ='';
         $html .= html_writer::tag('h2',format_string(get_string("responses", "choice")), array('class'=>'main'));
-        
+
         $attributes = array('method'=>'POST');
         $attributes['action'] = new moodle_url('/mod/choice/view.php');
         $attributes['id'] = 'attemptsform';
-                
+
         if ($choices->viewresponsecapability) {
             $html .= html_writer::start_tag('form', $attributes);
             $html .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'id', 'value'=> $choices->coursemoduleid));
             $html .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'sesskey', 'value'=> sesskey()));
-            $html .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'mode', 'value'=>'overview'));                
+            $html .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'mode', 'value'=>'overview'));
         }
 
         $table = new html_table();
@@ -144,7 +144,7 @@ class mod_choice_renderer extends plugin_renderer_base {
 
         $columns = array();
         foreach ($choices->options as $optionid => $options) {
-            $coldata = '';            
+            $coldata = '';
             if ($choices->showunanswered && $optionid == 0) {
                 $coldata .= html_writer::tag('div', format_string(get_string('notanswered', 'choice')), array('class'=>'option'));
             } else if ($optionid > 0) {
@@ -152,13 +152,13 @@ class mod_choice_renderer extends plugin_renderer_base {
             }
             $numberofuser = 0;
             if (!empty($options->user) && count($options->user) > 0) {
-                $numberofuser = count($options->user);                
-            } 
-            
-            $coldata .= html_writer::tag('div', ' ('.$numberofuser. ')', array('class'=>'numberofuser', 'title' => get_string('numberofuser', 'choice')));            
+                $numberofuser = count($options->user);
+            }
+
+            $coldata .= html_writer::tag('div', ' ('.$numberofuser. ')', array('class'=>'numberofuser', 'title' => get_string('numberofuser', 'choice')));
             $columns[] = $coldata;
         }
-        
+
         $table->head = $columns;
 
         $coldata = '';
@@ -167,13 +167,13 @@ class mod_choice_renderer extends plugin_renderer_base {
             $coldata = '';
             if ($choices->showunanswered || $optionid > 0) {
                 if (!empty($options->user)) {
-                    foreach ($options->user as $user) { 
+                    foreach ($options->user as $user) {
                         $data = '';
                         if (empty($user->imagealt)){
                             $user->imagealt = '';
                         }
-                        
-                        if ($choices->viewresponsecapability && $choices->deleterepsonsecapability  && $optionid > 0) {                            
+
+                        if ($choices->viewresponsecapability && $choices->deleterepsonsecapability  && $optionid > 0) {
                             $attemptaction = html_writer::checkbox('attemptid[]', $user->id,'');
                             $data .= html_writer::tag('div', $attemptaction, array('class'=>'attemptaction'));
                         }
@@ -184,23 +184,23 @@ class mod_choice_renderer extends plugin_renderer_base {
                         $name = html_writer::tag('a', fullname($user, $choices->fullnamecapability), array('href'=>$userlink, 'class'=>'username'));
                         $data .= html_writer::tag('div', $name, array('class'=>'fullname'));
                         $data .= html_writer::tag('div','', array('class'=>'clearfloat'));
-                        $coldata .= html_writer::tag('div', $data, array('class'=>'user'));                        
-                    }                    
-                }                
+                        $coldata .= html_writer::tag('div', $data, array('class'=>'user'));
+                    }
+                }
             }
-            
+
             $columns[] = $coldata;
             $count++;
         }
-       
-        $table->data[] = $columns;        
+
+        $table->data[] = $columns;
         foreach ($columns as $d) {
             $table->colclasses[] = 'data';
         }
         $html .= html_writer::tag('div', html_writer::table($table), array('class'=>'response'));
-        
+
         $actiondata = '';
-        if ($choices->viewresponsecapability && $choices->deleterepsonsecapability) {            
+        if ($choices->viewresponsecapability && $choices->deleterepsonsecapability) {
             $selecturl = new moodle_url('#');
 
             $selectallactions = new component_action('click',"select_all_in", array('div',null,'tablecontainer'));
@@ -212,18 +212,18 @@ class mod_choice_renderer extends plugin_renderer_base {
             $actiondata .= $this->output->render($deselectall);
 
             $actiondata .= html_writer::tag('label', ' ' . get_string('withselected', 'quiz') . ' ', array('for'=>'menuaction'));
-            
+
             $actionurl = new moodle_url('/mod/choice/view.php', array('sesskey'=>sesskey(), 'action'=>'delete_confirmation()'));
             $select = new single_select($actionurl, 'action', array('delete'=>get_string('delete')), null, array(''=>get_string('moveselectedusersto', 'choice')), 'attemptsform');
-            
+
             $actiondata .= $this->output->render($select);
         }
         $html .= html_writer::tag('div', $actiondata, array('class'=>'responseaction'));
-        
+
         if ($choices->viewresponsecapability) {
             $html .= html_writer::end_tag('form');
         }
-       
+
         return $html;
     }
 
@@ -236,12 +236,12 @@ class mod_choice_renderer extends plugin_renderer_base {
     public function display_publish_anonymous_vertical($choices) {
         global $CHOICE_COLUMN_HEIGHT;
 
-        $html = '';        
+        $html = '';
         $table = new html_table();
         $table->cellpadding = 5;
-        $table->cellspacing = 0;       
-        $table->attributes['class'] = 'results anonymous ';        
-        $table->data = array();        
+        $table->cellspacing = 0;
+        $table->attributes['class'] = 'results anonymous ';
+        $table->data = array();
         $count = 0;
         ksort($choices->options);
         $columns = array();
@@ -269,7 +269,7 @@ class mod_choice_renderer extends plugin_renderer_base {
         $rowgraph = new html_table_row();
         $rowgraph->cells = $columns;
         $rows[] = $rowgraph;
-        
+
         $columns = array();
         $printskiplink = true;
         foreach ($choices->options as $optionid => $options) {
@@ -277,40 +277,40 @@ class mod_choice_renderer extends plugin_renderer_base {
             $numberofuser = 0;
             if (!empty($options->user)) {
                $numberofuser = count($options->user);
-            }            
+            }
 
             if ($printskiplink) {
                 $columndata .= html_writer::tag('div', '', array('class'=>'skip-block-to', 'id'=>'skipresultgraph'));
                 $printskiplink = false;
             }
-            
+
             if ($choices->showunanswered && $optionid == 0) {
                 $columndata .= html_writer::tag('div', format_string(get_string('notanswered', 'choice')), array('class'=>'option'));
             } else if ($optionid > 0) {
                 $columndata .= html_writer::tag('div', format_string($choices->options[$optionid]->text), array('class'=>'option'));
             }
             $columndata .= html_writer::tag('div', ' ('.$numberofuser.')', array('class'=>'numberofuser', 'title'=> get_string('numberofuser', 'choice')));
-            
+
             if($choices->numberofuser > 0) {
                $percentageamount = ((float)$numberofuser/(float)$choices->numberofuser)*100.0;
             }
             $columndata .= html_writer::tag('div', format_float($percentageamount,1). '%', array('class'=>'percentage'));
-            
+
             $cell = new html_table_cell();
             $cell->text = $columndata;
             $cell->attributes = array('class'=>'data header');
-            $columns[] = $cell;            
+            $columns[] = $cell;
         }
         $rowdata = new html_table_row();
         $rowdata->cells = $columns;
         $rows[] = $rowdata;
 
         $table->data = $rows;
-        
+
         $header = html_writer::tag('h2',format_string(get_string("responses", "choice")));
         $html .= html_writer::tag('div', $header, array('class'=>'responseheader'));
-        $html .= html_writer::tag('a', get_string('skipresultgraph', 'choice'), array('href'=>'#skipresultgraph', 'class'=>'skip-block'));      
-        $html .= html_writer::tag('div', html_writer::table($table), array('class'=>'response'));      
+        $html .= html_writer::tag('a', get_string('skipresultgraph', 'choice'), array('href'=>'#skipresultgraph', 'class'=>'skip-block'));
+        $html .= html_writer::tag('div', html_writer::table($table), array('class'=>'response'));
 
         return $html;
     }
@@ -322,7 +322,7 @@ class mod_choice_renderer extends plugin_renderer_base {
      */
     public function display_publish_anonymous_horizontal($choices) {
         global $CHOICE_COLUMN_WIDTH;
-        
+
         $table = new html_table();
         $table->cellpadding = 5;
         $table->cellspacing = 0;
@@ -333,7 +333,7 @@ class mod_choice_renderer extends plugin_renderer_base {
         ksort($choices->options);
 
         $rows = array();
-        foreach ($choices->options as $optionid => $options) {         
+        foreach ($choices->options as $optionid => $options) {
             $numberofuser = 0;
             $graphcell = new html_table_cell();
             if (!empty($options->user)) {
@@ -351,7 +351,7 @@ class mod_choice_renderer extends plugin_renderer_base {
 
             $skiplink = html_writer::tag('a', get_string('skipresultgraph', 'choice'), array('href'=>'#skipresultgraph'. $optionid, 'class'=>'skip-block'));
             $skiphandler = html_writer::tag('span', '', array('class'=>'skip-block-to', 'id'=>'skipresultgraph'.$optionid));
-            
+
             $graphcell->text = $skiplink . $displaydiagram . $skiphandler;
             $graphcell->attributes = array('class'=>'graph horizontal');
 
@@ -366,7 +366,7 @@ class mod_choice_renderer extends plugin_renderer_base {
             if($choices->numberofuser > 0) {
                $percentageamount = ((float)$numberofuser/(float)$choices->numberofuser)*100.0;
             }
-            $columndata .= html_writer::tag('div', format_float($percentageamount,1). '%', array('class'=>'percentage'));            
+            $columndata .= html_writer::tag('div', format_float($percentageamount,1). '%', array('class'=>'percentage'));
 
             $datacell->text = $columndata;
             $datacell->attributes = array('class'=>'header');
@@ -375,14 +375,14 @@ class mod_choice_renderer extends plugin_renderer_base {
             $row->cells = array($datacell, $graphcell);
             $rows[] = $row;
         }
-        
+
         $table->data = $rows;
-        
+
         $html = '';
         $header = html_writer::tag('h2',format_string(get_string("responses", "choice")));
-        $html .= html_writer::tag('div', $header, array('class'=>'responseheader'));        
+        $html .= html_writer::tag('div', $header, array('class'=>'responseheader'));
         $html .= html_writer::table($table);
-        
+
         return $html;
     }
 }
diff --git a/mod/choice/restorelib.php b/mod/choice/restorelib.php
index 0e4144167b2..07c62c5667c 100644
--- a/mod/choice/restorelib.php
+++ b/mod/choice/restorelib.php
@@ -26,7 +26,7 @@
     //
     //-----------------------------------------------------------
 
-    //This function returns a log record with all the necessay transformations
+    //This function returns a log record with all the necessary transformations
     //done. It's used by restore_log_module() to restore modules log.
     function choice_restore_logs($restore,$log) {
 
diff --git a/mod/choice/styles.css b/mod/choice/styles.css
index 864e95e0d5b..ed2c5aaa46e 100644
--- a/mod/choice/styles.css
+++ b/mod/choice/styles.css
@@ -42,8 +42,8 @@
 #page-mod-choice-report .downloadreport ul li {list-style:none;padding: 0 20px; display: inline;float: left; }
 .path-mod-choice .clearfloat {float:none; clear:both;}
 
-/** 
- * Overide for RTL layout
+/**
+ * Override for RTL layout
  */
 .path-mod-choice.dir-rtl .horizontal .choices .option {padding-right:0px; padding-left: 20px; float:right;}
 .path-mod-choice.dir-rtl .results.anonymous .graph.horizontal {text-align: right;}
diff --git a/mod/feedback/backup/moodle2/restore_feedback_stepslib.php b/mod/feedback/backup/moodle2/restore_feedback_stepslib.php
index 6dd9c0dc4b7..fea78c19585 100644
--- a/mod/feedback/backup/moodle2/restore_feedback_stepslib.php
+++ b/mod/feedback/backup/moodle2/restore_feedback_stepslib.php
@@ -61,7 +61,7 @@ class restore_feedback_activity_structure_step extends restore_activity_structur
 
         // insert the feedback record
         $newitemid = $DB->insert_record('feedback', $data);
-        // inmediately after inserting "activity" record, call this
+        // immediately after inserting "activity" record, call this
         $this->apply_activity_instance($newitemid);
     }
 
@@ -71,7 +71,7 @@ class restore_feedback_activity_structure_step extends restore_activity_structur
         $data = (object)$data;
         $oldid = $data->id;
         $data->feedback = $this->get_new_parentid('feedback');
-        
+
         //dependitem
         $data->dependitem = $this->get_mappingid('feedback_item', $data->dependitem);
 
diff --git a/mod/feedback/restorelib.php b/mod/feedback/restorelib.php
index c7d7b5bf298..370686fde9e 100644
--- a/mod/feedback/restorelib.php
+++ b/mod/feedback/restorelib.php
@@ -27,7 +27,7 @@
     //-----------------------------------------------------------
 
 
-    //This function returns a log record with all the necessay transformations
+    //This function returns a log record with all the necessary transformations
     //done. It's used by restore_log_module() to restore modules log.
     function feedback_restore_logs($restore,$log) {
 
diff --git a/mod/folder/backup/moodle2/restore_folder_stepslib.php b/mod/folder/backup/moodle2/restore_folder_stepslib.php
index d9fdf82ed4d..6c655e48119 100644
--- a/mod/folder/backup/moodle2/restore_folder_stepslib.php
+++ b/mod/folder/backup/moodle2/restore_folder_stepslib.php
@@ -50,7 +50,7 @@ class restore_folder_activity_structure_step extends restore_activity_structure_
 
         // insert the folder record
         $newitemid = $DB->insert_record('folder', $data);
-        // inmediately after inserting "activity" record, call this
+        // immediately after inserting "activity" record, call this
         $this->apply_activity_instance($newitemid);
     }
 
diff --git a/mod/forum/restorelib.php b/mod/forum/restorelib.php
index 9f052ace6e4..6709f2283cb 100644
--- a/mod/forum/restorelib.php
+++ b/mod/forum/restorelib.php
@@ -53,7 +53,7 @@
     //
     //-----------------------------------------------------------
 
-    //This function returns a log record with all the necessay transformations
+    //This function returns a log record with all the necessary transformations
     //done. It's used by restore_log_module() to restore modules log.
     function forum_restore_logs($restore,$log) {
         global $DB;
diff --git a/mod/glossary/restorelib.php b/mod/glossary/restorelib.php
index e9c295220ae..0cb5a75a5b2 100644
--- a/mod/glossary/restorelib.php
+++ b/mod/glossary/restorelib.php
@@ -28,7 +28,7 @@
     //
     //-----------------------------------------------------------
 
-    //This function returns a log record with all the necessay transformations
+    //This function returns a log record with all the necessary transformations
     //done. It's used by restore_log_module() to restore modules log.
     function glossary_restore_logs($restore,$log) {
 
diff --git a/mod/imscp/backup/moodle2/restore_imscp_stepslib.php b/mod/imscp/backup/moodle2/restore_imscp_stepslib.php
index 6f9ca44c1c5..cfaf296dda2 100644
--- a/mod/imscp/backup/moodle2/restore_imscp_stepslib.php
+++ b/mod/imscp/backup/moodle2/restore_imscp_stepslib.php
@@ -50,7 +50,7 @@ class restore_imscp_activity_structure_step extends restore_activity_structure_s
 
         // insert the imscp record
         $newitemid = $DB->insert_record('imscp', $data);
-        // inmediately after inserting "activity" record, call this
+        // immediately after inserting "activity" record, call this
         $this->apply_activity_instance($newitemid);
     }
 
diff --git a/mod/label/backup/moodle2/restore_label_stepslib.php b/mod/label/backup/moodle2/restore_label_stepslib.php
index 82da2941180..c590499e9c8 100644
--- a/mod/label/backup/moodle2/restore_label_stepslib.php
+++ b/mod/label/backup/moodle2/restore_label_stepslib.php
@@ -49,7 +49,7 @@ class restore_label_activity_structure_step extends restore_activity_structure_s
 
         // insert the label record
         $newitemid = $DB->insert_record('label', $data);
-        // inmediately after inserting "activity" record, call this
+        // immediately after inserting "activity" record, call this
         $this->apply_activity_instance($newitemid);
     }
 
diff --git a/mod/label/restorelib.php b/mod/label/restorelib.php
index 9eb4ae2e7f9..38ad8b5064a 100644
--- a/mod/label/restorelib.php
+++ b/mod/label/restorelib.php
@@ -43,7 +43,7 @@ defined('MOODLE_INTERNAL') || die;
     //
     //-----------------------------------------------------------
 
-    //This function returns a log record with all the necessay transformations
+    //This function returns a log record with all the necessary transformations
     //done. It's used by restore_log_module() to restore modules log.
     function label_restore_logs($restore,$log) {
 
diff --git a/mod/lesson/backup/moodle2/restore_lesson_stepslib.php b/mod/lesson/backup/moodle2/restore_lesson_stepslib.php
index a8656dad426..90d0cb6d9ed 100644
--- a/mod/lesson/backup/moodle2/restore_lesson_stepslib.php
+++ b/mod/lesson/backup/moodle2/restore_lesson_stepslib.php
@@ -64,7 +64,7 @@ class restore_lesson_activity_structure_step extends restore_activity_structure_
 
         // insert the lesson record
         $newitemid = $DB->insert_record('lesson', $data);
-        // inmediately after inserting "activity" record, call this
+        // immediately after inserting "activity" record, call this
         $this->apply_activity_instance($newitemid);
     }
 
diff --git a/mod/lesson/restorelib.php b/mod/lesson/restorelib.php
index a3b3b4f67cc..47ea38106be 100644
--- a/mod/lesson/restorelib.php
+++ b/mod/lesson/restorelib.php
@@ -58,7 +58,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 
-    //This function returns a log record with all the necessay transformations
+    //This function returns a log record with all the necessary transformations
     //done. It's used by restore_log_module() to restore modules log.
     function lesson_restore_logs($restore,$log) {
 
diff --git a/mod/page/backup/moodle2/restore_page_stepslib.php b/mod/page/backup/moodle2/restore_page_stepslib.php
index 779604ecceb..862b07d9441 100644
--- a/mod/page/backup/moodle2/restore_page_stepslib.php
+++ b/mod/page/backup/moodle2/restore_page_stepslib.php
@@ -49,7 +49,7 @@ class restore_page_activity_structure_step extends restore_activity_structure_st
 
         // insert the page record
         $newitemid = $DB->insert_record('page', $data);
-        // inmediately after inserting "activity" record, call this
+        // immediately after inserting "activity" record, call this
         $this->apply_activity_instance($newitemid);
     }
 
diff --git a/mod/quiz/restorelib.php b/mod/quiz/restorelib.php
index 4c1851cda0f..b64053e49ed 100644
--- a/mod/quiz/restorelib.php
+++ b/mod/quiz/restorelib.php
@@ -623,7 +623,7 @@
         return $status;
     }
 
-    //This function returns a log record with all the necessay transformations
+    //This function returns a log record with all the necessary transformations
     //done. It's used by restore_log_module() to restore modules log.
     function quiz_restore_logs($restore,$log) {
 
diff --git a/mod/quiz/restorelibpre15.php b/mod/quiz/restorelibpre15.php
index 21e66bd803e..9b3a928c371 100644
--- a/mod/quiz/restorelibpre15.php
+++ b/mod/quiz/restorelibpre15.php
@@ -1774,7 +1774,7 @@
         return $status;
     }
 
-    //This function returns a log record with all the necessay transformations
+    //This function returns a log record with all the necessary transformations
     //done. It's used by restore_log_module() to restore modules log.
     function quiz_restore_pre15_logs($restore,$log) {
 
diff --git a/mod/resource/backup/moodle2/restore_resource_stepslib.php b/mod/resource/backup/moodle2/restore_resource_stepslib.php
index 2e967570920..2f4c3ebc13e 100644
--- a/mod/resource/backup/moodle2/restore_resource_stepslib.php
+++ b/mod/resource/backup/moodle2/restore_resource_stepslib.php
@@ -50,7 +50,7 @@ class restore_resource_activity_structure_step extends restore_activity_structur
 
         // insert the resource record
         $newitemid = $DB->insert_record('resource', $data);
-        // inmediately after inserting "activity" record, call this
+        // immediately after inserting "activity" record, call this
         $this->apply_activity_instance($newitemid);
     }
 
diff --git a/mod/scorm/backup/moodle2/restore_scorm_stepslib.php b/mod/scorm/backup/moodle2/restore_scorm_stepslib.php
index 98713ad4c0f..cb490a20767 100644
--- a/mod/scorm/backup/moodle2/restore_scorm_stepslib.php
+++ b/mod/scorm/backup/moodle2/restore_scorm_stepslib.php
@@ -68,7 +68,7 @@ class restore_scorm_activity_structure_step extends restore_activity_structure_s
 
         // insert the scorm record
         $newitemid = $DB->insert_record('scorm', $data);
-        // inmediately after inserting "activity" record, call this
+        // immediately after inserting "activity" record, call this
         $this->apply_activity_instance($newitemid);
     }
 
diff --git a/mod/scorm/restorelib.php b/mod/scorm/restorelib.php
index d824d637975..87fa11de56c 100755
--- a/mod/scorm/restorelib.php
+++ b/mod/scorm/restorelib.php
@@ -27,7 +27,7 @@
     //-----------------------------------------------------------
 
 
-    //This function returns a log record with all the necessay transformations
+    //This function returns a log record with all the necessary transformations
     //done. It's used by restore_log_module() to restore modules log.
     function scorm_restore_logs($restore,$log) {
 
diff --git a/mod/survey/backup/moodle2/restore_survey_stepslib.php b/mod/survey/backup/moodle2/restore_survey_stepslib.php
index 96e2c3ba901..1d77d152ed3 100644
--- a/mod/survey/backup/moodle2/restore_survey_stepslib.php
+++ b/mod/survey/backup/moodle2/restore_survey_stepslib.php
@@ -57,7 +57,7 @@ class restore_survey_activity_structure_step extends restore_activity_structure_
 
         // insert the survey record
         $newitemid = $DB->insert_record('survey', $data);
-        // inmediately after inserting "activity" record, call this
+        // immediately after inserting "activity" record, call this
         $this->apply_activity_instance($newitemid);
     }
 
diff --git a/mod/survey/restorelib.php b/mod/survey/restorelib.php
index cbab3938e6c..dd6fb346cad 100644
--- a/mod/survey/restorelib.php
+++ b/mod/survey/restorelib.php
@@ -23,7 +23,7 @@
     //-----------------------------------------------------------
 
 
-    //This function returns a log record with all the necessay transformations
+    //This function returns a log record with all the necessary transformations
     //done. It's used by restore_log_module() to restore modules log.
     function survey_restore_logs($restore,$log) {
 
diff --git a/mod/url/backup/moodle2/restore_url_stepslib.php b/mod/url/backup/moodle2/restore_url_stepslib.php
index b41ac4397ac..15318497eac 100644
--- a/mod/url/backup/moodle2/restore_url_stepslib.php
+++ b/mod/url/backup/moodle2/restore_url_stepslib.php
@@ -49,7 +49,7 @@ class restore_url_activity_structure_step extends restore_activity_structure_ste
 
         // insert the url record
         $newitemid = $DB->insert_record('url', $data);
-        // inmediately after inserting "activity" record, call this
+        // immediately after inserting "activity" record, call this
         $this->apply_activity_instance($newitemid);
     }
 
diff --git a/mod/wiki/backup/moodle2/restore_wiki_stepslib.php b/mod/wiki/backup/moodle2/restore_wiki_stepslib.php
index 245dcff8cfc..f1ddab153cd 100644
--- a/mod/wiki/backup/moodle2/restore_wiki_stepslib.php
+++ b/mod/wiki/backup/moodle2/restore_wiki_stepslib.php
@@ -63,7 +63,7 @@ class restore_wiki_activity_structure_step extends restore_activity_structure_st
 
         // insert the wiki record
         $newitemid = $DB->insert_record('wiki', $data);
-        // inmediately after inserting "activity" record, call this
+        // immediately after inserting "activity" record, call this
         $this->apply_activity_instance($newitemid);
     }
 
diff --git a/mod/workshop/backup/moodle2/restore_workshop_stepslib.php b/mod/workshop/backup/moodle2/restore_workshop_stepslib.php
index 78ced49ac0f..2a2ad0a5a08 100644
--- a/mod/workshop/backup/moodle2/restore_workshop_stepslib.php
+++ b/mod/workshop/backup/moodle2/restore_workshop_stepslib.php
@@ -113,7 +113,7 @@ class restore_workshop_activity_structure_step extends restore_activity_structur
 
         // insert the workshop record
         $newitemid = $DB->insert_record('workshop', $data);
-        // inmediately after inserting "activity" record, call this
+        // immediately after inserting "activity" record, call this
         $this->apply_activity_instance($newitemid);
     }