diff --git a/course/renderer.php b/course/renderer.php
index 574aea47c8a..31d9391ee04 100644
--- a/course/renderer.php
+++ b/course/renderer.php
@@ -1431,7 +1431,7 @@ class core_course_renderer extends plugin_renderer_base {
         }
         $totalcount = $coursecat->get_children_count();
         if (!$totalcount) {
-            // Note that we call get_child_categories_count() AFTER get_child_categories() to avoid extra DB requests.
+            // Note that we call coursecat::get_children_count() AFTER coursecat::get_children() to avoid extra DB requests.
             // Categories count is cached during children categories retrieval.
             return '';
         }
diff --git a/lib/accesslib.php b/lib/accesslib.php
index 985fd5866d2..dfd3341d607 100644
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -432,7 +432,7 @@ function has_capability($capability, context $context, $user = null, $doanything
     // context path/depth must be valid
     if (empty($context->path) or $context->depth == 0) {
         // this should not happen often, each upgrade tries to rebuild the context paths
-        debugging('Context id '.$context->id.' does not have valid path, please use build_context_path()');
+        debugging('Context id '.$context->id.' does not have valid path, please use context_helper::build_all_paths()');
         if (is_siteadmin($userid)) {
             return true;
         } else {
diff --git a/lib/ddllib.php b/lib/ddllib.php
index a78819d9b64..7c5896124c0 100644
--- a/lib/ddllib.php
+++ b/lib/ddllib.php
@@ -70,7 +70,7 @@ require_once($CFG->libdir.'/ddl/database_manager.php');
 
 
 /**
- * DDL exception class, use instead of error() and "return false;" in ddl code.
+ * DDL exception class, use instead of print_error() and "return false;" in ddl code.
  */
 class ddl_exception extends moodle_exception {
     /**
diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index 9010cb52a64..ef7fb2b47ec 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -1299,7 +1299,7 @@ function get_print_section_cm_text(cm_info $cm, $course) {
  * $courserenderer = $PAGE->get_renderer('core', 'course');
  * $output = $courserenderer->course_section_add_cm_control($course, $section, $sectionreturn,
  *    array('inblock' => $vertical));
- * echo $output; // if $return argument in print_section_add_menus() set to false
+ * echo $output;
  *
  * @deprecated since 2.5
  * @see core_course_renderer::course_section_add_cm_control()
diff --git a/lib/dmllib.php b/lib/dmllib.php
index 9f0042c5b4c..58ab46b81c1 100644
--- a/lib/dmllib.php
+++ b/lib/dmllib.php
@@ -52,7 +52,7 @@ define('IGNORE_MULTIPLE', 1);
 define('MUST_EXIST', 2);
 
 /**
- * DML exception class, use instead of error() in dml code.
+ * DML exception class, use instead of print_error() in dml code.
  *
  * @package    core
  * @category   dml
diff --git a/lib/setuplib.php b/lib/setuplib.php
index 3723dba5e71..45c4712b9c2 100644
--- a/lib/setuplib.php
+++ b/lib/setuplib.php
@@ -328,7 +328,7 @@ class file_serving_exception extends moodle_exception {
 }
 
 /**
- * Default exception handler, uncaught exceptions are equivalent to error() in 1.9 and earlier
+ * Default exception handler.
  *
  * @param Exception $ex
  * @return void -does not return. Terminates execution!
diff --git a/lib/simplepie/library/SimplePie/Enclosure.php b/lib/simplepie/library/SimplePie/Enclosure.php
index 4b760ab684e..55674379c26 100644
--- a/lib/simplepie/library/SimplePie/Enclosure.php
+++ b/lib/simplepie/library/SimplePie/Enclosure.php
@@ -68,7 +68,7 @@ class SimplePie_Enclosure
 
 	/**
 	 * @var array
-	 * @see coursecat::get_children()
+	 * @see get_categories()
 	 */
 	var $categories;
 
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index 3bdd31ecb58..347855f7eef 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -20,8 +20,8 @@ information provided here is intended especially for developers.
     session_get_instance()
     session_is_legacy()
     session_kill_all()
-    session_touch($sid)
-    session_kill($sid)
+    session_touch()
+    session_kill()
     session_kill_user()
     session_set_user()
     session_is_loggedinas()
@@ -31,6 +31,7 @@ information provided here is intended especially for developers.
     css_minify_css()
     update_login_count()
     reset_login_count()
+    check_gd_version()
     update_log_display_entry()
     get_recent_enrolments()
     groups_filter_users_by_course_module_visible()
@@ -85,7 +86,7 @@ information provided here is intended especially for developers.
     get_parent_contexts()
     get_parent_contextid()
     get_child_contexts()
-    create_contexts(()
+    create_contexts()
     cleanup_contexts()
     build_context_path()
     rebuild_contexts()
@@ -111,6 +112,7 @@ information provided here is intended especially for developers.
     get_device_type_list()
     get_selected_theme_for_device_type()
     get_device_cfg_var_name()
+    set_user_device_type()
     get_user_device_type()
     get_browser_version_classes()
     generate_email_supportuser()
diff --git a/question/engine/lib.php b/question/engine/lib.php
index 516e3204e0b..a33d4bc70ee 100644
--- a/question/engine/lib.php
+++ b/question/engine/lib.php
@@ -443,7 +443,7 @@ abstract class question_engine {
     /**
      * Returns the valid choices for the number of decimal places for showing
      * question marks. For use in the user interface.
-     * @return array suitable for passing to {@link choose_from_menu()} or similar.
+     * @return array suitable for passing to {@link html_writer::select()} or similar.
      */
     public static function get_dp_options() {
         return question_display_options::get_dp_options();
@@ -646,7 +646,7 @@ class question_display_options {
      * Calling code should probably use {@link question_engine::get_dp_options()}
      * rather than calling this method directly.
      *
-     * @return array suitable for passing to {@link choose_from_menu()} or similar.
+     * @return array suitable for passing to {@link html_writer::select()} or similar.
      */
     public static function get_dp_options() {
         $options = array();