diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 03f66bb97721606a1d5a42decfec3e01b501ad44..e62c07d762c50124ec16f4abdc0e7ad9d1b73268 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -827,7 +827,9 @@ function drupal_page_is_cacheable($allow_caching = NULL) {
  * @param $append
  *   Whether to append the value to an existing header or to replace it.
  *
- * @deprecated Header handling is being shifted to a Symfony response object.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Symfony\Component\HttpFoundation\Response->headers->set().
+ *   See https://drupal.org/node/2181523.
  */
 function drupal_add_http_header($name, $value, $append = FALSE) {
   // The headers as name/value pairs.
@@ -860,7 +862,9 @@ function drupal_add_http_header($name, $value, $append = FALSE) {
  *   A string containing the header value, or FALSE if the header has been set,
  *   or NULL if the header has not been set.
  *
- * @deprecated Header handling is being shifted to a Symfony response object.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Symfony\Component\HttpFoundation\Response->headers->get().
+ *   See https://drupal.org/node/2181523.
  */
 function drupal_get_http_header($name = NULL) {
   $headers = &drupal_static('drupal_http_headers', array());
@@ -879,7 +883,8 @@ function drupal_get_http_header($name = NULL) {
  * Header names are case-insensitive, but for maximum compatibility they should
  * follow "common form" (see RFC 2616, section 4.2).
  *
- * @deprecated Header handling is being shifted to a Symfony response object.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   See https://drupal.org/node/2181523.
  */
 function _drupal_set_preferred_header_name($name = NULL) {
   static $header_names = array();
@@ -902,7 +907,8 @@ function _drupal_set_preferred_header_name($name = NULL) {
  *   (optional) If TRUE and headers have already been sent, send only the
  *   specified headers.
  *
- * @deprecated Header handling is being shifted to a Symfony response object.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   See https://drupal.org/node/2181523.
  */
 function drupal_send_headers($default_headers = array(), $only_default = FALSE) {
   $headers_sent = &drupal_static(__FUNCTION__, FALSE);
@@ -958,7 +964,8 @@ function drupal_send_headers($default_headers = array(), $only_default = FALSE)
  *
  * @see drupal_page_set_cache()
  *
- * @deprecated Header handling is being shifted to a Symfony response object.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   See https://drupal.org/node/2181523.
  */
 function drupal_page_header() {
   $headers_sent = &drupal_static(__FUNCTION__, FALSE);
@@ -1148,12 +1155,11 @@ function format_string($string, array $args = array()) {
 /**
  * Encodes special characters in a plain-text string for display as HTML.
  *
- * @see \Drupal\Component\Utility\String::checkPlain()
  * @see drupal_validate_utf8()
  * @ingroup sanitization
  *
- * @deprecated as of Drupal 8.0. Use
- *   Drupal\Component\Utility\String::checkPlain() directly instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Component\Utility\String::checkPlain().
  */
 function check_plain($text) {
   return String::checkPlain($text);
@@ -1846,8 +1852,8 @@ function drupal_get_bootstrap_phase() {
 /**
  * Returns the list of enabled modules.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal::moduleHandler()->getModuleList().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::moduleHandler()->getModuleList().
  *
  * @see \Drupal\Core\Extension\ModuleHandler::getModuleList()
  */
@@ -1859,8 +1865,8 @@ function module_list() {
 /**
  * Determines which modules are implementing a hook.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal::moduleHandler()->getImplementations($hook).
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::moduleHandler()->getImplementations($hook).
  *
  * @see \Drupal\Core\Extension\ModuleHandler::getImplementations()
  */
@@ -1893,8 +1899,8 @@ function module_invoke($module, $hook) {
  * All arguments are passed by value. Use drupal_alter() if you need to pass
  * arguments by reference.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal::moduleHandler()->invokeAll($hook).
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::moduleHandler()->invokeAll($hook).
  *
  * @see drupal_alter()
  * @see \Drupal\Core\Extension\ModuleHandler::invokeAll()
@@ -1909,8 +1915,8 @@ function module_invoke_all($hook) {
 /**
  * Passes alterable variables to specific hook_TYPE_alter() implementations.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal::moduleHandler()->alter($hook).
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::moduleHandler()->alter($hook).
  *
  * @see \Drupal\Core\Extension\ModuleHandler::alter()
  */
@@ -1921,8 +1927,8 @@ function drupal_alter($type, &$data, &$context1 = NULL, &$context2 = NULL) {
 /**
  * Determines whether a given module exists.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal::moduleHandler()->moduleExists($module).
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::moduleHandler()->moduleExists($module).
  *
  * @see \Drupal\Core\Extension\ModuleHandler::moduleExists()
  */
@@ -1933,8 +1939,8 @@ function module_exists($module) {
 /**
  * Determines whether a module implements a hook.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal::moduleHandler()->implementsHook($module, $hook).
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::moduleHandler()->implementsHook($module, $hook).
  *
  * @see \Drupal\Core\Extension\ModuleHandler::implementsHook()
  */
@@ -2073,8 +2079,8 @@ function drupal_language_initialize() {
  * @param string $type
  *   The type of language object needed, e.g. Language::TYPE_INTERFACE.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal::languageManager()->getCurrentLanguage().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::languageManager()->getCurrentLanguage().
  */
 function language($type) {
   return \Drupal::languageManager()->getCurrentLanguage($type);
@@ -2092,8 +2098,8 @@ function language($type) {
  *   An associative array of languages, keyed by the language code, ordered by
  *   weight ascending and name ascending.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal::languageManager()->getLanguages() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::languageManager()->getLanguages().
  */
 function language_list($flags = Language::STATE_CONFIGURABLE) {
   return \Drupal::languageManager()->getLanguages($flags);
@@ -2110,8 +2116,8 @@ function language_list($flags = Language::STATE_CONFIGURABLE) {
  *
  * @see \Drupal\Core\Language\LanguageManager::getLanguage()
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::languageManager()->getLanguage()
- *   instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::languageManager()->getLanguage().
  */
 function language_load($langcode) {
   return \Drupal::languageManager()->getLanguage($langcode);
@@ -2123,8 +2129,10 @@ function language_load($langcode) {
  * @return \Drupal\Core\Language\Language
  *   A language object.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal::languageManager()->getDefaultLanguage() instead.
+ * @see \Drupal\Core\Language\LanguageManager::getLanguage()
+ *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::languageManager()->getDefaultLanguage().
  */
 function language_default() {
   return \Drupal::languageManager()->getDefaultLanguage();
@@ -2624,8 +2632,8 @@ function drupal_check_memory_limit($required, $memory_limit = NULL) {
 /**
  * Get locking layer instance.
  *
- * @deprecated Use \Drupal::lock() instead, or even better have the lock service
- *   injected into your object.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::lock().
  *
  * @return \Drupal\Core\Lock\LockBackendInterface
  */
diff --git a/core/includes/cache.inc b/core/includes/cache.inc
index b39b7ff04f6e0af8f134a0275460a385d14d0858..4a3305a8bb8dde0a722cde46c859326bac51bd22 100644
--- a/core/includes/cache.inc
+++ b/core/includes/cache.inc
@@ -42,7 +42,7 @@ function cache($bin = 'cache') {
  * @param array $tags
  *   The list of tags to invalidate cache items for.
  *
- * @deprecated 8.x
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
  *   Use \Drupal\Core\Cache\Cache::invalidateTags().
  */
 function cache_invalidate_tags(array $tags) {
diff --git a/core/includes/common.inc b/core/includes/common.inc
index a7584d327875d36d6cf31fb3854f83405c7902a4..92f21efb44a1a24721254dc6a219f770526759d6 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -426,7 +426,8 @@ function drupal_get_feeds($delimiter = "\n") {
  * @return
  *   An array containing query parameters, which can be used for url().
  *
- * @deprecated as of Drupal 8.0. Use Url::filterQueryParameters() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Component\Utility\Url::filterQueryParameters().
  */
 function drupal_get_query_parameters(array $query = NULL, array $exclude = array(), $parent = '') {
   if (!isset($query)) {
@@ -439,10 +440,10 @@ function drupal_get_query_parameters(array $query = NULL, array $exclude = array
  * Parses an array into a valid, rawurlencoded query string.
  *
  * @see drupal_get_query_parameters()
- * @deprecated as of Drupal 8.0. Use Url::buildQuery() instead.
  * @ingroup php_wrappers
  *
- * @deprecated as of Drupal 8.0. Use Url::buildQuery() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Component\Utility\Url::buildQuery().
  */
 function drupal_http_build_query(array $query, $parent = '') {
   return Url::buildQuery($query, $parent);
@@ -518,7 +519,8 @@ function drupal_get_destination() {
  * @see url()
  * @ingroup php_wrappers
  *
- * @deprecated as of Drupal 8.0. Use Url::parse() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Component\Utility\Url::parse().
  */
 function drupal_parse_url($url) {
   return Url::parse($url);
@@ -535,7 +537,8 @@ function drupal_parse_url($url) {
  * @param $path
  *   The Drupal path to encode.
  *
- * @deprecated as of Drupal 8.0. Use Url::encodePath() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Component\Utility\Url::encodePath().
  */
 function drupal_encode_path($path) {
   return Url::encodePath($path);
@@ -550,7 +553,8 @@ function drupal_encode_path($path) {
  * @return
  *   TRUE if the URL has the same domain and base path.
  *
- * @deprecated as of Drupal 8.0. Use Url::externalIsLocal() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Component\Utility\Url::externalIsLocal().
  */
 function _external_url_is_local($url) {
   return Url::externalIsLocal($url, base_path());
@@ -609,7 +613,8 @@ function valid_email_address($mail) {
  *
  * @see \Drupal\Component\Utility\Url::isValid()
  *
- * @deprecated as of Drupal 8.0. Use Url::isValid() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Component\Utility\Url::isValid().
  */
 function valid_url($url, $absolute = FALSE) {
   return Url::isValid($url, $absolute);
@@ -631,8 +636,8 @@ function valid_url($url, $absolute = FALSE) {
  * @return bool
  *   TRUE if no step mismatch has occurred, or FALSE otherwise.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal\Component\Utility\Number::validStep() directly instead
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Component\Utility\Number::validStep().
  */
 function valid_number_step($value, $step, $offset = 0.0) {
   return Number::validStep($value, $step, $offset);
@@ -901,8 +906,10 @@ function format_xml_elements($array) {
  *
  * @see t()
  * @see format_string()
+ * @see \Drupal\Core\StringTranslation\TranslationManager->formatPlural()
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::translation()->formatPlural()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::translation()->formatPlural().
  */
 function format_plural($count, $singular, $plural, array $args = array(), array $options = array()) {
   return \Drupal::translation()->formatPlural($count, $singular, $plural, $args, $options);
@@ -984,7 +991,10 @@ function format_size($size, $langcode = NULL) {
  * @return
  *   A translated string representation of the interval.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::service('date')->formatInterval().
+ * @see \Drupal\Core\Datetime\Date::formatInterval()
+ *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::service('date')->formatInterval().
  */
 function format_interval($interval, $granularity = 2, $langcode = NULL) {
   return \Drupal::service('date')->formatInterval($interval, $granularity, $langcode);
@@ -2977,9 +2987,11 @@ function drupal_clear_js_cache() {
  * We use HTML-safe strings, with several characters escaped.
  *
  * @see drupal_json_decode()
+ *
  * @ingroup php_wrappers
- * @deprecated as of Drupal 8.0. Use Drupal\Component\Utility\Json::encode()
- *   directly instead.
+ *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Component\Utility\Json::encode().
  */
 function drupal_json_encode($var) {
   return Json::encode($var);
@@ -2989,9 +3001,11 @@ function drupal_json_encode($var) {
  * Converts an HTML-safe JSON string into its PHP equivalent.
  *
  * @see drupal_json_encode()
+ *
  * @ingroup php_wrappers
- * @deprecated as of Drupal 8.0. Use Drupal\Component\Utility\Json::decode()
- *   directly instead.
+ *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Component\Utility\Json::decode().
  */
 function drupal_json_decode($var) {
   return Json::decode($var);
@@ -3003,9 +3017,10 @@ function drupal_json_decode($var) {
  * @return string
  *   The private key.
  *
- * @see \Drupal\Core\Access\CsrfTokenManager
+ * @see \Drupal\Core\Access\CsrfTokenGenerator
  *
- * @deprecated as of Drupal 8.0. Use the 'private_key' service instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::service('private_key')->get().
  */
 function drupal_get_private_key() {
   return \Drupal::service('private_key')->get();
@@ -3028,10 +3043,11 @@ function drupal_get_private_key() {
  *   'drupal_private_key' configuration variable.
  *
  * @see drupal_get_hash_salt()
- * @see \Drupal\Core\Access\CsrfTokenManager
+ * @see \Drupal\Core\Access\CsrfTokenGenerator
  * @see drupal_session_start()
  *
- * @deprecated as of Drupal 8.0. Use the csrf_token service instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::csrfToken()->get().
  */
 function drupal_get_token($value = '') {
   return \Drupal::csrfToken()->get($value);
@@ -3051,9 +3067,10 @@ function drupal_get_token($value = '') {
  *   True for a valid token, false for an invalid token. When $skip_anonymous
  *   is true, the return value will always be true for anonymous users.
  *
- * @see \Drupal\Core\Access\CsrfTokenManager
+ * @see \Drupal\Core\Access\CsrfTokenGenerator
  *
- * @deprecated as of Drupal 8.0. Use the csrf_token service instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use return \Drupal::csrfToken()->validate().
  */
 function drupal_valid_token($token, $value = '', $skip_anonymous = FALSE) {
   return \Drupal::csrfToken()->validate($token, $value, $skip_anonymous);
@@ -4528,9 +4545,8 @@ function drupal_render_cid_create($elements) {
  * @return int
  *   The comparison result for uasort().
  *
- * @see \Drupal\Component\Utility\SortArray::sortByWeightProperty()
- *
- * @deprecated as of Drupal 8.0. Use SortArray::sortByWeightProperty() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Component\Utility\SortArray::sortByWeightProperty().
  */
 function element_sort($a, $b) {
   return SortArray::sortByWeightProperty($a, $b);
@@ -4552,9 +4568,8 @@ function element_sort($a, $b) {
  * @return int
  *   The comparison result for uasort().
  *
- * @see \Drupal\Component\Utility\SortArray::sortByTitleProperty()
- *
- * @deprecated as of Drupal 8.0. Use SortArray::sortByTitleProperty() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Component\Utility\SortArray::sortByTitleProperty().
  */
 function element_sort_by_title($a, $b) {
   return SortArray::sortByTitleProperty($a, $b);
@@ -4615,9 +4630,8 @@ function element_info_property($type, $property_name, $default = NULL) {
  * @return int
  *   The comparison result for uasort().
  *
- * @see \Drupal\Component\Utility\SortArray::sortByTitleElement()
- *
- * @deprecated as of Drupal 8.0. Use SortArray::sortByTitleElement() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Component\Utility\SortArray::sortByTitleElement().
  */
 function drupal_sort_title($a, $b) {
   return SortArray::sortByTitleElement($a, $b);
@@ -4626,9 +4640,8 @@ function drupal_sort_title($a, $b) {
 /**
  * Checks if the key is a property.
  *
- * @see \Drupal\Core\Render\Element::property()
- *
- * @deprecated as of Drupal 8.0. Use Element::property() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Core\Render\Element::property().
  */
 function element_property($key) {
   return Element::property($key);
@@ -4637,9 +4650,8 @@ function element_property($key) {
 /**
  * Gets properties of a structured array element (keys beginning with '#').
  *
- * @see \Drupal\Core\Render\Element::properties()
- *
- * @deprecated as of Drupal 8.0. Use Element::properties() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Core\Render\Element::properties().
  */
 function element_properties($element) {
   return Element::properties($element);
@@ -4648,9 +4660,8 @@ function element_properties($element) {
 /**
  * Checks if the key is a child.
  *
- * @see \Drupal\Core\Render\Element::child()
- *
- * @deprecated as of Drupal 8.0. Use Element::child() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Core\Render\Element::child().
  */
 function element_child($key) {
   return Element::child($key);
@@ -4670,9 +4681,8 @@ function element_child($key) {
  * @return
  *   The array keys of the element's children.
  *
- * @see \Drupal\Core\Render\Element::children()
- *
- * @deprecated as of Drupal 8.0. Use Element::children() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Core\Render\Element::children().
  */
 function element_children(&$elements, $sort = FALSE) {
   return Element::children($elements, $sort);
@@ -4687,9 +4697,8 @@ function element_children(&$elements, $sort = FALSE) {
  * @return
  *   The array keys of the element's visible children.
  *
- * @see \Drupal\Core\Render\Element::getVisibleChildren()
- *
- * @deprecated as of Drupal 8.0. Use Element::getVisibleChildren() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Core\Render\Element::getVisibleChildren().
  */
 function element_get_visible_children(array $elements) {
   return Element::getVisibleChildren($elements);
@@ -4707,9 +4716,8 @@ function element_get_visible_children(array $elements) {
  *   except for the leading '#', then an attribute name value is sufficient and
  *   no property name needs to be specified.
  *
- * @see \Drupal\Core\Render\Element::setAttributes()
- *
- * @deprecated as of Drupal 8.0. Use Element::setAttributes() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Core\Render\Element::setAttributes().
  */
 function element_set_attributes(array &$element, array $map) {
   Element::setAttributes($element, $map);
@@ -4726,8 +4734,8 @@ function element_set_attributes(array &$element, array $map) {
  *
  * @see \Drupal\Core\Extension\InfoParser::parse().
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::service('info_parser')->parse()
- *   instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::service('info_parser')->parse().
  */
 function drupal_parse_info_file($filename) {
   return \Drupal::service('info_parser')->parse($filename);
@@ -4761,9 +4769,9 @@ function watchdog_severity_levels() {
  * Explodes a string of tags into an array.
  *
  * @see drupal_implode_tags()
- * @see \Drupal\Component\Utility\String::explodeTags().
  *
- * @deprecated as of Drupal 8.0. Use Tags::explode() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Component\Utility\Tags::explode().
  */
 function drupal_explode_tags($tags) {
   return Tags::explode($tags);
@@ -4773,9 +4781,9 @@ function drupal_explode_tags($tags) {
  * Implodes an array of tags into a string.
  *
  * @see drupal_explode_tags()
- * @see \Drupal\Component\Utility\String::implodeTags().
  *
- * @deprecated as of Drupal 8.0. Use Tags::implode() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Component\Utility\Tags::implode().
  */
 function drupal_implode_tags($tags) {
   return Tags::implode($tags);
diff --git a/core/includes/config.inc b/core/includes/config.inc
index 9604ee5085514333cda626026ac5efb8f2f7b397..c6737445b91c60e1fd2c71ba4f93cbed7b9d9aea 100644
--- a/core/includes/config.inc
+++ b/core/includes/config.inc
@@ -22,13 +22,13 @@ function config_get_storage_names_with_prefix($prefix = '') {
  * @code \Drupal::config('book.admin') @endcode will return a configuration
  * object in which the book module can store its administrative settings.
  *
- * @deprecated Deprecated since Drupal 8.x-dev, to be removed in Drupal 8.0.
- *   Use \Drupal::config() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *  Use \Drupal::config().
  *
  * @param string $name
  *   The name of the configuration object to retrieve. The name corresponds to
- *   a configuration file. For @code \Drupal::config('book.admin') @endcode, the
- *   config object returned will contain the contents of book.admin
+ *   a configuration file. For @code \Drupal::config('book.admin') @endcode,
+ *   the config object returned will contain the contents of book.admin
  *   configuration file.
  *
  * @return \Drupal\Core\Config\Config
diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index 56db62d2c0bfcd90ab609a58d8c3fc49c5ed1e00..f59ac3209db22c95926e140dd7f5611db1b35eee 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -370,7 +370,10 @@ function entity_create($entity_type, array $values = array()) {
  *
  * @return \Drupal\Core\Entity\EntityStorageControllerInterface
  *
- * @deprecated Use \Drupal\Core\Entity\EntityManagerInterface::getStorageController().
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getStorageController().
+ *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::entityManager()->getStorageController().
  */
 function entity_get_controller($entity_type) {
   return \Drupal::entityManager()
@@ -408,7 +411,10 @@ function entity_page_label(EntityInterface $entity, $langcode = NULL) {
  * @return \Drupal\Core\Entity\EntityAccessControllerInterface
  *   An entity access controller instance.
  *
- * @deprecated Use \Drupal\Core\Entity\EntityManagerInterface::getAccessController().
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getAccessController().
+ *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::entityManager()->getAccessController().
  */
 function entity_access_controller($entity_type) {
   return \Drupal::entityManager()
@@ -424,7 +430,10 @@ function entity_access_controller($entity_type) {
  * @return \Drupal\Core\Entity\EntityListControllerInterface
  *   An entity list controller.
  *
- * @deprecated Use \Drupal\Core\Entity\EntityManagerInterface::getFormController().
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getListController().
+ *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::entityManager()->getListController().
  */
 function entity_list_controller($entity_type) {
   return \Drupal::entityManager()
diff --git a/core/includes/errors.inc b/core/includes/errors.inc
index 37b875e7662e57dfa7509a05eb8cab4f267b0f2a..761b7bd1bd5e3d608b02347fcedde51e50b00b95 100644
--- a/core/includes/errors.inc
+++ b/core/includes/errors.inc
@@ -289,7 +289,8 @@ function _drupal_get_error_level() {
  * @return string
  *   A plain-text line-wrapped string ready to be put inside <pre>.
  *
- * @deprecated Use \Drupal\Core\Utility\Error::formatBacktrace() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Core\Utility\Error::formatBacktrace().
  */
 function format_backtrace(array $backtrace) {
   return Error::formatBacktrace($backtrace);
diff --git a/core/includes/form.inc b/core/includes/form.inc
index d555be684e5d7f9986779603452e2733005abad6..27e4d50b6821b21d871982b50f3be0171b55669b 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -106,7 +106,10 @@
 /**
  * Returns a renderable form array for a given form ID.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->getForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->getForm().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::getForm().
  */
 function drupal_get_form($form_arg) {
   return call_user_func_array(array(\Drupal::formBuilder(), 'getForm'), func_get_args());
@@ -115,7 +118,10 @@ function drupal_get_form($form_arg) {
 /**
  * Builds and processes a form for a given form ID.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->buildForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->buildForm().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::buildForm().
  */
 function drupal_build_form($form_id, &$form_state) {
   return \Drupal::formBuilder()->buildForm($form_id, $form_state);
@@ -124,7 +130,10 @@ function drupal_build_form($form_id, &$form_state) {
 /**
  * Retrieves default values for the $form_state array.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->getFormStateDefaults()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->getFormStateDefaults().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::getFormStateDefaults().
  */
 function form_state_defaults() {
   return \Drupal::formBuilder()->getFormStateDefaults();
@@ -133,7 +142,10 @@ function form_state_defaults() {
 /**
  * Constructs a new $form from the information in $form_state.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->rebuildForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->rebuildForm().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::rebuildForm().
  */
 function drupal_rebuild_form($form_id, &$form_state, $old_form = NULL) {
   return \Drupal::formBuilder()->rebuildForm($form_id, $form_state, $old_form);
@@ -142,7 +154,10 @@ function drupal_rebuild_form($form_id, &$form_state, $old_form = NULL) {
 /**
  * Fetches a form from the cache.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->getCache()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->getCache().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::getCache().
  */
 function form_get_cache($form_build_id, &$form_state) {
   return \Drupal::formBuilder()->getCache($form_build_id, $form_state);
@@ -151,7 +166,10 @@ function form_get_cache($form_build_id, &$form_state) {
 /**
  * Stores a form in the cache.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->setCache()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->setCache().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::setCache().
  */
 function form_set_cache($form_build_id, $form, $form_state) {
   \Drupal::formBuilder()->setCache($form_build_id, $form, $form_state);
@@ -209,7 +227,10 @@ function form_load_include(&$form_state, $type, $module, $name = NULL) {
 /**
  * Retrieves, populates, and processes a form.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->submitForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->submitForm().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::submitForm().
  */
 function drupal_form_submit($form_arg, &$form_state) {
   \Drupal::formBuilder()->submitForm($form_arg, $form_state);
@@ -218,7 +239,10 @@ function drupal_form_submit($form_arg, &$form_state) {
 /**
  * Retrieves the structured array that defines a given form.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->retrieveForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->retrieveForm().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::retrieveForm().
  */
 function drupal_retrieve_form($form_id, &$form_state) {
   return \Drupal::formBuilder()->retrieveForm($form_id, $form_state);
@@ -227,7 +251,10 @@ function drupal_retrieve_form($form_id, &$form_state) {
 /**
  * Processes a form submission.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->processForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->processForm().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::processForm().
  */
 function drupal_process_form($form_id, &$form, &$form_state) {
   \Drupal::formBuilder()->processForm($form_id, $form, $form_state);
@@ -236,7 +263,10 @@ function drupal_process_form($form_id, &$form, &$form_state) {
 /**
  * Prepares a structured form array.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->prepareForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->prepareForm().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::prepareForm().
  */
 function drupal_prepare_form($form_id, &$form, &$form_state) {
   \Drupal::formBuilder()->prepareForm($form_id, $form, $form_state);
@@ -245,7 +275,10 @@ function drupal_prepare_form($form_id, &$form, &$form_state) {
 /**
  * Validates user-submitted form data in the $form_state array.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->validateForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->validateForm().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::validateForm().
  */
 function drupal_validate_form($form_id, &$form, &$form_state) {
   \Drupal::formBuilder()->validateForm($form_id, $form, $form_state);
@@ -254,7 +287,10 @@ function drupal_validate_form($form_id, &$form, &$form_state) {
 /**
  * Redirects the user to a URL after a form has been processed.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->redirectForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->redirectForm().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::redirectForm().
  */
 function drupal_redirect_form($form_state) {
   return \Drupal::formBuilder()->redirectForm($form_state);
@@ -263,7 +299,10 @@ function drupal_redirect_form($form_state) {
 /**
  * Executes custom validation and submission handlers for a given form.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->executeHandlers()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->executeHandlers().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::executeHandlers().
  */
 function form_execute_handlers($type, &$form, &$form_state) {
   \Drupal::formBuilder()->executeHandlers($type, $form, $form_state);
@@ -272,7 +311,10 @@ function form_execute_handlers($type, &$form, &$form_state) {
 /**
  * Files an error against a form element.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->setErrorByName()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->setErrorByName().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::setErrorByName().
  */
 function form_set_error($name, array &$form_state, $message = '') {
   \Drupal::formBuilder()->setErrorByName($name, $form_state, $message);
@@ -281,7 +323,10 @@ function form_set_error($name, array &$form_state, $message = '') {
 /**
  * Clears all errors against all form elements made by form_set_error().
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->clearErrors()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->clearErrors().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::clearErrors().
  */
 function form_clear_error(array &$form_state) {
   \Drupal::formBuilder()->clearErrors($form_state);
@@ -290,7 +335,10 @@ function form_clear_error(array &$form_state) {
 /**
  * Returns an associative array of all errors.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->getErrors()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->getErrors().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::getErrors().
  */
 function form_get_errors(array &$form_state) {
   return \Drupal::formBuilder()->getErrors($form_state);
@@ -299,7 +347,10 @@ function form_get_errors(array &$form_state) {
 /**
  * Returns the error message filed against the given form element.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->getError()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->getError().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::getError().
  */
 function form_get_error($element, array &$form_state) {
   return \Drupal::formBuilder()->getError($element, $form_state);
@@ -308,7 +359,10 @@ function form_get_error($element, array &$form_state) {
 /**
  * Flags an element as having an error.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->setError()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->setError().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::setError().
  */
 function form_error(&$element, array &$form_state, $message = '') {
   \Drupal::formBuilder()->setError($element, $form_state, $message);
@@ -317,7 +371,10 @@ function form_error(&$element, array &$form_state, $message = '') {
 /**
  * Builds and processes all elements in the structured form array.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->doBuildForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->doBuildForm().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::doBuildForm().
  */
 function form_builder($form_id, &$element, &$form_state) {
   return \Drupal::formBuilder()->doBuildForm($form_id, $element, $form_state);
@@ -718,7 +775,10 @@ function form_type_token_value($element, $input = FALSE) {
 /**
  * Changes submitted form values during form validation.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->setValue()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->setValue().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::setValue().
  */
 function form_set_value($element, $value, &$form_state) {
   \Drupal::formBuilder()->setValue($element, $value, $form_state);
@@ -737,7 +797,10 @@ function form_set_value($element, $value, &$form_state) {
  * @return
  *   An array with all hierarchical elements flattened to a single array.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->flattenOptions()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::formBuilder()->flattenOptions().
+ *
+ * @see \Drupal\Core\Form\FormBuilderInterface::flattenOptions().
  */
 function form_options_flatten($array) {
   return \Drupal::formBuilder()->flattenOptions($array);
diff --git a/core/includes/module.inc b/core/includes/module.inc
index 429f5dbb9de8f985454d48f6af8248aa9d8613f4..b818213610ea447c67afe7c16c181ce9bc78be1f 100644
--- a/core/includes/module.inc
+++ b/core/includes/module.inc
@@ -204,8 +204,10 @@ function module_load_include($type, $module, $name = NULL) {
 /**
  * Installs a given list of modules.
  *
- * @deprecated as of Drupal 8.0. Use
- *  \Drupal::moduleHandler()->install($module_list, $enable_dependencies = TRUE)
+ * @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).
  */
 function module_install($module_list, $enable_dependencies = TRUE) {
   return \Drupal::moduleHandler()->install($module_list, $enable_dependencies);
@@ -214,8 +216,10 @@ function module_install($module_list, $enable_dependencies = TRUE) {
 /**
  * Installs a given list of modules.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal::moduleHandler()->install($module_list, $enable_dependencies = TRUE).
+ * @see \Drupal\Core\Extension\ModuleHandlerInterface::module_install()
+ *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use
+ *   \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/includes/theme.inc b/core/includes/theme.inc
index aa558b29833288b5b9796e9c46e32a2d0b8bd34a..3d57521655c75955743431bd474cd6796639a0e5 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -72,7 +72,10 @@
  *   Boolean TRUE if the theme is enabled or is the site administration theme;
  *   FALSE otherwise.
  *
- * @deprecated Use \Drupal::service('access_check.theme')->checkAccess().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::service('access_check.theme')->checkAccess().
+ *
+ * @see \Drupal\Core\Theme\ThemeAccessCheck::checkAccess().
  */
 function drupal_theme_access($theme) {
   if (is_object($theme)) {
@@ -362,7 +365,10 @@ function drupal_theme_rebuild() {
  *     names. This element is not set if there are no themes on the system that
  *     declare this theme as their base theme.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::service('theme_handler')->listInfo().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::service('theme_handler')->listInfo().
+ *
+ * @see \Drupal\Core\Extension\ThemeHandler::listInfo().
  */
 function list_themes($refresh = FALSE) {
   /** @var \Drupal\Core\Extension\ThemeHandler $theme_handler */
@@ -391,7 +397,10 @@ function list_themes($refresh = FALSE) {
  *   Returns an array of all of the theme's ancestors; the first element's value
  *   will be NULL if an error occurred.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::service('theme_handler')->getBaseThemes().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::service('theme_handler')->getBaseThemes().
+ *
+ * @see \Drupal\Core\Extension\ThemeHandler::getBaseThemes().
  */
 function drupal_find_base_themes($themes, $key) {
   return \Drupal::service('theme_handler')->getBaseThemes($themes, $key);
@@ -1089,7 +1098,10 @@ function theme_settings_convert_to_config(array $theme_settings, Config $config)
  * @param $theme_list
  *   An array of theme names.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::service('theme_handler')->enable().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::service('theme_handler')->enable().
+ *
+ * @see \Drupal\Core\Extension\ThemeHandler::enable().
  */
 function theme_enable($theme_list) {
   \Drupal::service('theme_handler')->enable($theme_list);
@@ -1101,7 +1113,10 @@ function theme_enable($theme_list) {
  * @param $theme_list
  *   An array of theme names.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::service('theme_handler')->disable().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::service('theme_handler')->disable().
+ *
+ * @see \Drupal\Core\Extension\ThemeHandler::disable().
  */
 function theme_disable($theme_list) {
   \Drupal::service('theme_handler')->disable($theme_list);
diff --git a/core/includes/utility.inc b/core/includes/utility.inc
index 023ecb0ce1c57c8cff54f934607105c2c4888a96..b18c9412f447c6ec62840124103d2c53864a62ff 100644
--- a/core/includes/utility.inc
+++ b/core/includes/utility.inc
@@ -20,7 +20,8 @@
  * @return string
  *   The variable exported in a way compatible to Drupal's coding standards.
  *
- * @deprecated Use \Drupal\Component\Utility\Variable::export().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Component\Utility\Variable::export().
  */
 function drupal_var_export($var, $prefix = '') {
   return Variable::export($var, $prefix);
diff --git a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
index a2ce7d122aa20f7726681aba1000b55a76bae625..5c42a8189d22ef68316acbcc52be6889738c827d 100644
--- a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
+++ b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
@@ -77,7 +77,7 @@ interface UrlGeneratorInterface extends VersatileGeneratorInterface {
    *
    * @throws \Drupal\Core\Routing\GeneratorNotInitializedException.
    *
-   * @deprecated since version 8.0
+   * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
    *   System paths should not be used - use route names and parameters.
    */
   public function generateFromPath($path = NULL, $options = array());
@@ -94,7 +94,7 @@ public function generateFromPath($path = NULL, $options = array());
    * @return string
    *  The internal Drupal path corresponding to the route.
    *
-   * @deprecated since version 8.0
+   * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
    *   System paths should not be used - use route names and parameters.
    */
   public function getPathFromRoute($name, $parameters = array());
diff --git a/core/lib/Drupal/Core/Utility/CacheArray.php b/core/lib/Drupal/Core/Utility/CacheArray.php
index 2323756d90cc57fd3cb2392369866c70ad6f244b..3d1a33c75757c5bab36b8a420080ac4b4bf58452 100644
--- a/core/lib/Drupal/Core/Utility/CacheArray.php
+++ b/core/lib/Drupal/Core/Utility/CacheArray.php
@@ -61,7 +61,8 @@
  * procedural code. Extending classes may wish to alter this behavior, for
  * example by overriding offsetSet() and adding an automatic call to persist().
  *
- * @deprecated as of Drupal 8.0. Use \Drupal\Core\Cache\CacheCollector instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Core\Cache\CacheCollector.
  *
  * @see SchemaCache
  */
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 5d9900f6bb73b190cda1941ad90c5c5a121a8db7..6d7d9a5bc2120ebfa50c360ac98a6b4903058a52 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1121,7 +1121,8 @@ function comment_user_predelete($account) {
 /**
  * Loads comment entities from the database.
  *
- * @deprecated Use entity_load_multiple('comment', $cids) instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use entity_load_multiple('comment', $cids).
  *
  * @param array $cids
  *   (optional) An array of entity IDs. If omitted, all entities are loaded.
diff --git a/core/modules/content_translation/content_translation.pages.inc b/core/modules/content_translation/content_translation.pages.inc
index 32722966484f3adf15a5ff3afa342ee284abf4e9..0b6a4dc62479de9880f960cebe061a0f696b89ba 100644
--- a/core/modules/content_translation/content_translation.pages.inc
+++ b/core/modules/content_translation/content_translation.pages.inc
@@ -15,7 +15,8 @@
  * @param \Drupal\Core\Entity\EntityInterface $entity
  *   The entity whose translation overview should be displayed.
  *
- * @deprecated Use \Drupal\content_translation\Controller\ContentTranslationController::overview()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\content_translation\Controller\ContentTranslationController::overview().
  */
 function content_translation_overview(EntityInterface $entity) {
   $controller = content_translation_controller($entity->getEntityTypeId());
@@ -178,7 +179,8 @@ function _content_translation_get_switch_links($path) {
  * @return array
  *   A processed form array ready to be rendered.
  *
- * @deprecated Use \Drupal\content_translation\Controller\ContentTranslationController::add()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\content_translation\Controller\ContentTranslationController::add().
  */
 function content_translation_add_page(EntityInterface $entity, Language $source = NULL, Language $target = NULL) {
   $source = !empty($source) ? $source : $entity->language();
@@ -204,7 +206,8 @@ function content_translation_add_page(EntityInterface $entity, Language $source
  * @return array
  *   A processed form array ready to be rendered.
  *
- * @deprecated Use \Drupal\content_translation\Controller\ContentTranslationController::edit()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\content_translation\Controller\ContentTranslationController::edit().
  */
 function content_translation_edit_page(EntityInterface $entity, Language $language = NULL) {
   $language = !empty($language) ? $language : language(Language::TYPE_CONTENT);
diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php
index e50152bb0a8be8a6d4f4856e23c295009d0c7d8c..58f374a8e0be740b15ce8d9dd78083bff6d07699 100644
--- a/core/modules/field/field.api.php
+++ b/core/modules/field/field.api.php
@@ -318,7 +318,8 @@ function hook_field_formatter_info_alter(array &$info) {
  *   The language the field values are going to be entered in. If no language is
  *   provided the default site language will be used.
  *
- * @deprecated as of Drupal 8.0. Use the entity system instead.
+ * @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
  */
 function hook_field_attach_form(\Drupal\Core\Entity\EntityInterface $entity, &$form, &$form_state, $langcode) {
   // Add a checkbox allowing a given field to be emptied.
@@ -346,7 +347,8 @@ function hook_field_attach_form(\Drupal\Core\Entity\EntityInterface $entity, &$f
  * @param $form_state
  *   An associative array containing the current state of the form.
  *
- * @deprecated as of Drupal 8.0. Use the entity system instead.
+ * @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
  */
 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
diff --git a/core/modules/field/field.deprecated.inc b/core/modules/field/field.deprecated.inc
index 6bdc8b2e037ceca5505007067a521288156564ab..e74d8bd0d406112cbabeba09053d43307fda2d1d 100644
--- a/core/modules/field/field.deprecated.inc
+++ b/core/modules/field/field.deprecated.inc
@@ -35,8 +35,8 @@
  * );
  * @endcode
  *
- * @deprecated as of Drupal 8.0. Use
- *   Field::fieldInfo()->getFieldMap().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\field\Field::fieldInfo()->getFieldMap().
  */
 function field_info_field_map() {
   return Field::fieldInfo()->getFieldMap();
@@ -56,9 +56,9 @@ function field_info_field_map() {
  *   entity_load_multiple_by_properties(), NULL if the field was not found.
  *
  * @see field_info_field_by_id()
-
- * @deprecated as of Drupal 8.0. Use
- *   Field::fieldInfo()->getField($field_name).
+ *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\field\Field::fieldInfo()->getField($field_name).
  */
 function field_info_field($entity_type, $field_name) {
   return Field::fieldInfo()->getField($entity_type, $field_name);
@@ -76,8 +76,8 @@ function field_info_field($entity_type, $field_name) {
  *
  * @see field_info_field()
  *
- * @deprecated as of Drupal 8.0. Use
- *   Field::fieldInfo()->getFieldById($field_id).
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\field\Field::fieldInfo()->getFieldById($field_id).
  */
 function field_info_field_by_id($field_id) {
   return Field::fieldInfo()->getFieldById($field_id);
@@ -99,8 +99,8 @@ function field_info_field_by_id($field_id) {
  * @see field_info_field()
  * @see field_info_field_by_id()
  *
- * @deprecated as of Drupal 8.0. Use
- *   Field::fieldInfo()->getFields().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\field\Field::fieldInfo()->getFields().
  */
 function field_info_field_by_ids() {
   return Field::fieldInfo()->getFields();
@@ -131,10 +131,10 @@ function field_info_field_by_ids() {
  *   type, keyed by bundle name. If $entity_type and $bundle_name are set,
  *   return all instances for that bundle.
  *
- * @deprecated as of Drupal 8.0. Use
- *   Field::fieldInfo()->getInstances(),
- *   Field::fieldInfo()->getInstances($entity_type) or
- *   Field::fieldInfo()->getBundleInstances($entity_type, $bundle_name).
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use
+ *   \Drupal\field\Field::fieldInfo()->getInstances(),
+ *   \Drupal\field\Field::fieldInfo()->getInstances($entity_type) or
+ *   \Drupal\field\Field::fieldInfo()->getBundleInstances($entity_type, $bundle_name).
  */
 function field_info_instances($entity_type = NULL, $bundle_name = NULL) {
   $cache = Field::fieldInfo();
@@ -168,8 +168,8 @@ function field_info_instances($entity_type = NULL, $bundle_name = NULL) {
  *   An associative array of instance data for the specific field and bundle;
  *   NULL if the instance does not exist.
  *
- * @deprecated as of Drupal 8.0. Use
- *   Field::fieldInfo()->getInstance($entity_type, $bundle_name, $field_name).
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\field\Field::fieldInfo()->getInstance($entity_type, $bundle_name, $field_name).
  */
 function field_info_instance($entity_type, $field_name, $bundle_name) {
   return Field::fieldInfo()->getInstance($entity_type, $bundle_name, $field_name);
@@ -273,7 +273,8 @@ function field_info_instance($entity_type, $field_name, $bundle_name) {
  *   An associative array of additional options. See field_invoke_method() for
  *   details.
  *
- * @deprecated as of Drupal 8.0. Use the entity system instead.
+ * @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
  *
  * @see field_form_get_state()
  * @see field_form_set_state()
@@ -328,7 +329,8 @@ function field_attach_form(EntityInterface $entity, &$form, &$form_state, $langc
  *   An associative array of additional options. See field_invoke_method() for
  *   details.
  *
- * @deprecated as of Drupal 8.0. Use the entity system instead.
+ * @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
  */
 function field_attach_form_validate(ContentEntityInterface $entity, $form, &$form_state, array $options = array()) {
   $has_violations = FALSE;
@@ -372,7 +374,8 @@ function field_attach_form_validate(ContentEntityInterface $entity, $form, &$for
  *   An associative array of additional options. See field_invoke_method() for
  *   details.
  *
- * @deprecated as of Drupal 8.0. Use the entity system instead.
+ * @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
  */
 function field_attach_extract_form_values(EntityInterface $entity, $form, &$form_state, array $options = array()) {
   // Extract field values from submitted values.
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index b359976c25a1570456cbf115a1af8dab93f27270..6a1e86afd503438310cba6c2a5c3b18e20b17209 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -110,8 +110,8 @@ function file_load($fid, $reset = FALSE) {
 /**
  * Returns the file usage service.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::service('file.usage') instead, or
- *   even better have the file usage service injected into your object.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::service('file.usage').
  *
  * @return \Drupal\file\FileUsage\FileUsageInterface.
  */
diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc
index 74e5914f050527f24ccca061c0cf8f73aeacfae3..0a3fc7564f965ca03caa998f240dbc4ed69f5857 100644
--- a/core/modules/language/language.admin.inc
+++ b/core/modules/language/language.admin.inc
@@ -153,7 +153,8 @@ function theme_language_negotiation_configure_browser_form_table($variables) {
 /**
  * Returns the content language settings form.
  *
- * @deprecated Use \Drupal\language\Controller\LanguageController::contentSettings()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\language\Controller\LanguageController::contentSettings().
  */
 function language_content_settings_page() {
   return drupal_get_form('language_content_settings_form', language_entity_supported());
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 5a7218b91d75d7cf002f65d1f4a9e9b3694fc7fb..0f0c97e93f59c72ce3d0ea9ff9440f1a414bdadb 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -117,7 +117,8 @@ function language_menu_link_defaults() {
 /**
  * Editing or deleting locked languages should not be possible.
  *
- * @deprecated Use \Drupal\language\LanguageAccessController instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\language\LanguageAccessController.
  */
 function language_access_language_edit_or_delete($language) {
   return !$language->locked && \Drupal::currentUser()->hasPermission('administer languages');
diff --git a/core/modules/locale/locale.bulk.inc b/core/modules/locale/locale.bulk.inc
index c0e7bbe274808fa3ae974612e363d3b92272051d..bb8da4076b97434fa85048fa3a0cfec3a6c01145 100644
--- a/core/modules/locale/locale.bulk.inc
+++ b/core/modules/locale/locale.bulk.inc
@@ -18,7 +18,8 @@
  * @see locale_translate_import_form_submit()
  * @ingroup forms
  *
- * @deprecated Use \Drupal\locale\Form\LocaleForm::import()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\locale\Form\LocaleForm::import().
  */
 function locale_translate_import_form($form, &$form_state) {
   Drupal::languageManager()->reset();
@@ -153,7 +154,8 @@ function locale_translate_import_form_submit($form, &$form_state) {
  * @see locale_translate_export_form_submit()
  * @ingroup forms
  *
- * @deprecated Use \Drupal\locale\Form\LocaleForm::export()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\locale\Form\LocaleForm::export().
  */
 function locale_translate_export_form($form, &$form_state) {
   $languages = language_list();
diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc
index 462f6faf1da828cbe20b45946c782dce38cf1781..98f4db9858066953773f4ce1f3e10df326cd6bb4 100644
--- a/core/modules/locale/locale.pages.inc
+++ b/core/modules/locale/locale.pages.inc
@@ -41,7 +41,8 @@ function locale_translation_manual_status() {
  *
  * @see locale_menu()
  *
- * @deprecated Use \Drupal\locale\Form\LocaleForm::status()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\locale\Form\LocaleForm::status().
  */
 function locale_translation_status_form($form, &$form_state) {
   module_load_include('translation.inc', 'locale');
diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc
index 44ccc9ee334c925f459ca711d167594f3e06a650..e751bc270127e3932d983b282c64ca2494546c21 100644
--- a/core/modules/node/node.pages.inc
+++ b/core/modules/node/node.pages.inc
@@ -112,7 +112,8 @@ function template_preprocess_node_preview(&$variables) {
  *
  * @see node_menu()
  *
- * @deprecated Use \Drupal\node\Controller\NodeController::revisionOverview()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\node\Controller\NodeController::revisionOverview().
  */
 function node_revision_overview($node) {
   $build['#title'] = t('Revisions for %title', array('%title' => $node->label()));
diff --git a/core/modules/path/path.admin.inc b/core/modules/path/path.admin.inc
index 6574208051687bdd7989a238d7aa8025948b19cb..fe8d542e03233986800ade6751ab687dd3820a41 100644
--- a/core/modules/path/path.admin.inc
+++ b/core/modules/path/path.admin.inc
@@ -14,7 +14,8 @@
  * When filter key passed, perform a standard search on the given key,
  * and return the list of matching URL aliases.
  *
- * @deprecated Use \Drupal\path\Controller\PathController::adminOverview()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\path\Controller\PathController::adminOverview().
  */
 function path_admin_overview($keys = NULL) {
   // Add the filter form above the overview table.
@@ -109,7 +110,8 @@ function path_admin_overview($keys = NULL) {
  *
  * @see path_menu()
  *
- * @deprecated Use \Drupal\path\Controller\PathController::adminEdit() or
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use
+ *   \Drupal\path\Controller\PathController::adminAdd() or
  *   \Drupal\path\Controller\PathController::adminEdit()
  */
 function path_admin_edit($path = array()) {
diff --git a/core/modules/shortcut/shortcut.admin.inc b/core/modules/shortcut/shortcut.admin.inc
index 876c9f8467ff3cd26d0249690b728932feaf45de..8e8b7218778483d9d20bbd410704f4f6b6fca0b9 100644
--- a/core/modules/shortcut/shortcut.admin.inc
+++ b/core/modules/shortcut/shortcut.admin.inc
@@ -23,7 +23,8 @@
  * @see shortcut_set_switch_validate()
  * @see shortcut_set_switch_submit()
  *
- * @deprecated Use \Drupal\shortcut\Form\ShortcutForm::overview()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\shortcut\Form\ShortcutForm::overview().
  */
 function shortcut_set_switch($form, &$form_state, $account = NULL) {
   $user = \Drupal::currentUser();
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 5e23103374033255101902adc8e722e1fee10a49..1a2ad30f22879bd0bb5cc0ef796734f61a3285f7 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -2711,7 +2711,10 @@ function system_rebuild_module_data() {
  * @return
  *   An associative array of themes information.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::service('theme_handler')->rebuildThemeData().
+ * @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().
  */
 function _system_rebuild_theme_data() {
   return \Drupal::service('theme_handler')->rebuildThemeData();
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index b85cc96c248ff12582ce763b9653a5d7561466ac..5783b4d8ee77bce60404f18dbc3ee8216d65a49b 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -689,7 +689,8 @@ function taxonomy_term_load_multiple_by_name($name, $vocabulary = NULL) {
  * @see entity_load_multiple()
  * @see \Drupal\Core\Entity\Query\EntityQueryInterface
  *
- * @deprecated use entity_load_multiple('taxonomy_term', $tids) instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use entity_load_multiple('taxonomy_term', $tids).
  *
  * @param array $tids
  *   (optional) An array of entity IDs. If omitted, all entities are loaded.
@@ -711,7 +712,8 @@ function taxonomy_term_load_multiple(array $tids = NULL) {
  *
  * @see entity_load_multiple()
  *
- * @deprecated use entity_load_multiple('taxonomy_vocabulary', $vids) instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use entity_load_multiple('taxonomy_vocabulary', $vids).
  *
  * @param array $vids
  *   (optional) An array of entity IDs. If omitted, all entities are loaded.
@@ -726,7 +728,8 @@ function taxonomy_vocabulary_load_multiple(array $vids = NULL) {
 /**
  * Return the taxonomy vocabulary entity matching a vocabulary ID.
  *
- * @deprecated use entity_load('taxonomy_vocabulary', $vid) instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use entity_load('taxonomy_vocabulary', $vid).
  *
  * @param int $vid
  *   The vocabulary's ID.
@@ -742,7 +745,8 @@ function taxonomy_vocabulary_load($vid) {
 /**
  * Return the taxonomy term entity matching a term ID.
  *
- * @deprecated use entity_load('taxonomy_term', $tid) instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use entity_load('taxonomy_term', $tid).
  *
  * @param $tid
  *   A term's ID
diff --git a/core/modules/taxonomy/taxonomy.pages.inc b/core/modules/taxonomy/taxonomy.pages.inc
index d177e1cd3b0cd1bc650ed78f7544448ce5115c6c..99e406d8ce4f9159ad32959a34e855fb35b20112 100644
--- a/core/modules/taxonomy/taxonomy.pages.inc
+++ b/core/modules/taxonomy/taxonomy.pages.inc
@@ -13,7 +13,8 @@
  * @param \Drupal\taxonomy\Entity\Term $term
  *   The taxonomy term entity.
  *
- * @deprecated Use \Drupal\taxonomy\Controller\TaxonomyController::termPage()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\taxonomy\Controller\TaxonomyController::termPage().
  */
 function taxonomy_term_page(Term $term) {
   $build['#attached']['drupal_add_feed'][] = array('taxonomy/term/' . $term->id() . '/feed', 'RSS - ' . $term->label());
@@ -65,7 +66,8 @@ function taxonomy_term_page(Term $term) {
  * @param \Drupal\taxonomy\Entity\Term $term
  *   The taxonomy term entity.
  *
- * @deprecated Use \Drupal\taxonomy\Controller\TaxonomyController::termFeed()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\taxonomy\Controller\TaxonomyController::termFeed().
  */
 function taxonomy_term_feed(Term $term) {
   $channel['link'] = url('taxonomy/term/' . $term->id(), array('absolute' => TRUE));
diff --git a/core/modules/update/update.compare.inc b/core/modules/update/update.compare.inc
index 492e650dacc4bd08c296cb3aa825d6dc19e52835..528672f3f4eeee355dcec3853444e773d74bcdb7 100644
--- a/core/modules/update/update.compare.inc
+++ b/core/modules/update/update.compare.inc
@@ -48,10 +48,10 @@
  *   - base_themes: If the project is a theme it contains an associative array
  *     of all base-themes.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal\update\UpdateManager::getProjects()
- *
  * @see \Drupal\update\UpdateManager::getProjects()
+ *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::service('update.manager')->getProjects().
  */
 function update_get_projects() {
   return \Drupal::service('update.manager')->getProjects();
@@ -572,10 +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.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal\update\UpdateManager::projectStorage()
- *
  * @see \Drupal\update\UpdateManager::projectStorage()
+ *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   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 be7d84de336f0ad9f2f3f2cf36d5a8b5f2c9f0d4..55ef13dcc8aafd4eb52ab5c0058cca3ca06d0293 100644
--- a/core/modules/update/update.fetch.inc
+++ b/core/modules/update/update.fetch.inc
@@ -11,10 +11,10 @@
  * @param $context
  *   Reference to an array used for Batch API storage.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal\update\UpdateManager::fetchDataBatch()
- *
  * @see \Drupal\update\UpdateManager::fetchDataBatch()
+ *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::service('update.manager')->fetchDataBatch().
  */
 function update_fetch_data_batch(&$context) {
   \Drupal::service('update.manager')->fetchDataBatch($context);
@@ -23,10 +23,10 @@ function update_fetch_data_batch(&$context) {
 /**
  * Attempts to drain the queue of tasks for release history data to fetch.
  *
- *  @deprecated as of Drupal 8.0. Use
- *   \Drupal\update\UpdateFetcher::fetchData()
- *
  * @see \Drupal\update\UpdateFetcher::fetchData()
+ *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::service('update.processor')->fetchData().
  */
 function _update_fetch_data() {
   \Drupal::service('update.processor')->fetchData();
@@ -44,10 +44,10 @@ function _update_fetch_data() {
  * @return
  *   TRUE if we fetched parsable XML, otherwise FALSE.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal\update\UpdateFetcher::processFetchTask()
- *
  * @see \Drupal\update\UpdateFetcher::processFetchTask()
+ *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::service('update.processor')->processFetchTask().
  */
 function _update_process_fetch_task($project) {
   return \Drupal::service('update.processor')->processFetchTask($project);
@@ -56,10 +56,10 @@ function _update_process_fetch_task($project) {
 /**
  * Clears out all the available update data and initiates re-fetching.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal\update\UpdateManager::refreshUpdateData()
- *
  * @see \Drupal\update\UpdateManager::refreshUpdateData()
+ *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::service('update.manager')->refreshUpdateData().
  */
 function _update_refresh() {
   \Drupal::service('update.manager')->refreshUpdateData();
@@ -76,10 +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.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal\update\UpdateFetcher::createFetchTask()
- *
  * @see \Drupal\update\UpdateFetcher::createFetchTask()
+ *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal::service('update.processor')->createFetchTask().
  */
 function _update_create_fetch_task($project) {
   \Drupal::service('update.processor')->createFetchTask($project);
diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc
index 79720e7714e5eddb2073fdbbf318fa0f33c48e94..b0d04832a95fe04e136d49757771749992bda854 100644
--- a/core/modules/update/update.manager.inc
+++ b/core/modules/update/update.manager.inc
@@ -63,9 +63,9 @@
  * @see update_menu()
  * @ingroup forms
  *
- * @deprecated Use \Drupal\update\Form\UpdateForm::reportUpdate(),
- *   \Drupal\update\Form\UpdateForm::moduleUpdate(), or
- *   \Drupal\update\Form\UpdateForm::moduleUpdate()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use
+ *   \Drupal\update\Form\UpdateForm::reportUpdate() or
+ *   \Drupal\update\Form\UpdateForm::moduleUpdate().
  */
 function update_manager_update_form($form, $form_state = array(), $context) {
   if (!_update_manager_check_backends($form, 'update')) {
@@ -512,9 +512,9 @@ function update_manager_update_ready_form_submit($form, &$form_state) {
  * @see update_menu()
  * @ingroup forms
  *
- * @deprecated Use \Drupal\update\Form\UpdateForm::reportInstall(),
- *   \Drupal\update\Form\UpdateForm::moduleInstall(), or
- *   \Drupal\update\Form\UpdateForm::moduleInstall()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use
+ *   \Drupal\update\Form\UpdateForm::reportInstall() or
+ *   \Drupal\update\Form\UpdateForm::moduleInstall().
  */
 function update_manager_install_form($form, &$form_state, $context) {
   if (!_update_manager_check_backends($form, 'install')) {
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 15d232d5c2dcae34ea63aab338ed97d623ad1ce3..d07ebd47920862657cd38ae9287414e5973e2d25 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -429,8 +429,8 @@ function _user_role_permissions_update($roles) {
  * @return bool
  *   Boolean TRUE if the current user has the requested permission.
  *
- * @deprecated as of Drupal 8.0. Use
- *   \Drupal\Core\Session\AccountInterface::hasPermission()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Core\Session\AccountInterface::hasPermission().
  */
 function user_access($string, AccountInterface $account = NULL) {
   global $user;
@@ -567,7 +567,8 @@ function user_preprocess_block(&$variables) {
  *   this result must ensure that check_plain() is called on it before it is
  *   printed to the page.
  *
- * @deprecated Use \Drupal\Core\Session\Interface::getUsername() instead.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Core\Session\Interface::getUsername().
  */
 function user_format_name(AccountInterface $account) {
   return $account->getUsername();
@@ -696,7 +697,8 @@ function user_is_anonymous() {
  * @return bool
  *   TRUE if the user is logged in, FALSE if the user is anonymous.
  *
- * @deprecated Use \Drupal\Core\Session\UserSession::isAuthenticated().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\Core\Session\UserSession::isAuthenticated().
  */
 function user_is_logged_in() {
   return $GLOBALS['user']->isAuthenticated();
diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc
index f9b5a91dd0ac33cd1efbcc75509cbb588640469a..e09378165533c445fbdb01bc3548e2a9ec647106 100644
--- a/core/modules/user/user.pages.inc
+++ b/core/modules/user/user.pages.inc
@@ -14,7 +14,8 @@
 /**
  * Menu callback; process one time login link and redirects to the user page on success.
  *
- * @deprecated Use \Drupal\user\Form\UserForm::resetPass()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\user\Form\UserForm::resetPass().
  */
 function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $action = NULL) {
   global $user;
@@ -123,7 +124,8 @@ function template_preprocess_user(&$variables) {
  * @see user_cancel_confirm_form()
  * @see user_cancel_url()
  *
- * @deprecated Use \Drupal\user\Controller\UserController::confirmCancel()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\user\Controller\UserController::confirmCancel().
  */
 function user_cancel_confirm($account, $timestamp = 0, $hashed_pass = '') {
   // Time out in seconds until cancel URL expires; 24 hours = 86400 seconds.
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 6d5cca930b5b5a5bda4f29856c0ef185d9e767b5..3e789c9beea2a9bdb5ef12305888f952c72c6fb3 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -739,7 +739,8 @@ function views_library_info() {
  * @return
  *   A keyed array of in the form of 'base_table' => 'Description'.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::fetchPluginNames().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\views\Views::fetchPluginNames().
  */
 function views_fetch_plugin_names($type, $key = NULL, $base = array()) {
   return Views::fetchPluginNames($type, $key, $base);
@@ -751,7 +752,8 @@ function views_fetch_plugin_names($type, $key = NULL, $base = array()) {
  * @return array
  *   An array of plugin definitions for all types.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::getPluginDefinitions().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\views\Views::getPluginDefinitions().
  */
 function views_get_plugin_definitions() {
   return Views::getPluginDefinitions();
@@ -769,7 +771,8 @@ function views_get_plugin_definitions() {
  *   - views: An array of enabled Views that are currently using this plugin,
  *     keyed by machine name.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::pluginList().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\views\Views::pluginList().
  */
 function views_plugin_list() {
   return Views::pluginList();
@@ -778,7 +781,8 @@ function views_plugin_list() {
 /**
  * Get enabled display extenders.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::getEnabledDisplayExtenders().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\views\Views::getEnabledDisplayExtenders().
  */
 function views_get_enabled_display_extenders() {
   return Views::getEnabledDisplayExtenders();
@@ -800,7 +804,8 @@ function views_get_enabled_display_extenders() {
  * );
  * @endcode
  *
- * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::getApplicableViews().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\views\Views::getApplicableViews().
  */
 function views_get_applicable_views($type) {
   return Views::getApplicableViews($type);
@@ -809,7 +814,8 @@ function views_get_applicable_views($type) {
 /**
  * Returns an array of all views as fully loaded $view objects.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::getAllViews().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\views\Views::getAllViews().
  */
 function views_get_all_views() {
   return Views::getAllViews();
@@ -818,7 +824,8 @@ function views_get_all_views() {
 /**
  * Returns an array of all enabled views, as fully loaded $view objects.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::getEnabledViews().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\views\Views::getEnabledViews().
  */
 function views_get_enabled_views() {
   return Views::getEnabledViews();
@@ -827,7 +834,8 @@ function views_get_enabled_views() {
 /**
  * Returns an array of all disabled views, as fully loaded $view objects.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::getDisabledViews().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\views\Views::getDisabledViews().
  */
 function views_get_disabled_views() {
   return Views::getDisabledViews();
@@ -858,7 +866,8 @@ function views_get_disabled_views() {
  *  an associative array for use in select.
  *  - key: view name and display id separated by ':', or the view name only
  *
- * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::getViewsAsOptions().
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\views\Views::getViewsAsOptions().
  */
 function views_get_views_as_options($views_only = FALSE, $filter = 'all', $exclude_view = NULL, $optgroup = FALSE, $sort = FALSE) {
   return Views::getViewsAsOptions($views_only, $filter, $exclude_view, $optgroup, $sort);
@@ -919,8 +928,8 @@ function views_disable_view(View $view) {
  * @return \Drupal\views\ViewExecutable
  *   A reference to the $view object.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal\views\Views::getView().
- *
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\views\Views::getView().
  */
 function views_get_view($name) {
   return Views::getView($name);
diff --git a/core/modules/xmlrpc/xmlrpc.server.inc b/core/modules/xmlrpc/xmlrpc.server.inc
index 9a5d825f2efcc114ef04df59e7b859380ecaf2bf..3e1d2a9ffaaae85db940fcdc143c2f93a319427d 100644
--- a/core/modules/xmlrpc/xmlrpc.server.inc
+++ b/core/modules/xmlrpc/xmlrpc.server.inc
@@ -14,7 +14,8 @@
  * @return \Symfony\Component\HttpFoundation\Response
  *   A Response object.
  *
- * @deprecated Use \Drupal\xmlrpc\Controller\XmlrpcController::php()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\xmlrpc\Controller\XmlrpcController::php().
  */
 function xmlrpc_server_page() {
   module_load_include('inc', 'xmlrpc');