diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index 81e47e2..8f546a6 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -23,11 +23,13 @@
  *   associative array of all entity type definitions keyed by entity type is
  *   returned.
  *
- * @see \Drupal\Core\Entity\EntityManagerInterface
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getDefinition()
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getDefinitions()
  * @see hook_entity_info_alter()
  *
- * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal\Core\Entity\EntityManagerInterface::getDefinitions().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use
+ *   \Drupal::entityManager()->getDefinitions() or
+ *   \Drupal::entityManager()->getDefinition($entity_type).
  */
 function entity_get_info($entity_type = NULL) {
   if (empty($entity_type)) {
@@ -398,8 +400,10 @@ function entity_create($entity_type, array $values = array()) {
  *
  * @return \Drupal\Core\Entity\EntityStorageControllerInterface
  *
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getStorageController().
+ *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal\Core\Entity\EntityManagerInterface::getStorageController().
+ *   Use \Drupal::entityManager()->getStorageController().
  */
 function entity_get_controller($entity_type) {
   return \Drupal::entityManager()
@@ -437,8 +441,10 @@ function entity_page_label(EntityInterface $entity, $langcode = NULL) {
  * @return \Drupal\Core\Entity\EntityAccessControllerInterface
  *   An entity access controller instance.
  *
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getAccessController().
+ *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal\Core\Entity\EntityManagerInterface::getAccessController().
+ *   Use \Drupal::entityManager()->getAccessController().
  */
 function entity_access_controller($entity_type) {
   return \Drupal::entityManager()
@@ -454,8 +460,10 @@ function entity_access_controller($entity_type) {
  * @return \Drupal\Core\Entity\EntityListControllerInterface
  *   An entity list controller.
  *
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getListController().
+ *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal\Core\Entity\EntityManagerInterface::getFormController().
+ *   Use \Drupal::entityManager()->getListController().
  */
 function entity_list_controller($entity_type) {
   return \Drupal::entityManager()
diff --git a/core/includes/module.inc b/core/includes/module.inc
index dd3b42a..b818213 100644
--- a/core/includes/module.inc
+++ b/core/includes/module.inc
@@ -204,6 +204,8 @@ function module_load_include($type, $module, $name = NULL) {
 /**
  * Installs a given list of modules.
  *
+ * @see \Drupal\Core\Extension\ModuleHandlerInterface::install()
+ *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use
  *   \Drupal::moduleHandler()->install($module_list, $enable_dependencies = TRUE).
  */
@@ -214,8 +216,10 @@ function module_install($module_list, $enable_dependencies = TRUE) {
 /**
  * Installs a given list of modules.
  *
+ * @see \Drupal\Core\Extension\ModuleHandlerInterface::module_install()
+ *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use
- *   \Drupal::moduleHandler()->install($module_list, $enable_dependencies = TRUE).
+ *   \Drupal::moduleHandler()->uninstall($module_list, $enable_dependencies = TRUE).
  */
 function module_uninstall($module_list = array(), $uninstall_dependents = TRUE) {
   return \Drupal::moduleHandler()->uninstall($module_list, $uninstall_dependents);
diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index adec07b..4106c5b 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -111,9 +111,8 @@ public static function setContainer(ContainerInterface $container) {
   /**
    * Returns the currently active global container.
    *
-   * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. This
-   *   method is only useful for the testing environment. It should not be used
-   *   otherwise.
+   * @deprecated This method is only useful for the testing environment. It
+   * should not be used otherwise.
    *
    * @return \Symfony\Component\DependencyInjection\ContainerInterface
    */
diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php
index c86e8b6..3b3a338 100644
--- a/core/modules/field/field.api.php
+++ b/core/modules/field/field.api.php
@@ -319,7 +319,7 @@ function hook_field_formatter_info_alter(array &$info) {
  *   provided the default site language will be used.
  *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use the entity system instead, see https://drupal.org/developing/api/entity.
+ *   Use the entity system instead, see https://drupal.org/developing/api/entity
  */
 function hook_field_attach_form(\Drupal\Core\Entity\EntityInterface $entity, &$form, &$form_state, $langcode) {
   // Add a checkbox allowing a given field to be emptied.
@@ -348,7 +348,7 @@ function hook_field_attach_form(\Drupal\Core\Entity\EntityInterface $entity, &$f
  *   An associative array containing the current state of the form.
  *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use the entity system instead, see https://drupal.org/developing/api/entity.
+ *   Use the entity system instead, see https://drupal.org/developing/api/entity
  */
 function hook_field_attach_extract_form_values(\Drupal\Core\Entity\EntityInterface $entity, $form, &$form_state) {
   // Sample case of an 'Empty the field' checkbox added on the form, allowing
@@ -380,7 +380,7 @@ function hook_field_attach_extract_form_values(\Drupal\Core\Entity\EntityInterfa
  *   - langcode: The language code used for rendering.
  *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use the entity system instead, see https://drupal.org/developing/api/entity.
+ *   Use the entity system instead, see https://drupal.org/developing/api/entity
  */
 function hook_field_attach_view_alter(&$output, $context) {
   // Append RDF term mappings on displayed taxonomy links.
diff --git a/core/modules/field/field.deprecated.inc b/core/modules/field/field.deprecated.inc
index 53465df..8cf2595 100644
--- a/core/modules/field/field.deprecated.inc
+++ b/core/modules/field/field.deprecated.inc
@@ -274,7 +274,7 @@ function field_info_instance($entity_type, $field_name, $bundle_name) {
  *   details.
  *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use the entity system instead, see https://drupal.org/developing/api/entity.
+ *   Use the entity system instead, see https://drupal.org/developing/api/entity
  *
  * @see field_form_get_state()
  * @see field_form_set_state()
@@ -330,7 +330,7 @@ function field_attach_form(EntityInterface $entity, &$form, &$form_state, $langc
  *   details.
  *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use the entity system instead, see https://drupal.org/developing/api/entity.
+ *   Use the entity system instead, see https://drupal.org/developing/api/entity
  */
 function field_attach_form_validate(ContentEntityInterface $entity, $form, &$form_state, array $options = array()) {
   $has_violations = FALSE;
@@ -375,7 +375,7 @@ function field_attach_form_validate(ContentEntityInterface $entity, $form, &$for
  *   details.
  *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use the entity system instead, see https://drupal.org/developing/api/entity.
+ *   Use the entity system instead, see https://drupal.org/developing/api/entity
  */
 function field_attach_extract_form_values(EntityInterface $entity, $form, &$form_state, array $options = array()) {
   // Extract field values from submitted values.
@@ -416,7 +416,7 @@ function field_attach_extract_form_values(EntityInterface $entity, $form, &$form
  *   is provided the current language is used.
  *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use the entity system instead, see https://drupal.org/developing/api/entity.
+ *   Use the entity system instead, see https://drupal.org/developing/api/entity
  */
 function field_attach_prepare_view($entity_type, array $entities, array $displays, $langcode = NULL) {
   // To ensure hooks are only run once per entity, only process items without
@@ -472,7 +472,7 @@ function field_attach_prepare_view($entity_type, array $entities, array $display
  *   A renderable array for the field values.
  *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use the entity system instead, see https://drupal.org/developing/api/entity.
+ *   Use the entity system instead, see https://drupal.org/developing/api/entity
  */
 function field_attach_view(EntityInterface $entity, EntityViewDisplayInterface $display, $langcode = NULL, array $options = array()) {
   // For each field, call the view() method on the formatter object handed
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 7c527ae..ff9848f 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -2708,6 +2708,8 @@ function system_rebuild_module_data() {
  * @return
  *   An associative array of themes information.
  *
+ * @see \Drupal\Core\Extension\ThemeHandlerInterface::rebuildThemeData()
+ *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
  *   Use \Drupal::service('theme_handler')->rebuildThemeData().
  */
diff --git a/core/modules/update/update.compare.inc b/core/modules/update/update.compare.inc
index 7ea6f07..528672f 100644
--- a/core/modules/update/update.compare.inc
+++ b/core/modules/update/update.compare.inc
@@ -48,8 +48,10 @@
  *   - base_themes: If the project is a theme it contains an associative array
  *     of all base-themes.
  *
+ * @see \Drupal\update\UpdateManager::getProjects()
+ *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal\update\UpdateManager::getProjects().
+ *   Use \Drupal::service('update.manager')->getProjects().
  */
 function update_get_projects() {
   return \Drupal::service('update.manager')->getProjects();
@@ -570,8 +572,10 @@ function update_calculate_project_update_status(&$project_data, $available) {
  *   update_calculate_project_data() or update_get_projects(), or an empty array
  *   when the storage is cleared.
  *
+ * @see \Drupal\update\UpdateManager::projectStorage()
+ *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal\update\UpdateManager::projectStorage().
+ *   Use \Drupal::service('update.manager')->projectStorage().
  */
 function update_project_storage($key) {
   return \Drupal::service('update.manager')->projectStorage($key);
diff --git a/core/modules/update/update.fetch.inc b/core/modules/update/update.fetch.inc
index 4d1f33f..55ef13d 100644
--- a/core/modules/update/update.fetch.inc
+++ b/core/modules/update/update.fetch.inc
@@ -11,8 +11,10 @@
  * @param $context
  *   Reference to an array used for Batch API storage.
  *
+ * @see \Drupal\update\UpdateManager::fetchDataBatch()
+ *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal\update\UpdateManager::fetchDataBatch().
+ *   Use \Drupal::service('update.manager')->fetchDataBatch().
  */
 function update_fetch_data_batch(&$context) {
   \Drupal::service('update.manager')->fetchDataBatch($context);
@@ -21,8 +23,10 @@ function update_fetch_data_batch(&$context) {
 /**
  * Attempts to drain the queue of tasks for release history data to fetch.
  *
+ * @see \Drupal\update\UpdateFetcher::fetchData()
+ *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal\update\UpdateFetcher::fetchData().
+ *   Use \Drupal::service('update.processor')->fetchData().
  */
 function _update_fetch_data() {
   \Drupal::service('update.processor')->fetchData();
@@ -40,8 +44,10 @@ function _update_fetch_data() {
  * @return
  *   TRUE if we fetched parsable XML, otherwise FALSE.
  *
+ * @see \Drupal\update\UpdateFetcher::processFetchTask()
+ *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal\update\UpdateFetcher::processFetchTask().
+ *   Use \Drupal::service('update.processor')->processFetchTask().
  */
 function _update_process_fetch_task($project) {
   return \Drupal::service('update.processor')->processFetchTask($project);
@@ -50,8 +56,10 @@ function _update_process_fetch_task($project) {
 /**
  * Clears out all the available update data and initiates re-fetching.
  *
+ * @see \Drupal\update\UpdateManager::refreshUpdateData()
+ *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal\update\UpdateManager::refreshUpdateData().
+ *   Use \Drupal::service('update.manager')->refreshUpdateData().
  */
 function _update_refresh() {
   \Drupal::service('update.manager')->refreshUpdateData();
@@ -68,8 +76,10 @@ function _update_refresh() {
  *   update_get_projects(), including keys such as 'name' (short name), and the
  *   'info' array with data from a .info.yml file for the project.
  *
+ * @see \Drupal\update\UpdateFetcher::createFetchTask()
+ *
  * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal\update\UpdateFetcher::createFetchTask().
+ *   Use \Drupal::service('update.processor')->createFetchTask().
  */
 function _update_create_fetch_task($project) {
   \Drupal::service('update.processor')->createFetchTask($project);