diff --git a/core/drupalci.yml b/core/drupalci.yml
index 2085b9737b..5c77187e4f 100644
--- a/core/drupalci.yml
+++ b/core/drupalci.yml
@@ -4,6 +4,9 @@
 build:
   assessment:
     validate_codebase:
+      host_command:
+        commands:
+          - 'cd vendor/drupal/coder; sudo -u www-data curl "https://www.drupal.org/files/issues/2019-09-10/3057988-8.fixable_deprecated_text.patch" | sudo -u www-data patch -p1'
       phplint:
       csslint:
         halt-on-fail: false
@@ -15,36 +18,3 @@ build:
         sniff-all-files: false
         halt-on-fail: false
     testing:
-      # run_tests task is executed several times in order of performance speeds.
-      # halt-on-fail can be set on the run_tests tasks in order to fail fast.
-      # suppress-deprecations is false in order to be alerted to usages of
-      # deprecated code.
-      run_tests.phpunit:
-        types: 'PHPUnit-Unit'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      run_tests.kernel:
-        types: 'PHPUnit-Kernel'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      run_tests.simpletest:
-         types: 'Simpletest'
-         testgroups: '--all'
-         suppress-deprecations: false
-         halt-on-fail: false
-      run_tests.functional:
-        types: 'PHPUnit-Functional'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      run_tests.javascript:
-        concurrency: 15
-        types: 'PHPUnit-FunctionalJavascript'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      # Run nightwatch testing.
-      # @see https://www.drupal.org/project/drupal/issues/2869825
-      nightwatchjs:
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 81cd2c369e..1482f303a9 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -22,151 +22,14 @@
   <!-- @todo This rule may be removed when https://www.drupal.org/node/1848264 is resolved. -->
   <exclude-pattern>./core/lib/Drupal/Component/Diff/</exclude-pattern>

-  <!-- Only include specific sniffs that pass. This ensures that, if new sniffs are added, HEAD does not fail.-->
-  <!-- Drupal sniffs -->
-  <rule ref="Drupal.Arrays.Array">
-    <!-- Sniff for these errors: CommaLastItem -->
-    <exclude name="Drupal.Arrays.Array.ArrayClosingIndentation"/>
-    <exclude name="Drupal.Arrays.Array.ArrayIndentation"/>
-    <exclude name="Drupal.Arrays.Array.LongLineDeclaration"/>
-  </rule>
-  <rule ref="Drupal.Classes.ClassCreateInstance"/>
-  <rule ref="Drupal.Classes.ClassDeclaration"/>
-  <rule ref="Drupal.Classes.FullyQualifiedNamespace"/>
-  <rule ref="Drupal.Classes.InterfaceName"/>
-  <rule ref="Drupal.Classes.UnusedUseStatement"/>
-  <rule ref="Drupal.Classes.UseLeadingBackslash"/>
-  <rule ref="Drupal.CSS.ClassDefinitionNameSpacing"/>
-  <rule ref="Drupal.CSS.ColourDefinition"/>
-  <rule ref="Drupal.Commenting.ClassComment">
-    <exclude name="Drupal.Commenting.ClassComment.Missing"/>
-  </rule>
-  <rule ref="Drupal.Commenting.DataTypeNamespace"/>
-  <rule ref="Drupal.Commenting.DocComment">
-    <!-- Sniff for these errors: SpacingAfterTagGroup, WrongEnd, SpacingBetween,
-      ContentAfterOpen, SpacingBeforeShort, TagValueIndent, ShortStartSpace,
-      SpacingAfter, LongNotCapital -->
-    <!-- ParamNotFirst still not decided for PHPUnit-based tests.
-      @see https://www.drupal.org/node/2253915 -->
-    <exclude name="Drupal.Commenting.DocComment.ParamNotFirst"/>
-    <exclude name="Drupal.Commenting.DocComment.SpacingBeforeTags"/>
-    <exclude name="Drupal.Commenting.DocComment.LongFullStop"/>
-    <exclude name="Drupal.Commenting.DocComment.ShortNotCapital"/>
-    <exclude name="Drupal.Commenting.DocComment.ShortFullStop"/>
-    <!-- TagsNotGrouped and ParamGroup have false-positives.
-      @see https://www.drupal.org/node/2060925 -->
-    <exclude name="Drupal.Commenting.DocComment.TagsNotGrouped"/>
-    <exclude name="Drupal.Commenting.DocComment.ParamGroup"/>
-    <exclude name="Drupal.Commenting.DocComment.ShortSingleLine"/>
-    <exclude name="Drupal.Commenting.DocComment.TagGroupSpacing"/>
-    <exclude name="Drupal.Commenting.DocComment.MissingShort"/>
-  </rule>
-  <rule ref="Drupal.Commenting.DocCommentStar"/>
-  <rule ref="Drupal.Commenting.FileComment"/>
-  <rule ref="Drupal.Commenting.FunctionComment">
-    <exclude name="Drupal.Commenting.FunctionComment.IncorrectTypeHint"/>
-    <exclude name="Drupal.Commenting.FunctionComment.InvalidNoReturn"/>
-    <exclude name="Drupal.Commenting.FunctionComment.InvalidTypeHint"/>
-    <exclude name="Drupal.Commenting.FunctionComment.Missing"/>
-    <exclude name="Drupal.Commenting.FunctionComment.MissingParamComment"/>
-    <exclude name="Drupal.Commenting.FunctionComment.MissingParamType"/>
-    <exclude name="Drupal.Commenting.FunctionComment.MissingReturnComment"/>
-    <exclude name="Drupal.Commenting.FunctionComment.MissingReturnType"/>
-    <exclude name="Drupal.Commenting.FunctionComment.ParamCommentFullStop"/>
-    <exclude name="Drupal.Commenting.FunctionComment.ParamMissingDefinition"/>
-    <exclude name="Drupal.Commenting.FunctionComment.TypeHintMissing"/>
-  </rule>
-  <rule ref="Drupal.Commenting.GenderNeutralComment" />
-  <rule ref="Drupal.Commenting.VariableComment">
-    <!-- Sniff for: DuplicateVar, EmptyVar, InlineVariableName -->
-    <exclude name="Drupal.Commenting.VariableComment.IncorrectVarType"/>
-    <exclude name="Drupal.Commenting.VariableComment.Missing"/>
-    <exclude name="Drupal.Commenting.VariableComment.MissingVar"/>
-    <exclude name="Drupal.Commenting.VariableComment.VarOrder"/>
-    <exclude name="Drupal.Commenting.VariableComment.WrongStyle"/>
-  </rule>
-  <rule ref="Drupal.Commenting.InlineComment">
-    <!-- Sniff for: NoSpaceBefore, WrongStyle -->
-    <exclude name="Drupal.Commenting.InlineComment.DocBlock"/>
-    <exclude name="Drupal.Commenting.InlineComment.InvalidEndChar"/>
-    <exclude name="Drupal.Commenting.InlineComment.NotCapital"/>
-    <exclude name="Drupal.Commenting.InlineComment.SpacingAfter"/>
-    <exclude name="Drupal.Commenting.InlineComment.SpacingBefore"/>
-  </rule>
-  <rule ref="Drupal.Commenting.PostStatementComment"/>
-  <rule ref="Drupal.ControlStructures.ElseIf"/>
-  <rule ref="Drupal.ControlStructures.ControlSignature"/>
-  <rule ref="Drupal.ControlStructures.InlineControlStructure"/>
-  <rule ref="Drupal.Files.EndFileNewline"/>
-  <rule ref="Drupal.Files.FileEncoding"/>
-  <rule ref="Drupal.Files.TxtFileLineLength"/>
-  <rule ref="Drupal.Formatting.MultiLineAssignment"/>
-  <rule ref="Drupal.Formatting.MultipleStatementAlignment"/>
-  <rule ref="Drupal.Formatting.SpaceInlineIf"/>
-  <rule ref="Drupal.Formatting.SpaceUnaryOperator"/>
-  <rule ref="Drupal.Functions.DiscouragedFunctions"/>
-  <rule ref="Drupal.Functions.FunctionDeclaration"/>
-  <rule ref="Drupal.InfoFiles.AutoAddedKeys"/>
-  <rule ref="Drupal.InfoFiles.ClassFiles"/>
-  <rule ref="Drupal.InfoFiles.DuplicateEntry"/>
-  <rule ref="Drupal.InfoFiles.Required"/>
-  <rule ref="Drupal.Methods.MethodDeclaration">
-    <!-- Silence method name underscore warning which is covered already in
-      Drupal.NamingConventions.ValidFunctionName.ScopeNotCamelCaps. -->
-    <exclude name="Drupal.Methods.MethodDeclaration.Underscore"/>
-  </rule>
-  <rule ref="Drupal.NamingConventions.ValidVariableName">
-    <!-- Sniff for: LowerStart -->
-    <exclude name="Drupal.NamingConventions.ValidVariableName.LowerCamelName"/>
-  </rule>
-  <rule ref="Drupal.Scope.MethodScope"/>
-  <rule ref="Drupal.Semantics.EmptyInstall"/>
-  <rule ref="Drupal.Semantics.FunctionAlias"/>
-  <rule ref="Drupal.Semantics.FunctionT">
-    <exclude name="Drupal.Semantics.FunctionT.NotLiteralString"/>
-    <exclude name="Drupal.Semantics.FunctionT.ConcatString"/>
-  </rule>
-  <rule ref="Drupal.Semantics.FunctionWatchdog"/>
-  <rule ref="Drupal.Semantics.InstallHooks"/>
-  <rule ref="Drupal.Semantics.LStringTranslatable"/>
-  <rule ref="Drupal.Semantics.PregSecurity"/>
-  <rule ref="Drupal.Semantics.TInHookMenu"/>
-  <rule ref="Drupal.Semantics.TInHookSchema"/>
-  <rule ref="Drupal.Strings.UnnecessaryStringConcat"/>
-  <rule ref="Drupal.WhiteSpace.CloseBracketSpacing"/>
-  <rule ref="Drupal.WhiteSpace.Comma"/>
-  <rule ref="Drupal.WhiteSpace.EmptyLines"/>
-  <rule ref="Drupal.WhiteSpace.Namespace"/>
-  <rule ref="Drupal.WhiteSpace.ObjectOperatorIndent"/>
-  <rule ref="Drupal.WhiteSpace.ObjectOperatorSpacing"/>
-  <rule ref="Drupal.WhiteSpace.OpenBracketSpacing"/>
-  <rule ref="Drupal.WhiteSpace.OpenTagNewline"/>
-  <rule ref="Drupal.WhiteSpace.OperatorSpacing"/>
-  <rule ref="Drupal.WhiteSpace.ScopeClosingBrace"/>
-  <rule ref="Drupal.WhiteSpace.ScopeIndent"/>
-
-  <!-- Drupal Practice sniffs -->
-  <rule ref="DrupalPractice.Commenting.ExpectedException"/>
-
-  <!-- Generic sniffs -->
-  <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
-  <rule ref="Generic.CodeAnalysis.EmptyPHPStatement" />
-  <rule ref="Generic.Files.ByteOrderMark"/>
-  <rule ref="Generic.Files.LineEndings"/>
-  <rule ref="Generic.Formatting.SpaceAfterCast"/>
-  <rule ref="Generic.Functions.FunctionCallArgumentSpacing"/>
-  <rule ref="Generic.Functions.OpeningFunctionBraceKernighanRitchie">
-    <properties>
-      <property name="checkClosures" value="true"/>
-    </properties>
+  <!-- Just test these specific Drupal sniffs -->
+  <rule ref="Drupal.Commenting.Deprecated">
+    <exclude name="Drupal.Commenting.Deprecated.MissingExtraInfo"/>
+    <exclude name="Drupal.Commenting.Deprecated.MissingSeeTag"/>
+    <exclude name="Drupal.Commenting.Deprecated.VersionFormat"/>
+    <exclude name="Drupal.Commenting.Deprecated.PeriodAfterSeeUrl"/>
+    <exclude name="Drupal.Commenting.Deprecated.WrongSeeUrlFormat"/>
   </rule>
-  <rule ref="Generic.NamingConventions.ConstructorName"/>
-  <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
-  <rule ref="Generic.PHP.DeprecatedFunctions"/>
-  <rule ref="Generic.PHP.DisallowShortOpenTag"/>
-  <rule ref="Generic.PHP.LowerCaseKeyword"/>
-  <rule ref="Generic.PHP.UpperCaseConstant"/>
-  <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>

   <!-- Internal sniffs -->
   <rule ref="Internal.NoCodeFound">
--- a/core/tests/Drupal/Tests/UnitTestCase.php
+++ b/core/tests/Drupal/Tests/UnitTestCase.php
@@ -194,7 +194,7 @@
    * @return \Drupal\block\BlockInterface|\PHPUnit\Framework\MockObject\MockObject
    *   The mocked block.
    *
-   * @deprecated in Drupal 8.5.x, will be removed before Drupal 9.0.0. Unit test
+   * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0. Unit test
    *   base classes should not have dependencies on extensions. Set up mocks in
    *   individual tests.
    *
--- a/core/tests/Drupal/KernelTests/KernelTestBase.php
+++ b/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -1007,7 +1007,7 @@
    * @see \Drupal\KernelTests\KernelTestBase::$runTestInSeparateProcess
    * @see https://github.com/sebastianbergmann/phpunit/pull/1350
    *
-   * @deprecated in Drupal 8.4.x, for removal before the Drupal 9.0.0 release.
+   * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
    *   KernelTestBase tests are always run in isolated processes.
    */
   protected function isTestInIsolation() {
@@ -1021,7 +1021,7 @@
    * Test authors should follow the provided instructions and adjust their tests
    * accordingly.
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    */
   public function __get($name) {
     if (in_array($name, [
--- a/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php
@@ -133,7 +133,7 @@
    * @param string $message
    *   Optional message to show alongside the assertion.
    *
-   * @deprecated in Drupal 8.1.0, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.1.0 and is removed from drupal:9.0.0. Use
    *   \Behat\Mink\Element\NodeElement::isVisible() instead.
    */
   protected function assertElementVisible($css_selector, $message = '') {
@@ -149,7 +149,7 @@
    * @param string $message
    *   Optional message to show alongside the assertion.
    *
-   * @deprecated in Drupal 8.1.0, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.1.0 and is removed from drupal:9.0.0. Use
    *   \Behat\Mink\Element\NodeElement::isVisible() instead.
    */
   protected function assertElementNotVisible($css_selector, $message = '') {
--- a/core/tests/Drupal/FunctionalJavascriptTests/LegacyJavascriptTestBase.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/LegacyJavascriptTestBase.php
@@ -5,7 +5,7 @@
 /**
  * Runs a browser test using PhantomJS.
  *
- * @deprecated in Drupal 8.6.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0.
  * Use \Drupal\FunctionalJavascriptTests\WebDriverTestBase instead
  *
  * BC layer for testing browser interaction implemented in JavaScript.
--- a/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/JavascriptTestBase.php
@@ -11,7 +11,7 @@
  *
  * Base class for testing browser interaction implemented in JavaScript.
  *
- * @deprecated in Drupal 8.6.x, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0.
  * Use \Drupal\FunctionalJavascriptTests\WebDriverTestBase instead
  *
  * @see https://www.drupal.org/node/2945059
--- a/core/modules/views_ui/src/Tests/UITestBase.php
+++ b/core/modules/views_ui/src/Tests/UITestBase.php
@@ -9,7 +9,7 @@
 /**
  * Provides a base class for testing the Views UI.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.x.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\views_ui\Functional\UITestBase.
  *
  * @see https://www.drupal.org/node/2999939
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -627,7 +627,7 @@
  *   The $element with prepared variables ready for #theme 'form'
  *   in views_form_views_form.
  *
- * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\views\Form\ViewsFormMainForm::preRenderViewsForm() instead.
  *
  * @see https://www.drupal.org/node/2966725
--- a/core/modules/views/src/Tests/Wizard/WizardTestBase.php
+++ b/core/modules/views/src/Tests/Wizard/WizardTestBase.php
@@ -9,7 +9,7 @@
 /**
  * Views UI wizard tests.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\views\Functional\Wizard\WizardTestBase.
  */
 abstract class WizardTestBase extends ViewTestBase {
--- a/core/modules/views/src/Tests/ViewTestBase.php
+++ b/core/modules/views/src/Tests/ViewTestBase.php
@@ -16,7 +16,7 @@
  * When possible, ViewsKernelTestBase should be used instead. Both base classes
  * include the same methods.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\views\Functional\ViewTestBase.
  *
  * @see \Drupal\Tests\views\Kernel\ViewsKernelTestBase
--- a/core/modules/views/src/Tests/ViewKernelTestBase.php
+++ b/core/modules/views/src/Tests/ViewKernelTestBase.php
@@ -15,7 +15,7 @@
  * requires the full web test environment provided by WebTestBase, extend
  * ViewTestBase instead.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Tests\views\Kernel\ViewsKernelTestBase instead.
  *
  * @see \Drupal\Tests\views\Kernel\ViewsKernelTestBase
--- a/core/modules/views/src/Tests/Plugin/PluginTestBase.php
+++ b/core/modules/views/src/Tests/Plugin/PluginTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\views\Tests\ViewTestBase;
 
 /**
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\views\Functional\ViewTestBase.
  */
 abstract class PluginTestBase extends ViewTestBase {
--- a/core/modules/views/src/Tests/Handler/HandlerTestBase.php
+++ b/core/modules/views/src/Tests/Handler/HandlerTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\views\Tests\ViewTestBase;
 
 /**
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\views\Functional\ViewTestBase.
  */
 abstract class HandlerTestBase extends ViewTestBase {
--- a/core/modules/views/src/Plugin/views/field/Field.php
+++ b/core/modules/views/src/Plugin/views/field/Field.php
@@ -5,7 +5,7 @@
 /**
  * A stub class to provide backward compatibility for EntityField.
  *
- * @deprecated in Drupal 8.3.x and will be removed before 9.0.0
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\views\Plugin\views\field\EntityField instead.
  */
 class Field extends EntityField {
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -2188,7 +2188,7 @@
    * @param array $element
    *   The render array with updated cacheability metadata.
    *
-   * @deprecated in Drupal 8.4.0, will be removed before Drupal 9.0. Use
+   * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
    *   DisplayPluginBase::applyDisplayCacheabilityMetadata instead.
    *
    * @see \Drupal\views\Plugin\views\display\DisplayPluginBase::applyDisplayCacheabilityMetadata()
--- a/core/modules/views/src/Plugin/views/PluginInterface.php
+++ b/core/modules/views/src/Plugin/views/PluginInterface.php
@@ -5,7 +5,7 @@
 use Drupal\Component\Plugin\PluginInspectionInterface;
 
 /**
- * @deprecated as of Drupal 8.3.x, will be removed in Drupal 9.0.0
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  */
 interface PluginInterface extends PluginInspectionInterface {
 
--- a/core/modules/views/src/FieldAPIHandlerTrait.php
+++ b/core/modules/views/src/FieldAPIHandlerTrait.php
@@ -71,7 +71,7 @@
    * @return \Drupal\Core\Entity\EntityManagerInterface
    *   The entity manager service.
    *
-   * @deprecated in drupal:8.8.0 and is removed in drupal:9.0.0. Use
+   * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\views\FieldAPIHandlerTrait::getEntityFieldManager() instead.
    *
    * @see https://www.drupal.org/node/2549139
--- a/core/modules/views/src/Entity/View.php
+++ b/core/modules/views/src/Entity/View.php
@@ -328,7 +328,7 @@
    * @param array &$displays
    *   An array containing display handlers of a view.
    *
-   * @deprecated in Drupal 8.3.0, will be removed in Drupal 9.0.0.
+   * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
    *
    * @see https://www.drupal.org/node/2831499
    */
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -29,7 +29,7 @@
  *
  * Keep this under 191 characters so we can use a unique constraint in MySQL.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\user\UserInterface::USERNAME_MAX_LENGTH instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -39,7 +39,7 @@
 /**
  * Only administrators can create user accounts.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\user\UserInterface::REGISTER_ADMINISTRATORS_ONLY instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -49,7 +49,7 @@
 /**
  * Visitors can create their own accounts.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\user\UserInterface::REGISTER_VISITORS instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -60,7 +60,7 @@
  * Visitors can create accounts, but they don't become active without
  * administrative approval.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\user\UserInterface::REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL
  *   instead.
  *
@@ -200,7 +200,7 @@
  * @return array
  *   An array of user objects, indexed by uid.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\user\Entity\User::loadMultiple().
  *
  * @see https://www.drupal.org/node/2266845
@@ -226,7 +226,7 @@
  *   A fully-loaded user object upon successful user load, or NULL if the user
  *   cannot be loaded.
  *
- * @deprecated iin Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   Drupal\user\Entity\User::load().
  *
  * @see https://www.drupal.org/node/2266845
@@ -866,7 +866,7 @@
  * @param int $uid
  *   A user ID.
  *
- * @deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. Use the user
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use the user
  *   entity's delete method to delete the user.
  * @code
  *   Drupal::entityTypeManager->getStorage('user')->load($uid)->delete();
@@ -885,7 +885,7 @@
  * @param int[] $uids
  *   An array of user IDs.
  *
- * @deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. Use the
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use the
  *   entity storage system to delete the users.
  * @code
  *   $storage_handler = \Drupal::entityTypeManager()->getStorage('user');
@@ -924,7 +924,7 @@
  * @return array
  *   An array as expected by \Drupal\Core\Render\RendererInterface::render().
  *
- * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal::entityTypeManager()->getViewBuilder('user')->view() instead.
  *
  * @see https://www.drupal.org/node/3033656
@@ -951,7 +951,7 @@
  *   An array in the format expected by
  *   \Drupal\Core\Render\RendererInterface::render().
  *
- * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal::entityTypeManager()->getViewBuilder('user')->viewMultiple()
  *   instead.
  *
@@ -1133,7 +1133,7 @@
  *   A fully-loaded role object if a role with the given ID exists, or NULL
  *   otherwise.
  *
- * @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\user\Entity\Role::load().
  */
 function user_role_load($rid) {
--- a/core/modules/user/src/SharedTempStoreFactory.php
+++ b/core/modules/user/src/SharedTempStoreFactory.php
@@ -9,7 +9,7 @@
 /**
  * Creates a shared temporary storage for a collection.
  *
- * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\TempStore\SharedTempStoreFactory instead.
  *
  * @see \Drupal\Core\TempStore\SharedTempStoreFactory
--- a/core/modules/user/src/SharedTempStore.php
+++ b/core/modules/user/src/SharedTempStore.php
@@ -16,7 +16,7 @@
 /**
  * Stores and retrieves temporary data for a given owner.
  *
- * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\TempStore\SharedTempStore instead.
  *
  * @see \Drupal\Core\TempStore\SharedTempStore
--- a/core/modules/user/src/PrivateTempStoreFactory.php
+++ b/core/modules/user/src/PrivateTempStoreFactory.php
@@ -9,7 +9,7 @@
 /**
  * Creates a PrivateTempStore object for a given collection.
  *
- * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\TempStore\PrivateTempStoreFactory instead.
  *
  * @see \Drupal\Core\TempStore\PrivateTempStoreFactory
--- a/core/modules/user/src/PrivateTempStore.php
+++ b/core/modules/user/src/PrivateTempStore.php
@@ -16,7 +16,7 @@
 /**
  * Stores and retrieves temporary data for a given owner.
  *
- * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\TempStore\PrivateTempStore instead.
  *
  * @see \Drupal\Core\TempStore\PrivateTempStore
--- a/core/modules/update/update.module
+++ b/core/modules/update/update.module
@@ -23,7 +23,7 @@
 /**
  * Project is missing security update(s).
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\update\UpdateManagerInterface::NOT_SECURE instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -33,7 +33,7 @@
 /**
  * Current release has been unpublished and is no longer available.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\update\UpdateManagerInterface::REVOKED instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -43,7 +43,7 @@
 /**
  * Current release is no longer supported by the project maintainer.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\update\UpdateManagerInterface::NOT_SUPPORTED instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -53,7 +53,7 @@
 /**
  * Project has a new release available, but it is not a security release.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\update\UpdateManagerInterface::NOT_CURRENT instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -63,7 +63,7 @@
 /**
  * Project is up to date.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\update\UpdateManagerInterface::CURRENT instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -73,7 +73,7 @@
 /**
  * Project's status cannot be checked.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\update\UpdateFetcherInterface::NOT_CHECKED instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -83,7 +83,7 @@
 /**
  * No available update data was found for project.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\update\UpdateFetcherInterface::UNKNOWN instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -93,7 +93,7 @@
 /**
  * There was a failure fetching available update data for this project.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\update\UpdateFetcherInterface::NOT_FETCHED instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -103,7 +103,7 @@
 /**
  * We need to (re)fetch available update data for this project.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\update\UpdateFetcherInterface::FETCH_PENDING instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -425,7 +425,7 @@
  *
  * @internal
  *
- * @deprecated in Drupal 8.6.0 and will be removed before Drupal 9.0.0. Use the
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use the
  *   'Insecure' release type tag in update XML provided by Drupal.org to
  *   determine if releases are insecure.
  */
--- a/core/modules/tracker/tracker.module
+++ b/core/modules/tracker/tracker.module
@@ -137,7 +137,7 @@
 /**
  * Access callback: Determines access permission for a user's own account.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. As
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. As
  *   internal API, _tracker_user_access() may also be removed in a minor
  *   release.
  *
@@ -159,7 +159,7 @@
 /**
  * Access callback: Determines access permission for an account.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. As
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. As
  *   internal API, _tracker_user_access() may also be removed in a minor
  *   release.
  *
--- a/core/modules/tracker/tests/src/Functional/Views/TrackerTestBase.php
+++ b/core/modules/tracker/tests/src/Functional/Views/TrackerTestBase.php
@@ -13,7 +13,7 @@
 /**
  * Base class for all tracker tests.
  *
- * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0. Instead,
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Instead,
  *   use Kernel tests to test tracker module views plugins integration.
  *
  * @see https://www.drupal.org/node/3046938
--- a/core/modules/tour/src/Tests/TourTestBase.php
+++ b/core/modules/tour/src/Tests/TourTestBase.php
@@ -10,7 +10,7 @@
 /**
  * Base class for testing Tour functionality.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\tour\Functional\TourTestBase instead.
  */
 abstract class TourTestBase extends WebTestBase {
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -215,7 +215,7 @@
  * @return array
  *   The updated renderable array.
  *
- * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\toolbar\Controller\ToolbarController::preRenderAdministrationTray()
  *   instead.
  *
@@ -303,7 +303,7 @@
 /**
  * #pre_render callback for toolbar_get_rendered_subtrees().
  *
- * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\toolbar\Controller\ToolbarController::preRenderGetRenderedSubtrees()
  *   instead.
  *
--- a/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
+++ b/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
@@ -21,7 +21,7 @@
  *   destination_module = "text",
  * )
  *
- * @deprecated in Drupal 8.3.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  * \Drupal\text\Plugin\migrate\field\d6\TextField or
  * \Drupal\text\Plugin\migrate\field\d7\TextField instead.
  *
--- a/core/modules/taxonomy/tests/src/Functional/TaxonomyTestTrait.php
+++ b/core/modules/taxonomy/tests/src/Functional/TaxonomyTestTrait.php
@@ -9,7 +9,7 @@
 /**
  * Provides common helper methods for Taxonomy module tests.
  *
- * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait instead.
  *
  * @see https://www.drupal.org/node/3041703
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -19,7 +19,7 @@
 /**
  * Denotes that no term in the vocabulary has a parent.
  *
- * @deprecated in Drupal 8.2.x and will be removed before 9.0.0. Use
+ * @deprecated in drupal:8.2.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\taxonomy\VocabularyInterface::HIERARCHY_DISABLED instead.
  *
  * @see https://www.drupal.org/node/2807795
@@ -29,7 +29,7 @@
 /**
  * Denotes that one or more terms in the vocabulary has a single parent.
  *
- * @deprecated in Drupal 8.2.x and will be removed before 9.0.0. Use
+ * @deprecated in drupal:8.2.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\taxonomy\VocabularyInterface::HIERARCHY_SINGLE instead.
  *
  * @see https://www.drupal.org/node/2807795
@@ -39,7 +39,7 @@
 /**
  * Denotes that one or more terms in the vocabulary have multiple parents.
  *
- * @deprecated in Drupal 8.2.x and will be removed before 9.0.0. Use
+ * @deprecated in drupal:8.2.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\taxonomy\VocabularyInterface::HIERARCHY_MULTIPLE instead.
  *
  * @see https://www.drupal.org/node/2807795
@@ -160,7 +160,7 @@
  * @return int
  *   An integer that represents the level of the vocabulary's hierarchy.
  *
- * @deprecated in Drupal 8.7.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\taxonomy\TermStorage::getVocabularyHierarchyType() instead.
  */
 function taxonomy_check_vocabulary_hierarchy(VocabularyInterface $vocabulary, $changed_term) {
@@ -183,7 +183,7 @@
  *   A $page element suitable for use by
  *   \Drupal\Core\Render\RendererInterface::render().
  *
- * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal::entityTypeManager()->getViewBuilder('taxonomy_term')->view()
  *   instead.
  *
@@ -211,7 +211,7 @@
  *   An array in the format expected by
  *   \Drupal\Core\Render\RendererInterface::render().
  *
- * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal::entityTypeManager()->getViewBuilder('taxonomy_term')->viewMultiple()
  *   instead.
  *
@@ -366,7 +366,7 @@
  *   An array of taxonomy term entities, indexed by tid. When no results are
  *   found, an empty array is returned.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\taxonomy\Entity\Term::loadMultiple().
  *
  * @see https://www.drupal.org/node/2266845
@@ -389,7 +389,7 @@
  * @return array
  *   An array of vocabulary objects, indexed by vid.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\taxonomy\Entity\Vocabulary::loadMultiple().
  *
  * @see https://www.drupal.org/node/2266845
@@ -409,7 +409,7 @@
  *   The taxonomy vocabulary entity, if exists, NULL otherwise. Results are
  *   statically cached.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\taxonomy\Entity\Vocabulary::load().
  *
  * @see https://www.drupal.org/node/2266845
@@ -429,7 +429,7 @@
  *   A taxonomy term entity, or NULL if the term was not found. Results are
  *   statically cached.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   Drupal\taxonomy\Entity\Term::load().
  *
  * @see https://www.drupal.org/node/2266845
--- a/core/modules/taxonomy/src/VocabularyInterface.php
+++ b/core/modules/taxonomy/src/VocabularyInterface.php
@@ -30,7 +30,7 @@
    * @return int
    *   The vocabulary hierarchy.
    *
-   * @deprecated in Drupal 8.7.x and will be removed before Drupal 9.0.x. Use
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\taxonomy\TermStorage::getVocabularyHierarchyType() instead.
    */
   public function getHierarchy();
@@ -47,7 +47,7 @@
    *
    * @return $this
    *
-   * @deprecated in Drupal 8.7.x and will be removed before Drupal 9.0.x. Reset
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Reset
    *   the cache of the taxonomy_term storage handler instead.
    */
   public function setHierarchy($hierarchy);
--- a/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php
+++ b/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php
@@ -12,7 +12,7 @@
 /**
  * Provides common testing base for translated taxonomy terms.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\taxonomy\Functional\TaxonomyTranslationTestTrait
  */
 trait TaxonomyTranslationTestTrait {
--- a/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php
+++ b/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php
@@ -11,7 +11,7 @@
 /**
  * Provides common helper methods for Taxonomy module tests.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait instead.
  */
 trait TaxonomyTestTrait {
--- a/core/modules/taxonomy/src/TermViewBuilder.php
+++ b/core/modules/taxonomy/src/TermViewBuilder.php
@@ -9,7 +9,7 @@
 /**
  * View builder handler for taxonomy terms.
  *
- * @deprecated in Drupal 8.5.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Entity\EntityViewBuilder instead.
  *
  * @see \Drupal\Core\Entity\EntityViewBuilder
--- a/core/modules/taxonomy/src/Plugin/migrate/source/Term.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/source/Term.php
@@ -15,7 +15,7 @@
  *   source_module = "taxonomy"
  * )
  *
- * @deprecated in Drupal 8.3.0, intended to be removed in Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\taxonomy\Plugin\migrate\source\d6\Term or
  *   \Drupal\taxonomy\Plugin\migrate\source\d7\Term.
  *
--- a/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
@@ -18,7 +18,7 @@
  *   destination_module = "core",
  * )
  *
- * @deprecated in Drupal 8.4.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  * \Drupal\taxonomy\Plugin\migrate\field\TaxonomyTermReference instead.
  *
  * @see https://www.drupal.org/node/2751897
--- a/core/modules/system/tests/src/FunctionalJavascript/OffCanvasTestBase.php
+++ b/core/modules/system/tests/src/FunctionalJavascript/OffCanvasTestBase.php
@@ -103,7 +103,7 @@
    * @param int $timeout
    *   (optional) Timeout in milliseconds, defaults to 10000.
    *
-   * @deprecated in Drupal 8.8.x, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
    *   Drupal\FunctionalJavascriptTests\JSWebAssert::assertNoElementAfterWait()
    */
   protected function waitForNoElement($selector, $timeout = 10000) {
--- a/core/modules/system/tests/modules/entity_test/entity_test.module
+++ b/core/modules/system/tests/modules/entity_test/entity_test.module
@@ -367,7 +367,7 @@
  * @return \Drupal\entity_test\Entity\EntityTest
  *   The loaded entity object, or NULL if the entity cannot be loaded.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal::entityTypeManager()->getStorage('entity_test')->load().
  *
  * @see https://www.drupal.org/node/2266845
@@ -392,7 +392,7 @@
  * @return \Drupal\entity_test\Entity\EntityTestRev
  *   The loaded entity object, or NULL if the entity cannot be loaded.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal::entityTypeManager()->getStorage('entity_test_rev')->load().
  *
  * @see https://www.drupal.org/node/2266845
@@ -417,7 +417,7 @@
  * @return \Drupal\entity_test\Entity\EntityTestMul
  *   The loaded entity object, or FALSE if the entity cannot be loaded.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal::entityTypeManager()->getStorage('entity_test_mul')->load().
  *
  * @see https://www.drupal.org/node/2266845
@@ -442,7 +442,7 @@
  * @return \Drupal\entity_test\Entity\EntityTestMulRev
  *   The loaded entity object, or NULL if the entity cannot be loaded.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal::entityTypeManager()->getStorage('entity_test_mulrev_load')->load().
  *
  * @see https://www.drupal.org/node/2266845
--- a/core/modules/system/tests/modules/deprecation_test/deprecation_test.module
+++ b/core/modules/system/tests/modules/deprecation_test/deprecation_test.module
@@ -11,7 +11,7 @@
  * @return string
  *   A known return value of 'known_return_value'.
  *
- * @deprecated in Drupal 8.4.x. Might be removed before Drupal 9.0.0. This is
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. This is
  *   the deprecation message for deprecated_test_function().
  */
 function deprecation_test_function() {
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -32,7 +32,7 @@
 /**
  * New users will be set to the default time zone at registration.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\user\UserInterface::TIMEZONE_DEFAULT instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -42,7 +42,7 @@
 /**
  * New users will get an empty time zone at registration.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\user\UserInterface::TIMEZONE_EMPTY instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -52,7 +52,7 @@
 /**
  * New users will select their own timezone at registration.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\user\UserInterface::TIMEZONE_SELECT instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -77,7 +77,7 @@
 /**
  * Return only visible regions.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\block\BlockRepositoryInterface::REGIONS_VISIBLE instead.
  *
  * @see system_region_list()
@@ -88,7 +88,7 @@
 /**
  * Return all regions.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\block\BlockRepositoryInterface::REGIONS_ALL instead.
  *
  * @see system_region_list()
@@ -1003,7 +1003,7 @@
  * @param \Drupal\Core\Extension\Extension[] $modules
  *   The array of all module info.
  *
- * @deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0. This
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0. This
  *   function is no longer used in Drupal core.
  *
  * @see https://www.drupal.org/node/2709919
@@ -1029,7 +1029,7 @@
  * @return \Drupal\Core\Extension\Extension[]
  *   An associative array of module information.
  *
- * @deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal::service('extension.list.module')->reset()->getList()
  *   instead. Note: You probably don't need the reset() method.
  *
@@ -1046,7 +1046,7 @@
  * @return \Drupal\Core\Extension\Extension[]
  *   Array of all available modules and their data.
  *
- * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0.
  *   Use \Drupal::service('extension.list.module')->getList() instead.
  *   Note: use reset() only when you really need to rescan and rebuild the list.
  *
--- a/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
+++ b/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
@@ -36,7 +36,7 @@
  *
  * @ingroup update_api
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\FunctionalTests\Update\UpdatePathTestBase.
  * @see https://www.drupal.org/node/2896640
  *
--- a/core/modules/system/src/Tests/Update/DbUpdatesTrait.php
+++ b/core/modules/system/src/Tests/Update/DbUpdatesTrait.php
@@ -13,7 +13,7 @@
  *
  * This should be used only by classes extending \Drupal\simpletest\WebTestBase.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\FunctionalTests\Update\DbUpdatesTrait.
  * @see https://www.drupal.org/node/2896640
  */
--- a/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php
+++ b/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php
@@ -14,7 +14,7 @@
  * @see UserAdminSettingsFormTest
  *   For a full working implementation.
  *
- * @deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\KernelTests\ConfigFormTestBase instead.
  *
  * @see https://www.drupal.org/node/2941907
--- a/core/modules/system/src/Tests/Installer/ConfigAfterInstallerTestBase.php
+++ b/core/modules/system/src/Tests/Installer/ConfigAfterInstallerTestBase.php
@@ -13,7 +13,7 @@
 /**
  * Provides a class for install profiles to check their installed config.
  *
- * @deprecated in Drupal 8.6.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\FunctionalTests\Installer\ConfigAfterInstallerTestBase.
  */
 abstract class ConfigAfterInstallerTestBase extends InstallerTestBase {
--- a/core/modules/system/src/Tests/Image/ToolkitTestBase.php
+++ b/core/modules/system/src/Tests/Image/ToolkitTestBase.php
@@ -10,7 +10,7 @@
 /**
  * Base class for image manipulation testing.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   Use Drupal\FunctionalTests\Image\ToolkitTestBase instead.
  *
  * @see https://www.drupal.org/node/2862641
--- a/core/modules/system/src/Tests/Entity/EntityWithUriCacheTagsTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityWithUriCacheTagsTestBase.php
@@ -12,7 +12,7 @@
 /**
  * Provides helper methods for Entity cache tags tests; for entities with URIs.
  *
- * @deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0.
  * Use \Drupal\Tests\system\Functional\Entity\EntityWithUriCacheTagsTestBase.
  *
  * @see https://www.drupal.org/node/2946549
--- a/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
@@ -12,7 +12,7 @@
 /**
  * Defines an abstract test base for entity unit tests.
  *
- * @deprecated in Drupal 8.1.0, will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.1.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\KernelTests\Core\Entity\EntityKernelTestBase instead.
  */
 abstract class EntityUnitTestBase extends KernelTestBase {
--- a/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php
+++ b/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php
@@ -10,7 +10,7 @@
 /**
  * Provides some test methods used to update existing entity definitions.
  *
- * @deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0.
  * Use \Drupal\Tests\system\Functional\Entity\Traits\EntityDefinitionTestTrait.
  *
  * @see https://www.drupal.org/node/2946549
--- a/core/modules/system/src/Tests/Database/FakeRecord.php
+++ b/core/modules/system/src/Tests/Database/FakeRecord.php
@@ -11,7 +11,7 @@
  * rather than just a stdClass or array. This class is for testing that
  * functionality. (See testQueryFetchClass() below)
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Instead
  *   use \Drupal\Tests\system\Functional\Database\FakeRecord.
  */
 class FakeRecord {}
--- a/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php
+++ b/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php
@@ -10,7 +10,7 @@
 /**
  * Base class for databases database tests.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Instead
  *   use \Drupal\Tests\system\Functional\Database\DatabaseTestBase.
  */
 abstract class DatabaseWebTestBase extends WebTestBase {
--- a/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php
+++ b/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php
@@ -18,7 +18,7 @@
  * @see DatabaseBackendUnitTestCase
  *   For a full working implementation.
  *
- * @deprecated as of Drupal 8.2.x, will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.2.0 and is removed from drupal:9.0.0. Use
  *    \Drupal\KernelTests\Core\Cache\GenericCacheBackendUnitTestBase instead.
  */
 abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
--- a/core/modules/system/src/SystemRequirements.php
+++ b/core/modules/system/src/SystemRequirements.php
@@ -16,7 +16,7 @@
    *
    * @return bool
    *
-   * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0. All
+   * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. All
    *   supported PHP versions support disabling multi-statement queries in
    *   MySQL.
    *
--- a/core/modules/system/src/Plugin/views/field/BulkForm.php
+++ b/core/modules/system/src/Plugin/views/field/BulkForm.php
@@ -12,7 +12,7 @@
  *
  * @ViewsField("legacy_bulk_form")
  *
- * @deprecated in drupal:8.5.0, will be removed before drupal:9.0.0. Use
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\views\Plugin\views\field\BulkForm instead.
  *
  * @see https://www.drupal.org/node/2916716
--- a/core/modules/statistics/statistics.module
+++ b/core/modules/statistics/statistics.module
@@ -93,7 +93,7 @@
  *   and the username for the selected node(s), or FALSE if the query could not
  *   be executed correctly.
  *
- * @deprecated in Drupal 8.6.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\statistics\NodeStatisticsDatabaseStorage::fetchAll() instead.
  */
 function statistics_title_list($dbfield, $dbrows) {
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -34,7 +34,7 @@
  *
  * @ingroup testing
  *
- * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0. Instead,
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Instead,
  *   use \Drupal\Tests\BrowserTestBase. See https://www.drupal.org/node/3030340.
  */
 abstract class WebTestBase extends TestBase {
--- a/core/modules/simpletest/src/WebAssert.php
+++ b/core/modules/simpletest/src/WebAssert.php
@@ -7,7 +7,7 @@
 /**
  * Defines a class with methods for asserting presence of elements during tests.
  *
- * @deprecated in Drupal 8.1.1 will be removed before 9.0.0.
+ * @deprecated in drupal:8.1.1 and is removed from drupal:9.0.0.
  * This was moved to another namespace.
  *
  * @see \Drupal\Tests
--- a/core/modules/simpletest/src/UserCreationTrait.php
+++ b/core/modules/simpletest/src/UserCreationTrait.php
@@ -13,7 +13,7 @@
  * This trait is meant to be used only by test classes extending
  * \Drupal\simpletest\TestBase.
  *
- * @deprecated in Drupal 8.4.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\user\Traits\UserCreationTrait instead.
  *
  * @see https://www.drupal.org/node/2884454
--- a/core/modules/simpletest/src/TestServiceProvider.php
+++ b/core/modules/simpletest/src/TestServiceProvider.php
@@ -7,7 +7,7 @@
 /**
  * Provides special routing services for tests.
  *
- * @deprecated in 8.6.0 for removal before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\KernelTests\TestServiceProvider instead.
  *
  * @see https://www.drupal.org/node/2943146
--- a/core/modules/simpletest/src/TestBase.php
+++ b/core/modules/simpletest/src/TestBase.php
@@ -25,7 +25,7 @@
  *
  * Do not extend this class directly; use \Drupal\simpletest\WebTestBase.
  *
- * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0. Instead,
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Instead,
  *   use one of the phpunit base test classes like
  *   Drupal\Tests\BrowserTestBase. See https://www.drupal.org/node/3030340.
  */
@@ -385,7 +385,7 @@
    * @return
    *   Message ID of the stored assertion.
    *
-   * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
    *   simpletest_insert_assert() instead.
    *
    * @see https://www.drupal.org/node/3030340
--- a/core/modules/simpletest/src/SessionTestTrait.php
+++ b/core/modules/simpletest/src/SessionTestTrait.php
@@ -9,7 +9,7 @@
 /**
  * Provides methods to generate and get session name in tests.
  *
- * @deprecated in Drupal 8.1.1 will be removed before 9.0.0. Use
+ * @deprecated in drupal:8.1.1 and is removed from drupal:9.0.0. Use
  *   \Drupal\Tests\SessionTestTrait instead.
  *
  * @see \Drupal\Tests
--- a/core/modules/simpletest/src/RouteProvider.php
+++ b/core/modules/simpletest/src/RouteProvider.php
@@ -7,7 +7,7 @@
 /**
  * Rebuilds the router when the provider is instantiated.
  *
- * @deprecated in 8.6.0 for removal before 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\KernelTests\RouteProvider instead.
  *
  * @see https://www.drupal.org/node/2943146
--- a/core/modules/simpletest/src/RandomGeneratorTrait.php
+++ b/core/modules/simpletest/src/RandomGeneratorTrait.php
@@ -9,7 +9,7 @@
 /**
  * Provides random generator utility methods.
  *
- * @deprecated in Drupal 8.1.1, will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.1.1 and is removed from drupal:9.0.0. Use
  *   \Drupal\Tests\RandomGeneratorTrait instead.
  *
  * @see \Drupal\Tests
--- a/core/modules/simpletest/src/NodeCreationTrait.php
+++ b/core/modules/simpletest/src/NodeCreationTrait.php
@@ -11,7 +11,7 @@
  *
  * This trait is meant to be used only by test classes.
  *
- * @deprecated in Drupal 8.4.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Tests\node\Traits\NodeCreationTrait instead.
  *
  * @see https://www.drupal.org/node/2884454
--- a/core/modules/simpletest/src/KernelTestBase.php
+++ b/core/modules/simpletest/src/KernelTestBase.php
@@ -62,7 +62,7 @@
  * @see \Drupal\Tests\KernelTestBase::installSchema()
  * @see \Drupal\Tests\BrowserTestBase
  *
- * @deprecated in Drupal 8.0.x, will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\KernelTests\KernelTestBase instead.
  *
  * @ingroup testing
--- a/core/modules/simpletest/src/InstallerTestBase.php
+++ b/core/modules/simpletest/src/InstallerTestBase.php
@@ -17,7 +17,7 @@
 /**
  * Base class for testing the interactive installer.
  *
- * @deprecated in Drupal 8.6.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0.
  * Use \Drupal\FunctionalTests\Installer\InstallerTestBase. See
  * https://www.drupal.org/node/2988752
  */
--- a/core/modules/simpletest/src/ContentTypeCreationTrait.php
+++ b/core/modules/simpletest/src/ContentTypeCreationTrait.php
@@ -11,7 +11,7 @@
  *
  * This trait is meant to be used only by test classes.
  *
- * @deprecated in Drupal 8.4.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Tests\node\Traits\ContentTypeCreationTrait instead.
  *
  * @see https://www.drupal.org/node/2884454
--- a/core/modules/simpletest/src/BrowserTestBase.php
+++ b/core/modules/simpletest/src/BrowserTestBase.php
@@ -18,7 +18,7 @@
  * @see \Drupal\simpletest\WebTestBase
  * @see \Drupal\Tests\BrowserTestBase
  *
- * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.
+ * @deprecated in drupal:8.1.0 and is removed from drupal:9.0.0.
  *   Use Drupal\Tests\BrowserTestBase instead.
  */
 abstract class BrowserTestBase extends BaseBrowserTestBase {
--- a/core/modules/simpletest/src/BlockCreationTrait.php
+++ b/core/modules/simpletest/src/BlockCreationTrait.php
@@ -11,7 +11,7 @@
  *
  * This trait is meant to be used only by test classes.
  *
- * @deprecated in Drupal 8.4.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Tests\block\Traits\BlockCreationTrait instead.
  *
  * @see https://www.drupal.org/node/2884454
--- a/core/modules/simpletest/src/AssertHelperTrait.php
+++ b/core/modules/simpletest/src/AssertHelperTrait.php
@@ -9,7 +9,7 @@
 /**
  * Provides helper methods for assertions.
  *
- * @deprecated in Drupal 8.4.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\AssertHelperTrait instead.
  *
  * @see https://www.drupal.org/node/2884454
--- a/core/modules/simpletest/src/AssertContentTrait.php
+++ b/core/modules/simpletest/src/AssertContentTrait.php
@@ -9,7 +9,7 @@
 /**
  * Provides test methods to assert content.
  *
- * @deprecated in Drupal 8.6.0, to be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\KernelTests\AssertContentTrait instead.
  *
  * @see https://www.drupal.org/node/2943146
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -261,7 +261,7 @@
  * @return string
  *   The path to core's phpunit.xml.dist configuration file.
  *
- * @deprecated in Drupal 8.4.x for removal before Drupal 9.0.0. PHPUnit test
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. PHPUnit test
  *   runners should change directory into core/ and then run the phpunit tool.
  *   See simpletest_phpunit_run_command() for an example.
  *
@@ -520,7 +520,7 @@
  *     );
  *   @endcode
  *
- * @deprecated in Drupal 8.3.x, for removal before 9.0.0 release. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  *   \Drupal::service('test_discovery')->getTestClasses($extension, $types)
  *   instead.
  */
@@ -532,7 +532,7 @@
 /**
  * Registers test namespaces of all extensions and core test classes.
  *
- * @deprecated in Drupal 8.3.x for removal before 9.0.0 release. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  *   \Drupal::service('test_discovery')->registerTestNamespaces() instead.
  */
 function simpletest_classloader_register() {
--- a/core/modules/simpletest/simpletest.api.php
+++ b/core/modules/simpletest/simpletest.api.php
@@ -20,7 +20,7 @@
  *   name of the test class, and the value is in associative array containing
  *   'name', 'description', 'group', and 'requires' keys.
  *
- * @deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Convert
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Convert
  *   your test to a PHPUnit-based one and implement test listeners.
  *
  * @see https://www.drupal.org/node/2939892
--- a/core/modules/shortcut/src/Tests/ShortcutTestBase.php
+++ b/core/modules/shortcut/src/Tests/ShortcutTestBase.php
@@ -12,7 +12,7 @@
 /**
  * Defines base class for shortcut test cases.
  *
- * @deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\shortcut\Functional\ShortcutTestBase.
  *
  * @see https://www.drupal.org/node/2906736
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -122,7 +122,7 @@
  * @param $account
  *   A user account that will be assigned to use the set.
  *
- * @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal::entityTypeManager()->getStorage('shortcut_set')->assignUser().
  */
 function shortcut_set_assign_user($shortcut_set, $account) {
@@ -144,7 +144,7 @@
  *   successfully removed from it. FALSE if the user was already not assigned
  *   to any set.
  *
- * @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal::entityTypeManager()->getStorage('shortcut_set')->unassignUser().
  */
 function shortcut_set_unassign_user($account) {
@@ -233,7 +233,7 @@
  * @return
  *   TRUE if a shortcut set with that title exists; FALSE otherwise.
  *
- * @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  */
 function shortcut_set_title_exists($title) {
   $sets = ShortcutSet::loadMultiple();
--- a/core/modules/search/tests/src/Functional/SearchTestBase.php
+++ b/core/modules/search/tests/src/Functional/SearchTestBase.php
@@ -9,7 +9,7 @@
 /**
  * Defines the common search test code.
  *
- * @deprecated in Drupal 8.6.0 and will be removed in Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Tests\BrowserTestBase instead.
  *
  * @see https://www.drupal.org/node/2979950
@@ -48,7 +48,7 @@
    * @param string $form_html_id
    *   (optional) HTML ID of the form, to disambiguate.
    *
-   * @deprecated in Drupal 8.6.x, to be removed before Drupal 9.0.x. Use
+   * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Tests\BrowserTestBase::drupalPostForm() instead.
    *
    * @see https://www.drupal.org/node/2979950
--- a/core/modules/search/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
+++ b/core/modules/search/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
@@ -7,7 +7,7 @@
 /**
  * Generate configuration rankings.
  *
- * @deprecated in Drupal 8.7.x and will be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\search\Plugin\migrate\process\SearchConfigurationRankings instead.
  *
  * @MigrateProcessPlugin(
--- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\taxonomy\Functional\Rest\VocabularyResourceTestBase as VocabularyResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\taxonomy\Functional\Rest\VocabularyResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\views\Functional\Rest\ViewResourceTestBase as ViewResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\views\Functional\Rest\ViewResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/User/UserResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/User/UserResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\user\Functional\Rest\UserResourceTestBase as UserResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\user\Functional\Rest\UserResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Tour/TourResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\tour\Functional\Rest\TourResourceTestBase as TourResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\tour\Functional\Rest\TourResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\taxonomy\Functional\Rest\TermResourceTestBase as TermResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\taxonomy\Functional\Rest\TermResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ShortcutSet/ShortcutSetResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\shortcut\Functional\Rest\ShortcutSetResourceTestBase as ShortcutSetResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\shortcut\Functional\Rest\ShortcutSetResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\shortcut\Functional\Rest\ShortcutResourceTestBase as ShortcutResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\shortcut\Functional\Rest\ShortcutResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\search\Functional\Rest\SearchPageResourceTestBase as SearchPageResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\search\Functional\Rest\SearchPageResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\user\Functional\Rest\RoleResourceTestBase as RoleResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\user\Functional\Rest\RoleResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/RestResourceConfig/RestResourceConfigResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\rest\Functional\Rest\RestResourceConfigResourceTestBase as RestResourceConfigResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\rest\Functional\Rest\RestResourceConfigResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ResponsiveImageStyle/ResponsiveImageStyleResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\responsive_image\Functional\Rest\ResponsiveImageStyleResourceTestBase as ResponsiveImageStyleResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\responsive_image\Functional\Rest\ResponsiveImageStyleResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/RdfMapping/RdfMappingResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\rdf\Functional\Rest\RdfMappingResourceTestBase as RdfMappingResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\rdf\Functional\Rest\RdfMappingResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\node\Functional\Rest\NodeTypeResourceTestBase as NodeTypeResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\node\Functional\Rest\NodeTypeResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\node\Functional\Rest\NodeResourceTestBase as NodeResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\node\Functional\Rest\NodeResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Message/MessageResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\contact\Functional\Rest\MessageResourceTestBase as MessageResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\contact\Functional\Rest\MessageResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\menu_link_content\Functional\Rest\MenuLinkContentResourceTestBase as MenuLinkContentResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\menu_link_content\Functional\Rest\MenuLinkContentResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Menu/MenuResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\system\Functional\Rest\MenuResourceTestBase as MenuResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\system\Functional\Rest\MenuResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/MediaType/MediaTypeResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\media\Functional\Rest\MediaTypeResourceTestBase as MediaTypeResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\media\Functional\Rest\MediaTypeResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\media\Functional\Rest\MediaResourceTestBase as MediaResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\media\Functional\Rest\MediaResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\aggregator\Functional\Rest\ItemResourceTestBase as ItemResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\aggregator\Functional\Rest\ItemResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\image\Functional\Rest\ImageStyleResourceTestBase as ImageStyleResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\image\Functional\Rest\ImageStyleResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\filter\Functional\Rest\FilterFormatResourceTestBase as FilterFormatResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\filter\Functional\Rest\FilterFormatResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/File/FileResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/File/FileResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\file\Functional\Rest\FileResourceTestBase as FileResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\file\Functional\Rest\FileResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\field\Functional\Rest\FieldStorageConfigResourceTestBase as FieldStorageConfigResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\field\Functional\Rest\FieldStorageConfigResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/FieldConfig/FieldConfigResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\field\Functional\Rest\FieldConfigResourceTestBase as FieldConfigResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\field\Functional\Rest\FieldConfigResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Feed/FeedResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\aggregator\Functional\Rest\FeedResourceTestBase as FeedResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\aggregator\Functional\Rest\FeedResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\FunctionalTests\Rest\EntityViewModeResourceTestBase as EntityViewModeResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\FunctionalTests\Rest\EntityViewModeResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\FunctionalTests\Rest\EntityViewDisplayResourceTestBase as EntityViewDisplayResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\FunctionalTests\Rest\EntityViewDisplayResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\entity_test\Functional\Rest\EntityTestLabelResourceTestBase as EntityTestLabelResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\entity_test\Functional\Rest\EntityTestLabelResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\entity_test\Functional\Rest\EntityTestBundleResourceTestBase as EntityTestBundleResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\entity_test\Functional\Rest\EntityTestBundleResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\entity_test\Functional\Rest\EntityTestResourceTestBase as EntityTestResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\entity_test\Functional\Rest\EntityTestResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\FunctionalTests\Rest\EntityFormModeResourceTestBase as EntityFormModeResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\FunctionalTests\Rest\EntityFormModeResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\FunctionalTests\Rest\EntityFormDisplayResourceTestBase as EntityFormDisplayResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\FunctionalTests\Rest\EntityFormDisplayResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\editor\Functional\Rest\EditorResourceTestBase as EditorResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\editor\Functional\Rest\EditorResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\FunctionalTests\Rest\DateFormatResourceTestBase as DateFormatResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\FunctionalTests\Rest\DateFormatResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\language\Functional\Rest\ContentLanguageSettingsResourceTestBase as ContentLanguageSettingsResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\language\Functional\Rest\ContentLanguageSettingsResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\contact\Functional\Rest\ContactFormResourceTestBase as ContactFormResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\contact\Functional\Rest\ContactFormResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\language\Functional\Rest\ConfigurableLanguageResourceTestBase as ConfigurableLanguageResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\language\Functional\Rest\ConfigurableLanguageResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\config_test\Functional\Rest\ConfigTestResourceTestBase as ConfigTestResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\config_test\Functional\Rest\ConfigTestResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\comment\Functional\Rest\CommentTypeResourceTestBase as CommentTypeResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\comment\Functional\Rest\CommentTypeResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\comment\Functional\Rest\CommentResourceTestBase as CommentResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\comment\Functional\Rest\CommentResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\block_content\Functional\Rest\BlockContentTypeResourceTestBase as BlockContentTypeResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\block_content\Functional\Rest\BlockContentTypeResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\block_content\Functional\Rest\BlockContentResourceTestBase as BlockContentResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\block_content\Functional\Rest\BlockContentResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\block\Functional\Rest\BlockResourceTestBase as BlockResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\block\Functional\Rest\BlockResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\FunctionalTests\Rest\BaseFieldOverrideResourceTestBase as BaseFieldOverrideResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\FunctionalTests\Rest\BaseFieldOverrideResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionResourceTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\system\Functional\Rest\ActionResourceTestBase as ActionResourceTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\system\Functional\Rest\ActionResourceTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/rest/src/Tests/RESTTestBase.php
+++ b/core/modules/rest/src/Tests/RESTTestBase.php
@@ -15,7 +15,7 @@
 /**
  * Test helper class that provides a REST client method to send HTTP requests.
  *
- * @deprecated in Drupal 8.3.x-dev and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Tests\rest\Functional\ResourceTestBase and
  *   \Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase
  *   instead. Only retained for contributed module tests that may be using this
--- a/core/modules/rest/src/RequestHandler.php
+++ b/core/modules/rest/src/RequestHandler.php
@@ -317,7 +317,7 @@
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request.
    *
-   * @deprecated in Drupal 8.4.0, will be removed before Drupal 9.0.0. Use the
+   * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use the
    *   argument resolver method instead, see ::createArgumentResolver().
    *
    * @see https://www.drupal.org/node/2894819
--- a/core/modules/rest/src/Plugin/views/display/RestExport.php
+++ b/core/modules/rest/src/Plugin/views/display/RestExport.php
@@ -102,7 +102,7 @@
    *   ['cookie' => 'user', 'basic_auth' => 'basic_auth']
    * @endcode
    *
-   * @deprecated as of 8.4.x, will be removed in before Drupal 9.0.0, see
+   * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. see
    *   https://www.drupal.org/node/2825204.
    *
    * @var string[]
--- a/core/modules/rest/src/LinkManager/TypeLinkManagerInterface.php
+++ b/core/modules/rest/src/LinkManager/TypeLinkManagerInterface.php
@@ -5,7 +5,7 @@
 use Drupal\hal\LinkManager\TypeLinkManagerInterface as MovedTypeLinkManagerInterface;
 
 /**
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This has
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. This has
  *   been moved to the hal module. This exists solely for BC.
  *
  * @see https://www.drupal.org/node/2830467
--- a/core/modules/rest/src/LinkManager/TypeLinkManager.php
+++ b/core/modules/rest/src/LinkManager/TypeLinkManager.php
@@ -5,7 +5,7 @@
 use Drupal\hal\LinkManager\TypeLinkManager as MovedTypeLinkManager;
 
 /**
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This has
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. This has
  *   been moved to the hal module. This exists solely for BC.
  *
  * @see https://www.drupal.org/node/2830467
--- a/core/modules/rest/src/LinkManager/RelationLinkManagerInterface.php
+++ b/core/modules/rest/src/LinkManager/RelationLinkManagerInterface.php
@@ -5,7 +5,7 @@
 use Drupal\hal\LinkManager\RelationLinkManagerInterface as MovedRelationLinkManagerInterface;
 
 /**
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This has
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. This has
  *   been moved to the hal module. This exists solely for BC.
  *
  * @see https://www.drupal.org/node/2830467
--- a/core/modules/rest/src/LinkManager/RelationLinkManager.php
+++ b/core/modules/rest/src/LinkManager/RelationLinkManager.php
@@ -5,7 +5,7 @@
 use Drupal\hal\LinkManager\RelationLinkManager as MovedLinkRelationManager;
 
 /**
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This has
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. This has
  *   been moved to the hal module. This exists solely for BC.
  *
  * @see https://www.drupal.org/node/2830467
--- a/core/modules/rest/src/LinkManager/LinkManagerInterface.php
+++ b/core/modules/rest/src/LinkManager/LinkManagerInterface.php
@@ -5,7 +5,7 @@
 use Drupal\hal\LinkManager\LinkManagerInterface as MovedLinkManagerInterface;
 
 /**
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This has
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. This has
  *   been moved to the hal module. This exists solely for BC.
  *
  * @see https://www.drupal.org/node/2830467
--- a/core/modules/rest/src/LinkManager/LinkManagerBase.php
+++ b/core/modules/rest/src/LinkManager/LinkManagerBase.php
@@ -5,7 +5,7 @@
 use Drupal\hal\LinkManager\LinkManagerBase as MovedLinkManagerBase;
 
 /**
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This has
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. This has
  *   been moved to the hal module. This exists solely for BC.
  *
  * @see https://www.drupal.org/node/2830467
--- a/core/modules/rest/src/LinkManager/LinkManager.php
+++ b/core/modules/rest/src/LinkManager/LinkManager.php
@@ -5,7 +5,7 @@
 use Drupal\hal\LinkManager\LinkManager as MovedLinkManager;
 
 /**
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This has
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. This has
  *   been moved to the hal module. This exists solely for BC.
  *
  * @see https://www.drupal.org/node/2830467
--- a/core/modules/rest/src/LinkManager/ConfigurableLinkManagerInterface.php
+++ b/core/modules/rest/src/LinkManager/ConfigurableLinkManagerInterface.php
@@ -5,7 +5,7 @@
 use Drupal\hal\LinkManager\ConfigurableLinkManagerInterface as MovedConfigurableLinkManagerInterface;
 
 /**
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This has
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. This has
  *   been moved to the hal module. This exists solely for BC.
  *
  * @see https://www.drupal.org/node/2830467
--- a/core/modules/rest/rest.api.php
+++ b/core/modules/rest/rest.api.php
@@ -31,7 +31,7 @@
 /**
  * Alter the REST type URI.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  *   hook_serialization_type_uri_alter() instead. This exists solely for BC.
  *
  * @see https://www.drupal.org/node/2830467
@@ -59,7 +59,7 @@
 /**
  * Alter the REST relation URI.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  *   hook_serialization_relation_uri_alter() instead. This exists solely for BC.
  *
  * @see https://www.drupal.org/node/2830467
--- a/core/modules/responsive_image/responsive_image.module
+++ b/core/modules/responsive_image/responsive_image.module
@@ -18,7 +18,7 @@
 /**
  * The machine name for the empty image breakpoint image style option.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  *   Drupal\responsive_image\ResponsiveImageStyleInterface::EMPTY_IMAGE
  *   instead.
  *
@@ -29,7 +29,7 @@
 /**
  * The machine name for the original image breakpoint image style option.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\responsive_image\ResponsiveImageStyleInterface::ORIGINAL_IMAGE
  *   instead.
  *
@@ -256,7 +256,7 @@
  * @return \Drupal\Core\Template\Attribute[]
  *   An array of attributes for the source tag.
  *
- * @deprecated in Drupal 8.3.x and will be removed before 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  */
 function responsive_image_build_source_attributes(ImageInterface $image, array $variables, BreakpointInterface $breakpoint, array $multipliers) {
   return _responsive_image_build_source_attributes($variables, $breakpoint, $multipliers);
--- a/core/modules/quickedit/tests/modules/src/MockEditEntityFieldAccessCheck.php
+++ b/core/modules/quickedit/tests/modules/src/MockEditEntityFieldAccessCheck.php
@@ -3,7 +3,7 @@
 namespace Drupal\quickedit_test;
 
 /**
- * @deprecated in Drupal 8.4.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  */
 class MockEditEntityFieldAccessCheck extends MockQuickEditEntityFieldAccessCheck {
 
--- a/core/modules/quickedit/src/Access/EditEntityFieldAccessCheckInterface.php
+++ b/core/modules/quickedit/src/Access/EditEntityFieldAccessCheckInterface.php
@@ -3,7 +3,7 @@
 namespace Drupal\quickedit\Access;
 
 /**
- * @deprecated in Drupal 8.4.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  */
 interface EditEntityFieldAccessCheckInterface extends QuickEditEntityFieldAccessCheckInterface {
 
--- a/core/modules/quickedit/src/Access/EditEntityFieldAccessCheck.php
+++ b/core/modules/quickedit/src/Access/EditEntityFieldAccessCheck.php
@@ -3,7 +3,7 @@
 namespace Drupal\quickedit\Access;
 
 /**
- * @deprecated in Drupal 8.4.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  */
 class EditEntityFieldAccessCheck extends QuickEditEntityFieldAccessCheck {
 
--- a/core/modules/quickedit/quickedit.module
+++ b/core/modules/quickedit/quickedit.module
@@ -179,7 +179,7 @@
  * @return bool
  *   TRUE if the loaded entity is the latest revision, FALSE otherwise.
  *
- * @deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Entity\RevisionableInterface::isLatestRevision() instead.
  *   As internal API, _quickedit_entity_is_latest_revision() may also be removed
  *   in a minor release.
--- a/core/modules/node/src/Plugin/views/field/Path.php
+++ b/core/modules/node/src/Plugin/views/field/Path.php
@@ -18,7 +18,7 @@
  *
  * @ViewsField("node_path")
  *
- * @deprecated in Drupal 8.5.x, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *  Use @ViewsField("entity_link") with 'output_url_as_text' set.
  */
 class Path extends FieldPluginBase {
--- a/core/modules/node/src/Plugin/migrate/source/d6/Node.php
+++ b/core/modules/node/src/Plugin/migrate/source/d6/Node.php
@@ -295,7 +295,7 @@
   /**
    * Retrieves raw field data for a node.
    *
-   * @deprecated in Drupal 8.2.x, to be removed in Drupal 9.0.x. Use
+   * @deprecated in drupal:8.2.0 and is removed from drupal:9.0.0. Use
    *   getFieldData() instead.
    *
    * @param array $field
--- a/core/modules/node/src/Plugin/Action/UnpublishNode.php
+++ b/core/modules/node/src/Plugin/Action/UnpublishNode.php
@@ -8,7 +8,7 @@
 /**
  * Unpublishes a node.
  *
- * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Action\Plugin\Action\UnpublishAction instead.
  *
  * @see \Drupal\Core\Action\Plugin\Action\UnpublishAction
--- a/core/modules/node/src/Plugin/Action/SaveNode.php
+++ b/core/modules/node/src/Plugin/Action/SaveNode.php
@@ -9,7 +9,7 @@
 /**
  * Provides an action that can save any entity.
  *
- * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Action\Plugin\Action\SaveAction instead.
  *
  * @see \Drupal\Core\Action\Plugin\Action\SaveAction
--- a/core/modules/node/src/Plugin/Action/PublishNode.php
+++ b/core/modules/node/src/Plugin/Action/PublishNode.php
@@ -8,7 +8,7 @@
 /**
  * Publishes a node.
  *
- * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Action\Plugin\Action\PublishAction instead.
  *
  * @see \Drupal\Core\Action\Plugin\Action\PublishAction
--- a/core/modules/node/src/Plugin/Action/DeleteNode.php
+++ b/core/modules/node/src/Plugin/Action/DeleteNode.php
@@ -10,7 +10,7 @@
 /**
  * Redirects to a node deletion form.
  *
- * @deprecated in Drupal 8.6.x, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Action\Plugin\Action\DeleteAction instead.
  *
  * @see \Drupal\Core\Action\Plugin\Action\DeleteAction
--- a/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/NodeForm.php
@@ -223,7 +223,7 @@
    *
    * @see \Drupal\node\NodeForm::form()
    *
-   * @deprecated in Drupal 8.4.x, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
    *   The "Publish" button was removed.
    */
   public function updateStatus($entity_type_id, NodeInterface $node, array $form, FormStateInterface $form_state) {
--- a/core/modules/node/src/NodeAccessControlHandlerInterface.php
+++ b/core/modules/node/src/NodeAccessControlHandlerInterface.php
@@ -44,7 +44,7 @@
    *   purposes, and assumes the caller has already performed a mass delete of
    *   some form. Defaults to TRUE.
    *
-   * @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\node\NodeAccessControlHandlerInterface::acquireGrants().
    */
   public function writeGrants(NodeInterface $node, $delete = TRUE);
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -272,7 +272,7 @@
  * @return \Drupal\node\NodeTypeInterface[]
  *   An array of node type entities, keyed by ID.
  *
- * @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\node\Entity\NodeType::loadMultiple().
  *
  * @see \Drupal\node\Entity\NodeType::load()
@@ -334,7 +334,7 @@
  * @return \Drupal\node\NodeTypeInterface
  *   A node type object or NULL if $name does not exist.
  *
- * @deprecated iin Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\node\Entity\NodeType::load().
  *
  * @see https://www.drupal.org/node/2266845
@@ -451,7 +451,7 @@
  * @return \Drupal\node\NodeInterface[]
  *   An array of node entities indexed by nid.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\node\Entity\Node::loadMultiple().
  *
  * @see https://www.drupal.org/node/2266845
@@ -476,7 +476,7 @@
  * @return \Drupal\node\NodeInterface|null
  *   A fully-populated node entity, or NULL if the node is not found.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\node\Entity\Node::load().
  *
  * @see https://www.drupal.org/node/2266845
@@ -858,7 +858,7 @@
  * @return array
  *   An array as expected by \Drupal\Core\Render\RendererInterface::render().
  *
- * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal::entityTypeManager()->getViewBuilder('node')->view() instead.
  *
  * @see https://www.drupal.org/node/3033656
@@ -885,7 +885,7 @@
  *   An array in the format expected by
  *   \Drupal\Core\Render\RendererInterface::render().
  *
- * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal::entityTypeManager()->getViewBuilder('node')->viewMultiple()
  *   instead.
  *
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/i18nVariable.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/i18nVariable.php
@@ -12,7 +12,7 @@
  *   source_module = "system",
  * )
  *
- * @deprecated in Drupal 8.4.x and will be removed in Drupal 9.0.x. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  * \Drupal\migrate_drupal\Plugin\migrate\source\d6\VariableTranslation instead.
  *
  * @see https://www.drupal.org/node/2898649
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/D6VariableTranslation.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/D6VariableTranslation.php
@@ -9,7 +9,7 @@
 /**
  * Gets Drupal i18n_variable source from database.
  *
- * @deprecated in Drupal 8.7.x and will be removed in Drupal 9.0.x.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  * Use \Drupal\migrate_drupal\Plugin\migrate\source\d6\VariableTranslation.
  *
  * @see https://www.drupal.org/node/3006487
--- a/core/modules/migrate_drupal/src/Plugin/migrate/field/FieldPluginBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/field/FieldPluginBase.php
@@ -22,7 +22,7 @@
   /**
    * Alters the migration for field definitions.
    *
-   * @deprecated in Drupal 8.6.0, to be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
    *   alterFieldMigration() instead.
    *
    * @see https://www.drupal.org/node/2944598
@@ -44,7 +44,7 @@
   /**
    * Alert field instance migration.
    *
-   * @deprecated in Drupal 8.6.0, to be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
    *   alterFieldInstanceMigration() instead.
    *
    * @see https://www.drupal.org/node/2944598
@@ -65,7 +65,7 @@
   /**
    * Alter field widget migration.
    *
-   * @deprecated in Drupal 8.6.0, to be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
    *   alterFieldWidgetMigration() instead.
    *
    * @see https://www.drupal.org/node/2944598
@@ -121,7 +121,7 @@
   /**
    * Alter field formatter migration.
    *
-   * @deprecated in Drupal 8.6.0, to be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
    *   alterFieldFormatterMigration() instead.
    *
    * @see https://www.drupal.org/node/2944598
@@ -150,7 +150,7 @@
   /**
    * Defines the process pipeline for field values.
    *
-   * @deprecated in Drupal 8.6.0, to be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
    *   defineValueProcessPipeline() instead.
    *
    * @see https://www.drupal.org/node/2944598
--- a/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
@@ -17,7 +17,7 @@
  *   id = "md_entity:field_storage_config"
  * )
  *
- * @deprecated in Drupal 8.2.x and will be removed in Drupal 9.0.x. Use
+ * @deprecated in drupal:8.2.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\migrate\Plugin\migrate\destination\EntityFieldStorageConfig
  *   instead.
  *
--- a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
@@ -11,7 +11,7 @@
 /**
  * The base class for all field plugins.
  *
- * @deprecated in Drupal 8.4.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  * \Drupal\migrate_drupal\Plugin\migrate\field\FieldPluginBase instead.
  *
  * @see https://www.drupal.org/node/2751897
--- a/core/modules/migrate_drupal/src/Plugin/migrate/FieldMigration.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/FieldMigration.php
@@ -23,7 +23,7 @@
    * fallback to the old 'cck_plugin_method'.
    *
    * @const string
-   * @deprecated This constant is deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Use the migrate_drupal.field_discovery service instead. See https://www.drupal.org/node/3006076.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use the migrate_drupal.field_discovery service instead. See https://www.drupal.org/node/3006076.
    */
   const PLUGIN_METHOD = 'field_plugin_method';
 
--- a/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php
@@ -7,7 +7,7 @@
 /**
  * Migration plugin class for migrations dealing with CCK field values.
  *
- * @deprecated in Drupal 8.3.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  * \Drupal\migrate_drupal\Plugin\migrate\FieldMigration instead.
  *
  * @see https://www.drupal.org/node/2751897
--- a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManagerInterface.php
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManagerInterface.php
@@ -7,7 +7,7 @@
 /**
  * Provides an interface for cck field plugin manager.
  *
- * @deprecated in Drupal 8.3.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\migrate_drupal\Plugin\MigrateFieldPluginManagerInterface instead.
  *
  * @see https://www.drupal.org/node/2751897
--- a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php
@@ -7,7 +7,7 @@
 /**
  * Deprecated: Plugin manager for migrate field plugins.
  *
- * @deprecated in Drupal 8.3.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\migrate_drupal\Plugin\MigrateFieldPluginManager instead.
  *
  * @see https://www.drupal.org/node/2751897
--- a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
@@ -9,7 +9,7 @@
 /**
  * Provides an interface for all CCK field type plugins.
  *
- * @deprecated in Drupal 8.3.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\migrate_drupal\Annotation\MigrateField instead.
  *
  * @see https://www.drupal.org/node/2751897
--- a/core/modules/migrate_drupal/src/MigrationCreationTrait.php
+++ b/core/modules/migrate_drupal/src/MigrationCreationTrait.php
@@ -3,7 +3,7 @@
 namespace Drupal\migrate_drupal;
 
 /**
- * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.1.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\migrate_drupal\MigrationConfigurationTrait instead.
  *
  * @see https://www.drupal.org/node/2873794
--- a/core/modules/migrate_drupal/src/Annotation/MigrateCckField.php
+++ b/core/modules/migrate_drupal/src/Annotation/MigrateCckField.php
@@ -7,7 +7,7 @@
 /**
  * Deprecated: Defines a cckfield plugin annotation object.
  *
- * @deprecated in Drupal 8.3.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  * \Drupal\migrate_drupal\Annotation\MigrateField instead.
  *
  * Plugin Namespace: Plugin\migrate\cckfield
--- a/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php
@@ -11,7 +11,7 @@
 /**
  * Base class for Migrate module source unit tests.
  *
- * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.2.0 and is removed from drupal:9.0.0. Use
  * \Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase instead.
  */
 abstract class MigrateSqlSourceTestCase extends MigrateTestCase {
--- a/core/modules/migrate/tests/src/Kernel/NodeCommentCombinationTrait.php
+++ b/core/modules/migrate/tests/src/Kernel/NodeCommentCombinationTrait.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\migrate\Kernel;
 
 /**
- * @deprecated in Drupal 8.7.x, will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase::migrateFields()
  *   instead.
  */
--- a/core/modules/migrate/src/Plugin/migrate/process/Migration.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/Migration.php
@@ -13,7 +13,7 @@
  *   id = "migration"
  * )
  *
- * @deprecated in Drupal 8.3.x and will be removed in Drupal 9.0.x.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *  Use \Drupal\migrate\Plugin\migrate\process\MigrationLookup instead.
  */
 class Migration extends MigrationLookup {}
--- a/core/modules/migrate/src/Plugin/migrate/process/Iterator.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/Iterator.php
@@ -7,7 +7,7 @@
 /**
  * Iterates and processes an associative array.
  *
- * @deprecated in Drupal 8.4.x and will be removed in Drupal 9.0.x. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\migrate\Plugin\migrate\process\SubProcess instead.
  *
  * @see https://www.drupal.org/node/2880427
--- a/core/modules/migrate/src/Plugin/migrate/process/DedupeEntity.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/DedupeEntity.php
@@ -17,7 +17,7 @@
  *   id = "dedupe_entity"
  * )
  *
- * @deprecated in Drupal 8.4.x and will be removed in Drupal 9.0.x. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\migrate\Plugin\migrate\process\MakeUniqueEntityField instead.
  *
  * @see https://www.drupal.org/node/2873762
--- a/core/modules/migrate/src/Plugin/migrate/process/DedupeBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/DedupeBase.php
@@ -15,7 +15,7 @@
  *
  * @link https://www.drupal.org/node/2345929 Online handbook documentation for dedupebase process plugin @endlink
  *
- * @deprecated in Drupal 8.4.x and will be removed in Drupal 9.0.x. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\migrate\Plugin\migrate\process\MakeUniqueBase instead.
  *
  * @see https://www.drupal.org/node/2873762
--- a/core/modules/migrate/src/Plugin/Migration.php
+++ b/core/modules/migrate/src/Plugin/Migration.php
@@ -321,7 +321,7 @@
    * @return mixed
    *   The value for that property, or NULL if the property does not exist.
    *
-   * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.x. Use
+   * @deprecated in drupal:8.1.0 and is removed from drupal:9.0.0. Use
    *   more specific getters instead.
    *
    * @see https://www.drupal.org/node/2873795
--- a/core/modules/migrate/src/Plugin/MigrateIdMapInterface.php
+++ b/core/modules/migrate/src/Plugin/MigrateIdMapInterface.php
@@ -236,7 +236,7 @@
    * @return array
    *   The destination identifier values of the record, or empty on failure.
    *
-   * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.x. Use
+   * @deprecated in drupal:8.1.0 and is removed from drupal:9.0.0. Use
    *   lookupDestinationIds() instead.
    *
    * @see https://www.drupal.org/node/2725809
--- a/core/modules/menu_ui/src/Tests/MenuWebTestBase.php
+++ b/core/modules/menu_ui/src/Tests/MenuWebTestBase.php
@@ -9,7 +9,7 @@
 /**
  * Base class for menu web tests.
  *
- * @deprecated in Drupal 8.5.x, will be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Tests\menu_ui\Traits\MenuUiTrait methods, instead.
  *
  * @see https://www.drupal.org/node/2917910
--- a/core/modules/menu_ui/menu_ui.module
+++ b/core/modules/menu_ui/menu_ui.module
@@ -24,7 +24,7 @@
 /**
  * Maximum length of menu name as entered by the user.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Config\Entity\ConfigEntityStorage::MAX_ID_LENGTH because the
  *   menu name is a configuration entity ID.
  *
--- a/core/modules/menu_link_content/src/Plugin/migrate/process/d7/InternalUri.php
+++ b/core/modules/menu_link_content/src/Plugin/migrate/process/d7/InternalUri.php
@@ -7,7 +7,7 @@
 /**
  * Processes an internal uri into an 'internal:' or 'entity:' URI.
  *
- * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.2.0 and is removed from drupal:9.0.0. Use
  * \Drupal\menu_link_content\Plugin\migrate\process\LinkUri instead.
  *
  * @see https://www.drupal.org/node/2761389
--- a/core/modules/menu_link_content/src/Plugin/migrate/process/d6/LinkUri.php
+++ b/core/modules/menu_link_content/src/Plugin/migrate/process/d6/LinkUri.php
@@ -7,7 +7,7 @@
 /**
  * Processes a link path into an 'internal:' or 'entity:' URI.
  *
- * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.2.0 and is removed from drupal:9.0.0. Use
  * \Drupal\menu_link_content\Plugin\migrate\process\LinkUri instead.
  *
  * @see https://www.drupal.org/node/2761389
--- a/core/modules/media/tests/src/Functional/MediaFunctionalTestCreateMediaTypeTrait.php
+++ b/core/modules/media/tests/src/Functional/MediaFunctionalTestCreateMediaTypeTrait.php
@@ -9,7 +9,7 @@
 /**
  * Trait with helpers for Media functional tests.
  *
- * @deprecated in Drupal 8.6.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Tests\media\Traits\MediaTypeCreationTrait instead.
  *
  * @see https://www.drupal.org/node/2981614
--- a/core/modules/media/src/Form/MediaDeleteMultipleConfirmForm.php
+++ b/core/modules/media/src/Form/MediaDeleteMultipleConfirmForm.php
@@ -13,7 +13,7 @@
 /**
  * Provides a confirmation form to delete multiple media items at once.
  *
- * @deprecated in Drupal 8.6.x, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0.
  *   This route is not used in Drupal core. As an internal API, it may also be
  *   removed in a minor release. If you are using it, copy the class
  *   and the related "entity.media.multiple_delete_confirm" route to your
--- a/core/modules/locale/locale.pages.inc
+++ b/core/modules/locale/locale.pages.inc
@@ -14,7 +14,7 @@
  *
  * Manually checks the translation status without the use of cron.
  *
- * @deprecated in Drupal 8.5.0 and will be removed before 9.0.0. It is unused by
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0. It is unused by
  *   Drupal core. Duplicate this function in your own extension if you need its
  *   behavior.
  *
--- a/core/modules/link/src/Plugin/migrate/process/d6/FieldLink.php
+++ b/core/modules/link/src/Plugin/migrate/process/d6/FieldLink.php
@@ -11,7 +11,7 @@
  *   id = "d6_field_link"
  * )
  *
- * @deprecated in Drupal 8.4.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  * \Drupal\link\Plugin\migrate\process\FieldLink instead.
  */
 class FieldLink extends GeneralPurposeFieldLink {}
--- a/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php
+++ b/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php
@@ -11,7 +11,7 @@
  *   id = "d6_cck_link"
  * )
  *
- * @deprecated in Drupal 8.3.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  * \Drupal\link\Plugin\migrate\process\FieldLink instead.
  */
 class CckLink extends FieldLink {}
--- a/core/modules/link/src/Plugin/migrate/cckfield/d7/LinkField.php
+++ b/core/modules/link/src/Plugin/migrate/cckfield/d7/LinkField.php
@@ -22,7 +22,7 @@
  * plugin with the exception that the plugin ID "link_field" is used in the
  * field type map.
  *
- * @deprecated in Drupal 8.3.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  * \Drupal\link\Plugin\migrate\field\d7\LinkField instead.
  *
  * @see https://www.drupal.org/node/2751897
--- a/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php
+++ b/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php
@@ -18,7 +18,7 @@
  *   destination_module = "link"
  * )
  *
- * @deprecated in Drupal 8.3.x and will be removed in Drupal 9.0.x. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  * \Drupal\link\Plugin\migrate\field\d6\LinkField instead.
  *
  * @see https://www.drupal.org/node/2751897
--- a/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockTestBase.php
+++ b/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockTestBase.php
@@ -180,7 +180,7 @@
    * @param int $timeout
    *   (optional) Timeout in milliseconds, defaults to 10000.
    *
-   * @deprecated in Drupal 8.8.x, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
    *   Drupal\FunctionalJavascriptTests\JSWebAssert::assertNoElementAfterWait()
    */
   protected function waitForNoElement($selector, $timeout = 10000) {
--- a/core/modules/layout_builder/src/SectionStorageInterface.php
+++ b/core/modules/layout_builder/src/SectionStorageInterface.php
@@ -47,7 +47,7 @@
    * @internal
    *   This should only be called during section storage instantiation.
    *
-   * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. The
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. The
    *   section list should be derived from context. See
    *   https://www.drupal.org/node/3016262.
    */
@@ -105,7 +105,7 @@
    * @internal
    *   This should only be called during section storage instantiation.
    *
-   * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
    *   \Drupal\layout_builder\SectionStorageInterface::deriveContextsFromRoute()
    *   should be used instead. See https://www.drupal.org/node/3016262.
    */
--- a/core/modules/layout_builder/src/SectionStorage/SectionStorageManagerInterface.php
+++ b/core/modules/layout_builder/src/SectionStorage/SectionStorageManagerInterface.php
@@ -73,7 +73,7 @@
    * @throws \InvalidArgumentException
    *   Thrown if the ID is invalid.
    *
-   * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
    *   \Drupal\layout_builder\SectionStorage\SectionStorageManagerInterface::load()
    *   should be used instead. See https://www.drupal.org/node/3012353.
    */
@@ -98,7 +98,7 @@
    *
    * @see \Drupal\Core\ParamConverter\ParamConverterInterface::convert()
    *
-   * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
    *   \Drupal\layout_builder\SectionStorageInterface::deriveContextsFromRoute()
    *   and \Drupal\layout_builder\SectionStorage\SectionStorageManagerInterface::load()
    *   should be used instead. See https://www.drupal.org/node/3012353.
--- a/core/modules/layout_builder/src/Plugin/SectionStorage/SectionStorageBase.php
+++ b/core/modules/layout_builder/src/Plugin/SectionStorage/SectionStorageBase.php
@@ -30,7 +30,7 @@
    *
    * @throws \Exception
    *
-   * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. This
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. This
    *   method should no longer be used. The section list should be derived from
    *   context. See https://www.drupal.org/node/3016262.
    */
--- a/core/modules/layout_builder/src/LayoutEntityHelperTrait.php
+++ b/core/modules/layout_builder/src/LayoutEntityHelperTrait.php
@@ -133,7 +133,7 @@
    * @return bool
    *   TRUE if the entity is using a field for a layout override.
    *
-   * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
    *   To determine if an entity has a layout override, use
    *   \Drupal\layout_builder\LayoutEntityHelperTrait::getSectionStorageForEntity()
    *   and check whether the result is an instance of
--- a/core/modules/layout_builder/src/Entity/LayoutBuilderEntityViewDisplay.php
+++ b/core/modules/layout_builder/src/Entity/LayoutBuilderEntityViewDisplay.php
@@ -350,7 +350,7 @@
    * @return \Drupal\layout_builder\Section[]
    *   The sections.
    *
-   * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
    *   \Drupal\layout_builder\SectionStorage\SectionStorageManagerInterface::findByContext()
    *   should be used instead. See https://www.drupal.org/node/3022574.
    */
--- a/core/modules/language/src/Config/LanguageConfigFactoryOverrideInterface.php
+++ b/core/modules/language/src/Config/LanguageConfigFactoryOverrideInterface.php
@@ -37,7 +37,7 @@
    *
    * @return $this
    *
-   * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This
+   * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. This
    *   method has been replaced by injecting the default language into the
    *   constructor.
    */
--- a/core/modules/image/src/Plugin/migrate/cckfield/d7/ImageField.php
+++ b/core/modules/image/src/Plugin/migrate/cckfield/d7/ImageField.php
@@ -15,7 +15,7 @@
  *   destination_module = "file"
  * )
  *
- * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0. Use
  * \Drupal\image\Plugin\migrate\field\d7\ImageField instead.
  *
  * @see https://www.drupal.org/node/2751897
--- a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
+++ b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
@@ -504,7 +504,7 @@
    *
    * @return \Drupal\Core\Entity\EntityManagerInterface
    *
-   * @deprecated in drupal:8.8.0 and is removed in drupal:9.0.0. Use
+   * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
    *   \Drupal::entityTypeManager() instead in most cases. If the needed method
    *   is not on \Drupal\Core\Entity\EntityTypeManagerInterface, see the
    *   deprecated \Drupal\Core\Entity\EntityManager to find the correct
--- a/core/modules/image/src/ImageStyleInterface.php
+++ b/core/modules/image/src/ImageStyleInterface.php
@@ -16,7 +16,7 @@
    *   The replacement image style ID or NULL if no replacement has been
    *   selected.
    *
-   * @deprecated in Drupal 8.0.x, will be removed before Drupal 9.0.x. Use
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\image\ImageStyleStorageInterface::getReplacementId() instead.
    *
    * @see \Drupal\image\ImageStyleStorageInterface::getReplacementId()
--- a/core/modules/image/src/Entity/ImageStyle.php
+++ b/core/modules/image/src/Entity/ImageStyle.php
@@ -517,7 +517,7 @@
    *   A string containing the name of the scheme, or FALSE if none. For
    *   example, the URI "public://example.txt" would return "public".
    *
-   * @deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. Use
+   * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Core\StreamWrapper\StreamWrapperManager::getTarget() instead.
    *
    * @see https://www.drupal.org/node/3035273
@@ -540,7 +540,7 @@
    *   For example, the URI "public://sample/test.txt" would return
    *   "sample/test.txt".
    *
-   * @deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. Use
+   * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Core\StreamWrapper\StreamWrapperManager::getUriTarget() instead.
    *
    * @see https://www.drupal.org/node/3035273
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -18,7 +18,7 @@
 /**
  * Image style constant for user presets in the database.
  *
- * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.1.0 and is removed from drupal:9.0.0.
  *
  * @see https://www.drupal.org/node/1820974
  */
@@ -27,7 +27,7 @@
 /**
  * Image style constant for user presets that override module-defined presets.
  *
- * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.1.0 and is removed from drupal:9.0.0.
  *
  * @see https://www.drupal.org/node/1820974
  */
@@ -36,7 +36,7 @@
 /**
  * Image style constant for module-defined presets in code.
  *
- * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.1.0 and is removed from drupal:9.0.0.
  *
  * @see https://www.drupal.org/node/1820974
  */
@@ -45,7 +45,7 @@
 /**
  * Image style constant to represent an editable preset.
  *
- * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.1.0 and is removed from drupal:9.0.0.
  *
  * @see https://www.drupal.org/node/1820974
  */
@@ -54,7 +54,7 @@
 /**
  * Image style constant to represent any module-based preset.
  *
- * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.1.0 and is removed from drupal:9.0.0.
  *
  * @see https://www.drupal.org/node/1820974
  */
--- a/core/modules/history/history.module
+++ b/core/modules/history/history.module
@@ -190,7 +190,7 @@
  * @return array
  *   A renderable array containing the last read timestamp.
  *
- * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\history\HistoryRenderCallback::lazyBuilder() instead.
  *
  * @see https://www.drupal.org/node/2966725
--- a/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonTestBase.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\aggregator\Functional\Hal\ItemHalJsonTestBase as ItemHalJsonTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\aggregator\Functional\Hal\ItemHalJsonTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/hal/tests/src/Functional/EntityResource/File/FileUploadHalJsonTestBase.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/File/FileUploadHalJsonTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\file\Functional\Hal\FileUploadHalJsonTestBase as FileUploadHalJsonTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\file\Functional\Hal\FileUploadHalJsonTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonTestBase.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\aggregator\Functional\Hal\FeedHalJsonTestBase as FeedHalJsonTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\aggregator\Functional\Hal\FeedHalJsonTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonTestBase.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonTestBase.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\comment\Functional\Hal\CommentHalJsonTestBase as CommentHalJsonTestBaseReal;
 
 /**
- * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\comment\Functional\Hal\CommentHalJsonTestBase instead.
  *
  * @see https://www.drupal.org/node/2971931
--- a/core/modules/hal/src/Normalizer/FileEntityNormalizer.php
+++ b/core/modules/hal/src/Normalizer/FileEntityNormalizer.php
@@ -14,7 +14,7 @@
 /**
  * Converts the Drupal entity object structure to a HAL array structure.
  *
- * @deprecated in Drupal 8.5.0, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  */
 class FileEntityNormalizer extends ContentEntityNormalizer {
 
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -307,7 +307,7 @@
 /**
  * Render API callback: Hides the field value of 'text_format' elements.
  *
- * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\filter\Element\TextFormat::accessDeniedCallback() instead.
  *
  * @see https://www.drupal.org/node/2966725
--- a/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php
+++ b/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php
@@ -9,7 +9,7 @@
  *   id = "d6_cck_file"
  * )
  *
- *  @deprecated in Drupal 8.3.x, to be removed before Drupal 9.0.x. Use
+ *  @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  * \Drupal\file\Plugin\migrate\process\d6\FieldFile instead.
  *
  * @see https://www.drupal.org/node/2751897
--- a/core/modules/file/src/Plugin/migrate/field/d7/ImageField.php
+++ b/core/modules/file/src/Plugin/migrate/field/d7/ImageField.php
@@ -9,7 +9,7 @@
 /**
  * Field plugin for image fields.
  *
- * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0. Use
  * \Drupal\image\Plugin\migrate\field\d7\ImageField instead.
  *
  * @see https://www.drupal.org/node/2936061
--- a/core/modules/file/src/Plugin/migrate/field/d6/ImageField.php
+++ b/core/modules/file/src/Plugin/migrate/field/d6/ImageField.php
@@ -9,7 +9,7 @@
 /**
  * Field plugin for image fields.
  *
- * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0. Use
  * \Drupal\image\Plugin\migrate\field\d6\ImageField instead.
  *
  * @see https://www.drupal.org/node/2936061
--- a/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
+++ b/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
@@ -9,7 +9,7 @@
 /**
  * CCK plugin for image fields.
  *
- * @deprecated in Drupal 8.3.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  * \Drupal\image\Plugin\migrate\field\d7\ImageField instead.
  *
  * @see https://www.drupal.org/node/2936061
--- a/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php
+++ b/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php
@@ -16,7 +16,7 @@
  *   destination_module = "file"
  * )
  *
- * @deprecated in Drupal 8.3.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  * \Drupal\file\Plugin\migrate\field\d7\FileField instead.
  *
  * @see https://www.drupal.org/node/2751897
--- a/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php
+++ b/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php
@@ -16,7 +16,7 @@
  *   destination_module = "file"
  * )
  *
- *  @deprecated in Drupal 8.3.x, to be removed before Drupal 9.0.x. Use
+ *  @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  * \Drupal\file\Plugin\migrate\field\d6\FileField instead.
  *
  * @see https://www.drupal.org/node/2751897
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -81,7 +81,7 @@
  * @return array
  *   An array of file entities, indexed by fid.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\file\Entity\File::loadMultiple().
  *
  * @see https://www.drupal.org/node/2266845
@@ -106,7 +106,7 @@
  * @return \Drupal\file\FileInterface|null
  *   A file entity or NULL if the file was not found.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\file\Entity\File::load().
  *
  * @see https://www.drupal.org/node/2266845
@@ -788,7 +788,7 @@
  *   array element contains the file entity if the upload succeeded or FALSE if
  *   there was an error. Function returns NULL if no file was uploaded.
  *
- * @deprecated in Drupal 8.4.x, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   For backwards compatibility use core file upload widgets in forms.
  *
  * @internal
--- a/core/modules/field_ui/src/Tests/FieldUiTestTrait.php
+++ b/core/modules/field_ui/src/Tests/FieldUiTestTrait.php
@@ -7,7 +7,7 @@
 /**
  * Provides common functionality for the Field UI test classes.
  *
- * @deprecated in Drupal 8.7.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\field_ui\Traits\FieldUiTestTrait. See
  *   https://www.drupal.org/node/3001664
  */
--- a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
+++ b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
@@ -737,7 +737,7 @@
    * @see \Drupal\Core\Render\RendererInterface::render()
    * @see \Drupal\Core\Render\Element\Table::preRenderTable()
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    */
   public function tablePreRender($elements) {
     return FieldUiTable::tablePreRender($elements);
@@ -749,7 +749,7 @@
    * Callback for array_reduce() within
    * \Drupal\field_ui\Form\EntityDisplayFormBase::tablePreRender().
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    */
   public function reduceOrder($array, $a) {
     return FieldUiTable::reduceOrder($array, $a);
--- a/core/modules/field/src/Tests/Views/FieldTestBase.php
+++ b/core/modules/field/src/Tests/Views/FieldTestBase.php
@@ -20,7 +20,7 @@
  *   - Use relationships between different entity types, for example node and
  *     the node author(user).
  *
- * @deprecated in Drupal 8.6.0. Will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  * \Drupal\Tests\field\Functional\Views\FieldTestBase instead.
  *
  * @see https://www.drupal.org/node/2989020
--- a/core/modules/field/src/Tests/EntityReference/EntityReferenceTestTrait.php
+++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceTestTrait.php
@@ -9,7 +9,7 @@
 /**
  * Provides common functionality for the EntityReference test classes.
  *
- * @deprecated in Drupal 8.6.2 for removal before 9.0.0. Use
+ * @deprecated in drupal:8.6.2 and is removed from drupal:9.0.0. Use
  *   Drupal\Tests\field\Traits\EntityReferenceTestTrait instead.
  *
  * @see https://www.drupal.org/node/2998888
--- a/core/modules/field/src/Plugin/migrate/process/FieldTypeDefaults.php
+++ b/core/modules/field/src/Plugin/migrate/process/FieldTypeDefaults.php
@@ -13,7 +13,7 @@
  *   id = "field_type_defaults"
  * )
  *
- * @deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.x.
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0.
  * Use d6_field_type_defaults or d7_field_type_defaults instead.
  *
  * @see https://www.drupal.org/node/2944589
--- a/core/modules/entity_reference/src/Plugin/views/style/EntityReference.php
+++ b/core/modules/entity_reference/src/Plugin/views/style/EntityReference.php
@@ -7,7 +7,7 @@
 /**
  * Deprecated. EntityReference style plugin.
  *
- * @deprecated in Drupal 8.0.x and will be removed in Drupal 9.0.x. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\views\Plugin\views\style\EntityReference instead.
  *
  * @see \Drupal\views\Plugin\views\style\EntityReference
--- a/core/modules/entity_reference/src/Plugin/views/row/EntityReference.php
+++ b/core/modules/entity_reference/src/Plugin/views/row/EntityReference.php
@@ -7,7 +7,7 @@
 /**
  * EntityReference row plugin.
  *
- * @deprecated in Drupal 8.0.x and will be removed in Drupal 9.0.x. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\views\Plugin\views\row\EntityReference instead.
  *
  * @see \Drupal\views\Plugin\views\row\EntityReference
--- a/core/modules/entity_reference/src/Plugin/views/display/EntityReference.php
+++ b/core/modules/entity_reference/src/Plugin/views/display/EntityReference.php
@@ -7,7 +7,7 @@
 /**
  * Deprecated. The plugin that handles an EntityReference display.
  *
- * @deprecated in Drupal 8.0.x and will be removed in Drupal 9.0.x. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\views\Plugin\views\display\EntityReference instead.
  *
  * @see \Drupal\views\Plugin\views\display\EntityReference
--- a/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php
+++ b/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php
@@ -7,7 +7,7 @@
 /**
  * Deprecated. Alternative implementation of the 'entity_reference' field type.
  *
- * @deprecated in Drupal 8.0.x and will be removed in Drupal 9.0.x. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem instead.
  *
  * @see \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem
--- a/core/modules/dblog/dblog.module
+++ b/core/modules/dblog/dblog.module
@@ -126,7 +126,7 @@
  * This hook ensures there are no views based that are using a wrong plugin for
  * wid and uid fields on views that use watchdog as base table.
  *
- * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *
  * @see https://www.drupal.org/node/2876378
  */
--- a/core/modules/datetime_range/datetime_range.module
+++ b/core/modules/datetime_range/datetime_range.module
@@ -39,7 +39,7 @@
  * deprecated and must be converted before 9.0.0, when this updating layer will
  * be removed.
  *
- * @deprecated in Drupal 8.5.x and will be removed before 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *
  * @see https://www.drupal.org/node/2857691
  */
--- a/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php
+++ b/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php
@@ -14,7 +14,7 @@
 /**
  * Base class for testing datetime handlers.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\BrowserTestBase.
  */
 abstract class DateTimeHandlerTestBase extends HandlerTestBase {
--- a/core/modules/datetime/src/Tests/DateTestBase.php
+++ b/core/modules/datetime/src/Tests/DateTestBase.php
@@ -15,7 +15,7 @@
 /**
  * Provides a base class for testing Datetime field functionality.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\BrowserTestBase instead.
  */
 abstract class DateTestBase extends WebTestBase {
--- a/core/modules/datetime/src/Plugin/migrate/field/d6/DateField.php
+++ b/core/modules/datetime/src/Plugin/migrate/field/d6/DateField.php
@@ -20,7 +20,7 @@
  *   weight = 9999999,
  * )
  *
- * @deprecated in Drupal 8.4.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  * \Drupal\datetime\Plugin\migrate\field\DateField instead.
  */
 class DateField extends FieldPluginBase {
--- a/core/modules/datetime/datetime.module
+++ b/core/modules/datetime/datetime.module
@@ -11,7 +11,7 @@
 /**
  * Defines the timezone that dates should be stored in.
  *
- * @deprecated in Drupal 8.5.x and will be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0. Use
  * \Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface::STORAGE_TIMEZONE
  * instead.
  *
@@ -22,7 +22,7 @@
 /**
  * Defines the format that date and time should be stored in.
  *
- * @deprecated in Drupal 8.5.x and will be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0. Use
  * \Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface::DATETIME_STORAGE_FORMAT
  * instead.
  *
@@ -33,7 +33,7 @@
 /**
  * Defines the format that dates should be stored in.
  *
- * @deprecated in Drupal 8.5.x and will be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0. Use
  * \Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface::DATE_STORAGE_FORMAT
  * instead.
  *
@@ -70,7 +70,7 @@
  *
  * @param $date
  *
- * @deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Component\Datetime\DateTimePlus::setDefaultDateTime() or
  *   \Drupal\Core\Datetime\DrupalDateTime::setDefaultDateTime() instead.
  *
--- a/core/modules/content_translation/src/ContentTranslationUpdatesManager.php
+++ b/core/modules/content_translation/src/ContentTranslationUpdatesManager.php
@@ -12,7 +12,7 @@
 /**
  * Provides the logic needed to update field storage definitions when needed.
  *
- * @deprecated in Drupal 8.7.x, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Definitions are updated automatically now so no replacement is needed.
  *
  * @see https://www.drupal.org/node/2973222
--- a/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutUnpublishNode.php
+++ b/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutUnpublishNode.php
@@ -9,7 +9,7 @@
 /**
  * Alternate action plugin that can opt-out of modifying moderated entities.
  *
- * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\content_moderation\Plugin\Action\ModerationOptOutUnpublish
  *   instead.
  *
--- a/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutPublishNode.php
+++ b/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutPublishNode.php
@@ -9,7 +9,7 @@
 /**
  * Alternate action plugin that can opt-out of modifying moderated entities.
  *
- * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\content_moderation\Plugin\Action\ModerationOptOutPublish
  *   instead.
  *
--- a/core/modules/config_translation/src/Plugin/migrate/source/d6/I18nProfileField.php
+++ b/core/modules/config_translation/src/Plugin/migrate/source/d6/I18nProfileField.php
@@ -12,7 +12,7 @@
  *   source_module = "i18nprofile"
  * )
  *
- * @deprecated in Drupal 8.4.x and will be removed in Drupal 9.0.x. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  * \Drupal\config_translation\Plugin\migrate\source\d6\ProfileFieldTranslation
  * instead.
  *
--- a/core/modules/config/src/Tests/SchemaCheckTestTrait.php
+++ b/core/modules/config/src/Tests/SchemaCheckTestTrait.php
@@ -7,7 +7,7 @@
 /**
  * Provides a class for checking configuration schema.
  *
- * @deprecated as of 8.3.x, will be removed in before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Tests\SchemaCheckTestTrait instead.
  */
 trait SchemaCheckTestTrait {
--- a/core/modules/config/src/Tests/AssertConfigEntityImportTrait.php
+++ b/core/modules/config/src/Tests/AssertConfigEntityImportTrait.php
@@ -12,7 +12,7 @@
  * Can be used by test classes that extend \Drupal\simpletest\WebTestBase or
  * \Drupal\KernelTests\KernelTestBase.
  *
- * @deprecated in Drupal 8.4.1 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.1 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\config\Traits\AssertConfigEntityImportTrait.
  *
  * @see https://www.drupal.org/node/2916197
--- a/core/modules/config/src/Form/ConfigSync.php
+++ b/core/modules/config/src/Form/ConfigSync.php
@@ -383,7 +383,7 @@
    * @param array $context
    *   The batch context.
    *
-   * @deprecated in Drupal 8.6.0 and will be removed before 9.0.0. Use
+   * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Core\Config\Importer\ConfigImporterBatch::process() instead.
    *
    * @see https://www.drupal.org/node/2897299
@@ -399,7 +399,7 @@
    * This function is a static function to avoid serializing the ConfigSync
    * object unnecessarily.
    *
-   * @deprecated in Drupal 8.6.0 and will be removed before 9.0.0. Use
+   * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Core\Config\Importer\ConfigImporterBatch::finish() instead.
    *
    * @see https://www.drupal.org/node/2897299
--- a/core/modules/comment/src/Tests/Views/CommentTestBase.php
+++ b/core/modules/comment/src/Tests/Views/CommentTestBase.php
@@ -12,7 +12,7 @@
 /**
  * Provides setup and helper methods for comment views tests.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\comment\Functional\Views\CommentTestBase instead.
  *
  * @see https://www.drupal.org/node/2908490
--- a/core/modules/comment/src/Tests/CommentTestBase.php
+++ b/core/modules/comment/src/Tests/CommentTestBase.php
@@ -16,7 +16,7 @@
 /**
  * Provides setup and helper methods for comment tests.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\comment\Functional\CommentTestBase instead.
  *
  * @see https://www.drupal.org/node/2908490
--- a/core/modules/comment/src/Plugin/migrate/source/d7/CommentType.php
+++ b/core/modules/comment/src/Plugin/migrate/source/d7/CommentType.php
@@ -16,7 +16,7 @@
  *   source_module = "comment"
  * )
  *
- * @deprecated in Drupal 8.4.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  * \Drupal\node\Plugin\migrate\source\d7\NodeType instead.
  */
 class CommentType extends DrupalSqlBase {
--- a/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariablePerCommentType.php
+++ b/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariablePerCommentType.php
@@ -10,7 +10,7 @@
  *   source_module = "comment"
  * )
  *
- * @deprecated in Drupal 8.4.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  * \Drupal\node\Plugin\migrate\source\d6\NodeType instead.
  */
 class CommentVariablePerCommentType extends CommentVariable {
--- a/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariable.php
+++ b/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariable.php
@@ -13,7 +13,7 @@
  *   source_module = "comment"
  * )
  *
- * @deprecated in Drupal 8.4.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
  * \Drupal\node\Plugin\migrate\source\d6\NodeType instead.
  */
 class CommentVariable extends DrupalSqlBase {
--- a/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php
+++ b/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php
@@ -45,7 +45,7 @@
    *   The row from the source to process.
    * @return \Drupal\migrate\Row
    *   The row object.
-   * @deprecated in Drupal 8.4.x, to be removed before Drupal 9.0.x.
+   * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
    */
   protected function prepareComment(Row $row) {
     if ($this->variableGet('comment_subject_field_' . $row->getSourceProperty('type'), 1)) {
--- a/core/modules/comment/src/Plugin/Action/UnpublishComment.php
+++ b/core/modules/comment/src/Plugin/Action/UnpublishComment.php
@@ -8,7 +8,7 @@
 /**
  * Unpublishes a comment.
  *
- * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Action\Plugin\Action\UnpublishAction instead.
  *
  * @see \Drupal\Core\Action\Plugin\Action\UnpublishAction
--- a/core/modules/comment/src/Plugin/Action/SaveComment.php
+++ b/core/modules/comment/src/Plugin/Action/SaveComment.php
@@ -9,7 +9,7 @@
 /**
  * Saves a comment.
  *
- * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Action\Plugin\Action\SaveAction instead.
  *
  * @see \Drupal\Core\Action\Plugin\Action\SaveAction
--- a/core/modules/comment/src/Plugin/Action/PublishComment.php
+++ b/core/modules/comment/src/Plugin/Action/PublishComment.php
@@ -8,7 +8,7 @@
 /**
  * Publishes a comment.
  *
- * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Action\Plugin\Action\PublishAction instead.
  *
  * @see \Drupal\Core\Action\Plugin\Action\PublishAction
--- a/core/modules/comment/src/Plugin/Action/DeleteComment.php
+++ b/core/modules/comment/src/Plugin/Action/DeleteComment.php
@@ -10,7 +10,7 @@
 /**
  * Deletes a comment.
  *
- * @deprecated in Drupal 8.6.x, to be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Action\Plugin\Action\DeleteAction instead.
  *
  * @see \Drupal\Core\Action\Plugin\Action\DeleteAction
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -31,7 +31,7 @@
 /**
  * Anonymous posters cannot enter their contact information.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\comment\CommentInterface::ANONYMOUS_MAYNOT_CONTACT instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -41,7 +41,7 @@
 /**
  * Anonymous posters may leave their contact information.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\comment\CommentInterface::ANONYMOUS_MAY_CONTACT instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -51,7 +51,7 @@
 /**
  * Anonymous posters are required to leave their contact information.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\comment\CommentInterface::ANONYMOUS_MUST_CONTACT instead.
  *
  * @see https://www.drupal.org/node/2831620
@@ -274,7 +274,7 @@
  * @return array
  *   An array as expected by \Drupal\Core\Render\RendererInterface::render().
  *
- * @deprecated in Drupal 8.x and will be removed before Drupal 9.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal::entityTypeManager()->getViewBuilder('comment')->view().
  *
  * @see https://www.drupal.org/node/3033656
@@ -303,7 +303,7 @@
  *   An array in the format expected by
  *   \Drupal\Core\Render\RendererInterface::render().
  *
- * @deprecated in Drupal 8.x and will be removed before Drupal 9.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal::entityTypeManager()->getViewBuilder('comment')->viewMultiple().
  *
  * @see https://www.drupal.org/node/3033656
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -122,7 +122,7 @@
 /**
  * #pre_render callback: Sets color preset logo.
  *
- * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\color\ColorSystemBrandingBlockAlter::preRender() instead.
  *
  * @see https://www.drupal.org/node/2966725
--- a/core/modules/book/src/Plugin/migrate/source/d6/Book.php
+++ b/core/modules/book/src/Plugin/migrate/source/d6/Book.php
@@ -14,7 +14,7 @@
  *   source_module = "book"
  * )
  *
- * @deprecated in Drupal 8.6.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  * \Drupal\book\Plugin\migrate\source\Book instead. See
  * https://www.drupal.org/node/2947487 for more information.
  */
--- a/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
+++ b/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
@@ -13,7 +13,7 @@
 /**
  * Base class for all block_content tests.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\block_content\Functional\Views\BlockContentTestBase.
  */
 abstract class BlockContentTestBase extends ViewTestBase {
--- a/core/modules/block_content/src/BlockContentInterface.php
+++ b/core/modules/block_content/src/BlockContentInterface.php
@@ -19,7 +19,7 @@
    * @return string
    *   The revision log message.
    *
-   * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.2.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Core\Entity\RevisionLogInterface::getRevisionLogMessage() instead.
    */
   public function getRevisionLog();
@@ -44,7 +44,7 @@
    * @return $this
    *   The class instance that this method is called on.
    *
-   * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.2.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Core\Entity\RevisionLogInterface::setRevisionLogMessage() instead.
    */
   public function setRevisionLog($revision_log);
--- a/core/modules/block/src/Tests/BlockTestBase.php
+++ b/core/modules/block/src/Tests/BlockTestBase.php
@@ -10,7 +10,7 @@
 /**
  * Provides setup and helper methods for block module tests.
  *
- * @deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\block\Functional\BlockTestBase.
  *
  * @see https://www.drupal.org/node/2901823
--- a/core/modules/block/src/BlockInterface.php
+++ b/core/modules/block/src/BlockInterface.php
@@ -13,7 +13,7 @@
   /**
    * Indicates the block label (title) should be displayed to end users.
    *
-   * @deprecated in Drupal 8.3.x, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Block\BlockPluginInterface::BLOCK_LABEL_VISIBLE.
    *
    * @see https://www.drupal.org/node/2829775
--- a/core/modules/basic_auth/src/Tests/BasicAuthTestTrait.php
+++ b/core/modules/basic_auth/src/Tests/BasicAuthTestTrait.php
@@ -7,7 +7,7 @@
 /**
  * Provides common functionality for Basic Authentication test classes.
  *
- * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Tests\basic_auth\Traits\BasicAuthTestTrait instead.
  *
  * @see https://www.drupal.org/node/2862800
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -12,7 +12,7 @@
 /**
  * Denotes that a feed's items should never expire.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\aggregator\FeedStorageInterface::CLEAR_NEVER instead.
  *
  * @see https://www.drupal.org/node/2831620
--- a/core/modules/action/src/ActionFormBase.php
+++ b/core/modules/action/src/ActionFormBase.php
@@ -9,7 +9,7 @@
 /**
  * Provides a base form for action forms.
  *
- * @deprecated in Drupal 8.8.x and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\action\Form\ActionFormBase instead.
  *
  * @see https://www.drupal.org/node/3033540
--- a/core/modules/action/src/ActionEditForm.php
+++ b/core/modules/action/src/ActionEditForm.php
@@ -11,7 +11,7 @@
  *
  * @internal
  *
- * @deprecated in Drupal 8.8.x and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\action\Form\ActionEditForm instead.
  *
  * @see https://www.drupal.org/node/3033540
--- a/core/modules/action/src/ActionAddForm.php
+++ b/core/modules/action/src/ActionAddForm.php
@@ -11,7 +11,7 @@
  *
  * @internal
  *
- * @deprecated in Drupal 8.8.x and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\action\Form\ActionEditForm instead.
  *
  * @see https://www.drupal.org/node/3033540
--- a/core/lib/Drupal/Core/Theme/ActiveTheme.php
+++ b/core/lib/Drupal/Core/Theme/ActiveTheme.php
@@ -52,7 +52,7 @@
    *
    * @var static[]
    *
-   * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9. Use
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
    *   $this->baseThemeExtensions instead.
    *
    * @see https://www.drupal.org/node/3019948
@@ -211,7 +211,7 @@
    *
    * @return mixed
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *
    * @see https://www.drupal.org/node/2497313
    */
@@ -227,7 +227,7 @@
    *
    * @return static[]
    *
-   * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Core\Theme\ActiveTheme::getBaseThemeExtensions() instead.
    *
    * @see https://www.drupal.org/node/3019948
--- a/core/lib/Drupal/Core/Template/TwigExtension.php
+++ b/core/lib/Drupal/Core/Template/TwigExtension.php
@@ -80,7 +80,7 @@
    *
    * @return $this
    *
-   * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    */
   public function setGenerators(UrlGeneratorInterface $url_generator) {
     return $this->setUrlGenerator($url_generator);
@@ -94,7 +94,7 @@
    *
    * @return $this
    *
-   * @deprecated in Drupal 8.3.x-dev, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
    */
   public function setUrlGenerator(UrlGeneratorInterface $url_generator) {
     $this->urlGenerator = $url_generator;
@@ -109,7 +109,7 @@
    *
    * @return $this
    *
-   * @deprecated in Drupal 8.3.x-dev, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
    */
   public function setThemeManager(ThemeManagerInterface $theme_manager) {
     $this->themeManager = $theme_manager;
@@ -124,7 +124,7 @@
    *
    * @return $this
    *
-   * @deprecated in Drupal 8.3.x-dev, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
    */
   public function setDateFormatter(DateFormatterInterface $date_formatter) {
     $this->dateFormatter = $date_formatter;
--- a/core/lib/Drupal/Core/StringTranslation/TranslationWrapper.php
+++ b/core/lib/Drupal/Core/StringTranslation/TranslationWrapper.php
@@ -5,7 +5,7 @@
 /**
  * Provides translatable string class.
  *
- * @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use the \Drupal\Core\StringTranslation\TranslatableMarkup class instead.
  */
 class TranslationWrapper extends TranslatableMarkup {}
--- a/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php
+++ b/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php
@@ -16,7 +16,7 @@
    * separate singular and plural variants in source and translation text. It
    * was found to be the most compatible delimiter for the supported databases.
    *
-   * @deprecated in Drupal 8.7.x, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
    *   Use Drupal\Component\Gettext\PoItem::DELIMITER instead.
    */
   const DELIMITER = PoItem::DELIMITER;
--- a/core/lib/Drupal/Core/Session/AccountProxy.php
+++ b/core/lib/Drupal/Core/Session/AccountProxy.php
@@ -39,7 +39,7 @@
    *
    * @var int
    *
-   * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
    *   $this->id instead.
    */
   protected $initialAccountId;
--- a/core/lib/Drupal/Core/Session/AccountInterface.php
+++ b/core/lib/Drupal/Core/Session/AccountInterface.php
@@ -112,7 +112,7 @@
    *   any other display purposes, use
    *   \Drupal\Core\Session\AccountInterface::getDisplayName() instead.
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Session\AccountInterface::getAccountName() or
    *   \Drupal\user\UserInterface::getDisplayName() instead.
    *
--- a/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php
+++ b/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php
@@ -12,7 +12,7 @@
  * in the Container should not use this trait but inject the appropriate service
  * directly for easier testing.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Url instead.
  */
 trait UrlGeneratorTrait {
--- a/core/lib/Drupal/Core/Routing/RouteFilterInterface.php
+++ b/core/lib/Drupal/Core/Routing/RouteFilterInterface.php
@@ -9,7 +9,7 @@
 /**
  * A route filter service to filter down the collection of route instances.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead,
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Instead,
  * you should use \Drupal\Core\Routing\FilterInterface.
  * See https://www.drupal.org/node/2894934
  */
--- a/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
+++ b/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
@@ -13,7 +13,7 @@
  * in the Container should not use this trait but inject the appropriate service
  * directly for easier testing.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Link instead.
  *
  * @see https://www.drupal.org/node/2614344
--- a/core/lib/Drupal/Core/Routing/Enhancer/RouteEnhancerInterface.php
+++ b/core/lib/Drupal/Core/Routing/Enhancer/RouteEnhancerInterface.php
@@ -10,7 +10,7 @@
 /**
  * A route enhance service to determine route enhance rules.
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead,
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Instead,
  * you should use \Drupal\Core\Routing\EnhancerInterface.
  * See https://www.drupal.org/node/2894934
  * Part of the deprecation means that applies() is now called on runtime instead
--- a/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php
+++ b/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php
@@ -85,7 +85,7 @@
   /**
    * Wraps \Drupal\Core\Render\RendererInterface::renderRoot().
    *
-   * @deprecated in Drupal 8.7.x and will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
    *   $this->renderer->renderRoot() instead.
    *
    * @see https://www.drupal.org/node/2912696
--- a/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
+++ b/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
@@ -164,7 +164,7 @@
    *   just the latest revision, if the specified entity is not translatable or
    *   does not have a matching translation yet.
    *
-   * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityRepositoryInterface::getActive() instead.
    */
   protected function getLatestTranslationAffectedRevision(RevisionableInterface $entity, $langcode) {
@@ -196,7 +196,7 @@
    * @return \Drupal\Core\Entity\RevisionableInterface
    *   An entity revision object.
    *
-   * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
    */
   protected function loadRevision(RevisionableInterface $entity, $revision_id) {
     @trigger_error('\Drupal\Core\ParamConverter\EntityConverter::loadRevision() is deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0.', E_USER_DEPRECATED);
--- a/core/lib/Drupal/Core/Messenger/LegacyMessenger.php
+++ b/core/lib/Drupal/Core/Messenger/LegacyMessenger.php
@@ -18,7 +18,7 @@
  * @see https://www.drupal.org/node/2774931
  * @see https://www.drupal.org/node/2928994
  *
- * @deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Messenger\Messenger instead.
  */
 class LegacyMessenger implements MessengerInterface {
--- a/core/lib/Drupal/Core/Installer/Exception/InstallProfileMismatchException.php
+++ b/core/lib/Drupal/Core/Installer/Exception/InstallProfileMismatchException.php
@@ -23,7 +23,7 @@
    * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
    *   The string translation manager.
    *
-   * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0. The
+   * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. The
    *    install profile is written to core.extension.
    *
    * @see _install_select_profile()
--- a/core/lib/Drupal/Core/Image/Image.php
+++ b/core/lib/Drupal/Core/Image/Image.php
@@ -210,7 +210,7 @@
    * @return bool
    *   TRUE for success, FALSE in the event of an error.
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\File\FileSystem::chmod().
    *
    * @see \Drupal\Core\File\FileSystemInterface::chmod()
--- a/core/lib/Drupal/Core/File/FileSystemInterface.php
+++ b/core/lib/Drupal/Core/File/FileSystemInterface.php
@@ -242,7 +242,7 @@
    *   A string containing the name of the scheme, or FALSE if none. For
    *   example, the URI "public://example.txt" would return "public".
    *
-   * @deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. Use
+   * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
    *   Drupal\Core\StreamWrapper\StreamWrapperManagerInterface::getScheme()
    *   instead.
    *
@@ -264,7 +264,7 @@
    *   Returns TRUE if the string is the name of a validated stream, or FALSE if
    *   the scheme does not have a registered handler.
    *
-   * @deprecated in drupal:8.0.0 and will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
    *   Drupal\Core\StreamWrapper\StreamWrapperManagerInterface::isValidScheme()
    *   instead.
    *
--- a/core/lib/Drupal/Core/Field/PluginSettingsInterface.php
+++ b/core/lib/Drupal/Core/Field/PluginSettingsInterface.php
@@ -8,7 +8,7 @@
 /**
  * Interface definition for plugin with settings.
  *
- * @deprecated in Drupal 8.1.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.1.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Component\Plugin\ConfigurableInterface instead.
  */
 interface PluginSettingsInterface extends PluginInspectionInterface, ThirdPartySettingsInterface {
--- a/core/lib/Drupal/Core/Field/Plugin/migrate/field/d7/NumberField.php
+++ b/core/lib/Drupal/Core/Field/Plugin/migrate/field/d7/NumberField.php
@@ -7,7 +7,7 @@
 /**
  * MigrateField plugin for Drupal 7 number fields.
  *
- * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\field\Plugin\migrate\field\d7\NumberField instead.
  *
  * @see https://www.drupal.org/node/3009286
--- a/core/lib/Drupal/Core/Field/Plugin/migrate/field/d7/EntityReference.php
+++ b/core/lib/Drupal/Core/Field/Plugin/migrate/field/d7/EntityReference.php
@@ -7,7 +7,7 @@
 /**
  * MigrateField plugin for Drupal 7 entity_reference fields.
  *
- * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\field\Plugin\migrate\field\d7\EntityReference instead.
  *
  * @see https://www.drupal.org/node/3009286
--- a/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php
+++ b/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php
@@ -7,7 +7,7 @@
 /**
  * MigrateField Plugin for Drupal 6 and 7 email fields.
  *
- * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\field\Plugin\migrate\field\Email instead.
  *
  * @see https://www.drupal.org/node/3009286
--- a/core/lib/Drupal/Core/Field/FieldStorageDefinitionInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldStorageDefinitionInterface.php
@@ -114,7 +114,7 @@
    * @return bool
    *   TRUE if the field is queryable.
    *
-   * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Core\Field\FieldStorageDefinitionInterface::hasCustomStorage()
    *   instead.
    *
--- a/core/lib/Drupal/Core/Field/BaseFieldDefinition.php
+++ b/core/lib/Drupal/Core/Field/BaseFieldDefinition.php
@@ -305,7 +305,7 @@
    * @return static
    *   The object itself for chaining.
    *
-   * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Core\Field\BaseFieldDefinition::setCustomStorage() instead.
    *
    * @see https://www.drupal.org/node/2856563
@@ -637,7 +637,7 @@
   /**
    * Helper to retrieve the field item class.
    *
-   * @deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Core\TypedData\ListDataDefinition::getClass() instead.
    */
   protected function getFieldItemClass() {
--- a/core/lib/Drupal/Core/Field/AllowedTagsXssTrait.php
+++ b/core/lib/Drupal/Core/Field/AllowedTagsXssTrait.php
@@ -5,7 +5,7 @@
 /**
  * Useful methods when dealing with displaying allowed tags.
  *
- * @deprecated in Drupal 8.0.x, will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Field\FieldFilteredMarkup instead.
  *
  * @see \Drupal\Core\Field\FieldFilteredMarkup
--- a/core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php
+++ b/core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php
@@ -169,7 +169,7 @@
    *
    * @return $this
    *
-   * @deprecated in Drupal 8.2.x-dev and will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.2.0 and is removed from drupal:9.0.0.
    *   Use
    *   @code
    *     \Drupal::configFactory()
--- a/core/lib/Drupal/Core/Extension/ModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/ModuleHandler.php
@@ -715,7 +715,7 @@
    *     '<=', '>', or '>='. 'version' is one piece like '4.5-beta3'.
    *   Callers should pass this structure to drupal_check_incompatibility().
    *
-   * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Extension\Dependency::createFromString() instead.
    *
    * @see https://www.drupal.org/node/2756875
--- a/core/lib/Drupal/Core/Entity/Sql/TemporaryTableMapping.php
+++ b/core/lib/Drupal/Core/Entity/Sql/TemporaryTableMapping.php
@@ -9,7 +9,7 @@
 /**
  * Defines a temporary table mapping class.
  *
- * @deprecated in Drupal 8.7.x and will be removed before Drupal 9.0.0. Use the
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use the
  *   default table mapping with a prefix instead.
  */
 class TemporaryTableMapping extends DefaultTableMapping {
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchemaConverter.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchemaConverter.php
@@ -10,7 +10,7 @@
 /**
  * Defines a schema converter for entity types with existing data.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface::updateFieldableEntityType()
  *   instead.
  *
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
@@ -164,7 +164,7 @@
    *   The array of base field definitions for the entity type, keyed by field
    *   name.
    *
-   * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityFieldManagerInterface::getActiveFieldStorageDefinitions()
    *   instead.
    *
@@ -1811,7 +1811,7 @@
    * @return bool
    *   Whether the field has been already deleted.
    *
-   * @deprecated in Drupal 8.5.x, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Core\Field\FieldStorageDefinitionInterface::isDeleted() instead.
    *
    * @see https://www.drupal.org/node/2907785
--- a/core/lib/Drupal/Core/Entity/Query/QueryFactory.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryFactory.php
@@ -15,7 +15,7 @@
  * Any implementation of this service must call getQuery()/getAggregateQuery()
  * of the corresponding entity storage.
  *
- * @deprecated in Drupal 8.3.0, will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Entity\EntityStorageInterface::getQuery() or
  *   \Drupal\Core\Entity\EntityStorageInterface::getAggregateQuery() instead.
  *
--- a/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/SelectionBase.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/SelectionBase.php
@@ -3,7 +3,7 @@
 namespace Drupal\Core\Entity\Plugin\EntityReferenceSelection;
 
 /**
- * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Entity\Plugin\EntityReferenceSelection\DefaultSelection
  */
 class SelectionBase extends DefaultSelection {}
--- a/core/lib/Drupal/Core/Entity/EntityTypeRepositoryInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityTypeRepositoryInterface.php
@@ -45,7 +45,7 @@
   /**
    * Clear the static cache.
    *
-   * @deprecated in drupal:8.0.0 and is removed in drupal:9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    */
   public function clearCachedDefinitions();
 
--- a/core/lib/Drupal/Core/Entity/EntityTypeInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityTypeInterface.php
@@ -364,7 +364,7 @@
    * @return bool
    *   TRUE if the entity type is a subclass of the class or interface.
    *
-   * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
    *   Use Drupal\Core\Entity\EntityTypeInterface::entityClassImplements()
    *   instead.
    */
@@ -659,7 +659,7 @@
    * @return string
    *   The lowercase form of the human-readable entity type name.
    *
-   * @deprecated deprecated in drupal:8.8.0 and is removed from drupal:9.0.0.
+   * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0.
    *   Instead, you should call getSingularLabel().
    *   See https://www.drupal.org/node/3075567
    *
--- a/core/lib/Drupal/Core/Entity/EntityManagerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityManagerInterface.php
@@ -8,14 +8,14 @@
 /**
  * Provides an interface for entity type managers.
  *
- * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *
  * @see https://www.drupal.org/node/2549139
  */
 interface EntityManagerInterface extends EntityTypeListenerInterface, EntityBundleListenerInterface, FieldStorageDefinitionListenerInterface, FieldDefinitionListenerInterface, EntityTypeManagerInterface, EntityTypeRepositoryInterface, EntityTypeBundleInfoInterface, EntityDisplayRepositoryInterface, EntityFieldManagerInterface, EntityRepositoryInterface {
 
   /**
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Core\Entity\EntityLastInstalledSchemaRepositoryInterface::getLastInstalledDefinition()
    *   instead.
    *
@@ -24,7 +24,7 @@
   public function getLastInstalledDefinition($entity_type_id);
 
   /**
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Core\Entity\EntityLastInstalledSchemaRepositoryInterface::getLastInstalledFieldStorageDefinitions()
    *   instead.
    *
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -21,7 +21,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::clearCachedDefinitions()
    *   instead.
    *
@@ -42,7 +42,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::getDefinition()
    *   instead.
    *
@@ -56,7 +56,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::hasHandler()
    *   instead.
    *
@@ -70,7 +70,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::getStorage() instead.
    *
    * @see https://www.drupal.org/node/2549139
@@ -83,7 +83,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::getListBuilder()
    *   instead.
    *
@@ -97,7 +97,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::getFormObject()
    *   instead.
    *
@@ -111,7 +111,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::getRouteProviders()
    *   instead.
    *
@@ -125,7 +125,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::getViewBuilder()
    *   instead.
    *
@@ -139,7 +139,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::getAccessControlHandler()
    *   instead.
    *
@@ -153,7 +153,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::getHandler() instead.
    *
    * @see https://www.drupal.org/node/2549139
@@ -166,7 +166,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::createHandlerInstance()
    *   instead.
    *
@@ -180,7 +180,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityFieldManagerInterface::getBaseFieldDefinitions()
    *   instead.
    *
@@ -194,7 +194,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityFieldManagerInterface::getFieldDefinitions()
    *   instead.
    *
@@ -208,7 +208,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in drupal:8.0.0, will be removed before drupal:9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityFieldManagerInterface::getFieldStorageDefinitions()
    *   instead.
    *
@@ -222,7 +222,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityFieldManagerInterface::getActiveFieldStorageDefinitions()
    *   instead.
    *
@@ -236,7 +236,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in drupal:8.0.0, will be removed before drupal:9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityFieldManagerInterface::setFieldMap()
    *   instead.
    *
@@ -250,7 +250,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in drupal:8.0.0, will be removed before drupal:9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityFieldManagerInterface::getFieldMap()
    *   instead.
    *
@@ -264,7 +264,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in drupal:8.0.0, will be removed before drupal:9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityFieldManagerInterface::getFieldMapByFieldType()
    *   instead.
    *
@@ -278,7 +278,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in drupal:8.0.0, will be removed before drupal:9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Field\FieldDefinitionListenerInterface::onFieldDefinitionCreate()
    *   instead.
    *
@@ -292,7 +292,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Field\FieldDefinitionListenerInterface::onFieldDefinitionUpdate()
    *   instead.
    *
@@ -306,7 +306,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Field\FieldDefinitionListenerInterface::onFieldDefinitionDelete()
    *   instead.
    *
@@ -320,7 +320,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityFieldManagerInterface::clearCachedFieldDefinitions()
    *   instead.
    *
@@ -334,7 +334,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in drupal:8.0.0, will be removed before drupal:9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeBundleInfoInterface::clearCachedBundles()
    *   instead.
    *
@@ -348,7 +348,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in drupal:8.0.0, will be removed before drupal:9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeBundleInfoInterface::getBundleInfo()
    *   instead.
    *
@@ -362,7 +362,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in drupal:8.0.0, will be removed before drupal:9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeBundleInfoInterface::getAllBundleInfo()
    *   instead.
    *
@@ -376,7 +376,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in drupal:8.0.0, will be removed before drupal:9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityFieldManagerInterface::getExtraFields()
    *   instead.
    *
@@ -390,7 +390,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeRepositoryInterface::getEntityTypeLabels()
    *   instead.
    *
@@ -404,7 +404,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityRepositoryInterface::getTranslationFromContext()
    *   instead.
    *
@@ -418,7 +418,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityRepositoryInterface::getActive() instead.
    *
    * @see https://www.drupal.org/node/2549139
@@ -431,7 +431,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityRepositoryInterface::getActiveMultiple()
    *   instead.
    *
@@ -445,7 +445,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityRepositoryInterface::getCanonical()
    *   instead.
    *
@@ -459,7 +459,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityRepositoryInterface::getCanonicalMultiple()
    *   instead.
    *
@@ -473,7 +473,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityDisplayRepositoryInterface::getAllViewModes()
    *   instead.
    *
@@ -487,7 +487,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityDisplayRepositoryInterface::getViewModes()
    *   instead.
    *
@@ -501,7 +501,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityDisplayRepositoryInterface::getAllFormModes()
    *   instead.
    *
@@ -515,7 +515,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityDisplayRepositoryInterface::getFormModes()
    *   instead.
    *
@@ -529,7 +529,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityDisplayRepositoryInterface::getViewModeOptions()
    *   instead.
    *
@@ -543,7 +543,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityDisplayRepositoryInterface::getFormModeOptions()
    *   instead.
    *
@@ -557,7 +557,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityDisplayRepositoryInterface::getViewModeOptionsByBundle()
    *   instead.
    *
@@ -571,7 +571,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityDisplayRepositoryInterface::getFormModeOptionsByBundle()
    *   instead.
    *
@@ -585,7 +585,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityDisplayRepositoryInterface::clearDisplayModeInfo()
    *   instead.
    *
@@ -599,7 +599,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityRepositoryInterface::loadEntityByUuid()
    *   instead.
    *
@@ -613,7 +613,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityRepositoryInterface::loadEntityByConfigTarget()
    *   instead.
    *
@@ -627,7 +627,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeRepositoryInterface::getEntityTypeFromClass()
    *   instead.
    *
@@ -649,7 +649,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeListenerInterface::onEntityTypeUpdate()
    *   instead.
    *
@@ -663,7 +663,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeListenerInterface::onFieldableEntityTypeUpdate()
    *   instead.
    *
@@ -676,7 +676,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeListenerInterface::onEntityTypeDelete()
    *   instead.
    *
@@ -690,7 +690,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Field\FieldStorageDefinitionListenerInterface::onFieldStorageDefinitionCreate()
    *   instead.
    *
@@ -704,7 +704,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Field\FieldStorageDefinitionListenerInterface::onFieldStorageDefinitionUpdate()
    *   instead.
    *
@@ -718,7 +718,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Field\FieldStorageDefinitionListenerInterface::onFieldStorageDefinitionDelete()
    *   instead.
    *
@@ -732,7 +732,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityBundleListenerInterface::onBundleCreate()
    *   instead.
    *
@@ -746,7 +746,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityBundleListenerInterface::onBundleDelete()
    *   instead.
    *
@@ -760,7 +760,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityLastInstalledSchemaRepositoryInterface::getLastInstalledDefinition()
    *   instead.
    *
@@ -793,7 +793,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityLastInstalledSchemaRepositoryInterface::getLastInstalledFieldStorageDefinitions()
    *   instead.
    *
@@ -807,7 +807,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::getDefinitions()
    *   instead.
    *
@@ -821,7 +821,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::hasDefinition()
    *   instead.
    *
@@ -835,7 +835,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::getActiveDefinition()
    *   instead.
    *
@@ -849,7 +849,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::createInstance()
    *   instead.
    *
@@ -863,7 +863,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::getInstance()
    *   instead.
    *
@@ -877,7 +877,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in drupal:8.8.0, will be removed before drupal:9.0.0.
+   * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::getViewDisplay()
    *   instead.
    */
@@ -889,7 +889,7 @@
   /**
    * {@inheritdoc}
    *
-   * @deprecated in drupal:8.8.0, will be removed before drupal:9.0.0.
+   * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityTypeManagerInterface::getFormwDisplay()
    *   instead.
    */
--- a/core/lib/Drupal/Core/Entity/EntityListBuilder.php
+++ b/core/lib/Drupal/Core/Entity/EntityListBuilder.php
@@ -113,7 +113,7 @@
    * @return string
    *   The entity label.
    *
-   * @deprecated in Drupal 8.0.x, will be removed before Drupal 9.0.0
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use $entity->label() instead. This method used to escape the entity
    *   label. The render system's autoescape is now relied upon.
    */
--- a/core/lib/Drupal/Core/Entity/EntityInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityInterface.php
@@ -107,7 +107,7 @@
    * @return \Drupal\Core\Url
    *   The URL object.
    *
-   * @deprecated in Drupal 8.0.0, intended to be removed in Drupal 9.0.0
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\Entity\EntityInterface::toUrl() instead.
    *
    * @see https://www.drupal.org/node/2614344
@@ -165,7 +165,7 @@
    * @return string
    *   The URL for this entity.
    *
-   * @deprecated in Drupal 8.0.0, intended to be removed in Drupal 9.0.0
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Please use toUrl() instead.
    *
    * @see https://www.drupal.org/node/2614344
@@ -188,7 +188,7 @@
    * @return string
    *   An HTML string containing a link to the entity.
    *
-   * @deprecated in Drupal 8.0.0, intended to be removed in Drupal 9.0.0
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Core\EntityInterface::toLink()->toString() instead.
    *
    * @see https://www.drupal.org/node/2614344
--- a/core/lib/Drupal/Core/Entity/EntityFormInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityFormInterface.php
@@ -133,7 +133,7 @@
    *
    * @return $this
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *
    * @todo Remove this set call in https://www.drupal.org/node/2603542.
    */
--- a/core/lib/Drupal/Core/Entity/EntityForm.php
+++ b/core/lib/Drupal/Core/Entity/EntityForm.php
@@ -37,7 +37,7 @@
    *
    * @var \Drupal\Core\Entity\EntityManagerInterface
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *
    * @see https://www.drupal.org/node/2549139
    */
--- a/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php
@@ -109,7 +109,7 @@
    *   apply some other process, such as a custom update function or a
    *   migration via the Migrate module.
    *
-   * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
    *    \Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface::getChangeList()
    *    and execute each entity type and field storage update manually instead.
    *
--- a/core/lib/Drupal/Core/Entity/EntityBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityBase.php
@@ -69,7 +69,7 @@
    *
    * @return \Drupal\Core\Entity\EntityManagerInterface
    *
-   * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal::entityTypeManager() instead in most cases. If the needed
    *   method is not on \Drupal\Core\Entity\EntityTypeManagerInterface, see the
    *   deprecated \Drupal\Core\Entity\EntityManager to find the
--- a/core/lib/Drupal/Core/Entity/Entity.php
+++ b/core/lib/Drupal/Core/Entity/Entity.php
@@ -7,7 +7,7 @@
 /**
  * Defines a base entity class.
  *
- * @deprecated in Drupal 8.7.0 and will be removed in Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Entity\EntityBase instead.
  *
  * @see https://www.drupal.org/node/3021808
--- a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
@@ -597,7 +597,7 @@
    * @return \Drupal\Core\Entity\EntityInterface|null
    *   The specified entity revision or NULL if not found.
    *
-   * @deprecated in Drupal 8.5.x and will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
    *   \Drupal\Core\Entity\ContentEntityStorageBase::doLoadMultipleRevisionsFieldItems()
    *   should be implemented instead.
    *
--- a/core/lib/Drupal/Core/Database/Schema.php
+++ b/core/lib/Drupal/Core/Database/Schema.php
@@ -355,7 +355,7 @@
    * @throws \Drupal\Core\Database\SchemaObjectDoesNotExistException
    *   If the specified table or field doesn't exist.
    *
-   * @deprecated as of Drupal 8.7.x, will be removed in Drupal 9.0.0. Instead,
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Instead,
    *   call ::changeField() passing a full field specification.
    *
    * @see ::changeField()
@@ -373,7 +373,7 @@
    * @throws \Drupal\Core\Database\SchemaObjectDoesNotExistException
    *   If the specified table or field doesn't exist.
    *
-   * @deprecated as of Drupal 8.7.x, will be removed in Drupal 9.0.0. Instead,
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Instead,
    *   call ::changeField() passing a full field specification.
    *
    * @see ::changeField()
--- a/core/lib/Drupal/Core/Database/Query/SelectInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/SelectInterface.php
@@ -341,7 +341,7 @@
    * @return
    *   The unique alias that was assigned for this table.
    *
-   * @deprecated as of Drupal 8.1.x, will be removed in Drupal 9.0.0. Instead,
+   * @deprecated in drupal:8.1.0 and is removed from drupal:9.0.0. Instead,
    *   change the query to use leftJoin(). For instance:
    *   $injected_connection->query('A')->rightJoin('B') is identical to
    *   $injected_connection->query('B')->leftJoin('A'). This functionality has
--- a/core/lib/Drupal/Core/Controller/ControllerBase.php
+++ b/core/lib/Drupal/Core/Controller/ControllerBase.php
@@ -126,7 +126,7 @@
    * @return \Drupal\Core\Entity\EntityManagerInterface
    *   The entity manager service.
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Most of the time static::entityTypeManager() is supposed to be used
    *   instead.
    */
--- a/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php
+++ b/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php
@@ -15,7 +15,7 @@
  * @see \Drupal\simpletest\WebTestBase::setUp()
  * @see \Drupal\simpletest\KernelTestBase::containerBuild()
  *
- * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use Drupal\Core\Config\Development\ConfigSchemaChecker.
  */
 class ConfigSchemaChecker extends SchemaChecker {
--- a/core/lib/Drupal/Core/Config/FileStorageFactory.php
+++ b/core/lib/Drupal/Core/Config/FileStorageFactory.php
@@ -14,7 +14,7 @@
    *
    * @return \Drupal\Core\Config\FileStorage FileStorage
    *
-   * @deprecated in Drupal 8.0.x and will be removed before 9.0.0. Drupal core
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Drupal core
    * no longer creates an active directory.
    */
   public static function getActive() {
--- a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
@@ -222,7 +222,7 @@
   /**
    * Sorts the dependency graph by weight and alphabetically.
    *
-   * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.2.0 and is removed from drupal:9.0.0. Use
    * \Drupal\Core\Config\Entity\ConfigDependencyManager::prepareMultisort() and
    * array_multisort() instead.
    *
@@ -247,7 +247,7 @@
   /**
    * Sorts the dependency graph by reverse weight and alphabetically.
    *
-   * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.2.0 and is removed from drupal:9.0.0. Use
    * \Drupal\Core\Config\Entity\ConfigDependencyManager::prepareMultisort() and
    * array_multisort() instead.
    *
--- a/core/lib/Drupal/Core/Config/ConfigManagerInterface.php
+++ b/core/lib/Drupal/Core/Config/ConfigManagerInterface.php
@@ -35,7 +35,7 @@
    * @return \Drupal\Core\Entity\EntityManagerInterface
    *   The entity manager.
    *
-   * @deprecated in Drupal 8.7.x, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Core\Config\ConfigManagerInterface::getEntityTypeManager()
    *   instead.
    */
--- a/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php
+++ b/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php
@@ -48,7 +48,7 @@
    *
    * @return \Drupal\Core\Config\FileStorage
    *
-   * @deprecated in Drupal 8.0.x and will be removed before 9.0.0. Drupal core
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Drupal core
    * no longer creates an active directory.
    *
    * @throws \Exception
--- a/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
+++ b/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
@@ -410,7 +410,7 @@
   /**
    * Wraps \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface::isValidUri().
    *
-   * @deprecated in drupal:8.8.0 and will be removed before drupal:9.0.0. Use
+   * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface::isValidUri()
    *   instead.
    */
--- a/core/lib/Drupal/Core/Access/AccessResult.php
+++ b/core/lib/Drupal/Core/Access/AccessResult.php
@@ -286,7 +286,7 @@
    *
    * @return $this
    *
-   * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
    *   ::addCacheableDependency() instead.
    */
   public function cacheUntilEntityChanges(EntityInterface $entity) {
@@ -301,7 +301,7 @@
    *
    * @return $this
    *
-   * @deprecated in drupal:8.0.0 and is removed in drupal:9.0.0. Use
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
    *   \Drupal\Core\Access\AccessResult::addCacheableDependency() instead.
    */
   public function cacheUntilConfigurationChanges(ConfigBase $configuration) {
--- a/core/lib/Drupal/Component/Version/Constraint.php
+++ b/core/lib/Drupal/Component/Version/Constraint.php
@@ -61,7 +61,7 @@
    * @return array[]
    *   The constraint represented as an array.
    *
-   * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
    *   Only exists to provide a backwards compatibility layer.
    *
    * @see https://www.drupal.org/node/2756875
--- a/core/lib/Drupal/Component/Utility/Unicode.php
+++ b/core/lib/Drupal/Component/Utility/Unicode.php
@@ -123,7 +123,7 @@
    * @param int $status
    *   The new status of multibyte support.
    *
-   * @deprecated in Drupal 8.6.0 and will be removed before Drupal 9.0.0. In
+   * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. In
    *   Drupal 9 there will be no way to set the status and in Drupal 8 this
    *   ability has been removed because mb_*() functions are supplied using
    *   Symfony's polyfill.
@@ -260,7 +260,7 @@
    * @return int
    *   The length of the string.
    *
-   * @deprecated in Drupal 8.6.0, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
    *   mb_strlen() instead.
    *
    * @see https://www.drupal.org/node/2850048
@@ -279,7 +279,7 @@
    * @return string
    *   The string in uppercase.
    *
-   * @deprecated in Drupal 8.6.0, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
    *   mb_strtoupper() instead.
    *
    * @see https://www.drupal.org/node/2850048
@@ -298,7 +298,7 @@
    * @return string
    *   The string in lowercase.
    *
-   * @deprecated in Drupal 8.6.0, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
    *   mb_strtolower() instead.
    *
    * @see https://www.drupal.org/node/2850048
@@ -372,7 +372,7 @@
    * @return string
    *   The shortened string.
    *
-   * @deprecated in Drupal 8.6.0, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
    *   mb_substr() instead.
    *
    * @see https://www.drupal.org/node/2850048
@@ -557,7 +557,7 @@
    * @return string
    *   The flipped text.
    *
-   * @deprecated in Drupal 8.8.0, will be removed before Drupal 9.0.0. There is
+   * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. There is
    *   no direct replacement.
    *
    * @see https://www.drupal.org/node/3057322
@@ -617,7 +617,7 @@
    *   beginning (independent of $offset), or FALSE if not found. Note that
    *   a return value of 0 is not the same as FALSE.
    *
-   * @deprecated in Drupal 8.6.0, will be removed before Drupal 9.0.0. Use
+   * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
    *   mb_strpos() instead.
    *
    * @see https://www.drupal.org/node/2850048
--- a/core/lib/Drupal/Component/Utility/SafeMarkup.php
+++ b/core/lib/Drupal/Component/Utility/SafeMarkup.php
@@ -33,7 +33,7 @@
    * @return bool
    *   TRUE if the string has been marked secure, FALSE otherwise.
    *
-   * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Instead, you should just check if a variable is an instance of
    *   \Drupal\Component\Render\MarkupInterface.
    *
@@ -89,7 +89,7 @@
    * @see \Drupal\Component\Render\FormattableMarkup::placeholderFormat()
    * @see \Drupal\Component\Render\FormattableMarkup
    *
-   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal\Component\Render\FormattableMarkup.
    *
    * @see https://www.drupal.org/node/2549395
--- a/core/lib/Drupal/Component/Utility/Crypt.php
+++ b/core/lib/Drupal/Component/Utility/Crypt.php
@@ -28,7 +28,7 @@
    * @return string
    *   A randomly generated string.
    *
-   * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0.
    *   Use PHP's built-in random_bytes() function instead.
    *
    * @see https://www.drupal.org/node/3054488
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -263,7 +263,7 @@
    * @return \Drupal\Core\Entity\EntityManagerInterface
    *   The entity manager service.
    *
-   * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal::entityTypeManager() instead in most cases. If the needed
    *   method is not on \Drupal\Core\Entity\EntityTypeManagerInterface, see the
    *   deprecated \Drupal\Core\Entity\EntityManager to find the
@@ -573,7 +573,7 @@
    * @see \Drupal\Core\Url::fromRoute()
    * @see \Drupal\Core\Url::fromUri()
    *
-   * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Instead create a \Drupal\Core\Url object directly, for example using
    *   Url::fromRoute().
    */
--- a/core/includes/unicode.inc
+++ b/core/includes/unicode.inc
@@ -14,7 +14,7 @@
 /**
  * Moves unicode_requirements() logic to system_requirements().
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0.
  *
  * @see https://www.drupal.org/node/2884698
  */
@@ -85,7 +85,7 @@
  *
  * @ingroup php_wrappers
  *
- * @deprecated in Drupal 8.3.0 and will bre removed in Drupal 9.0.0. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  *   xml_parser_create() and
  *   xml_parser_set_option($xml_parser, XML_OPTION_TARGET_ENCODING, 'utf-8')
  *   instead.
--- a/core/includes/tablesort.inc
+++ b/core/includes/tablesort.inc
@@ -14,7 +14,7 @@
 /**
  * Initializes the table sort context.
  *
- * @deprecated as of Drupal 8.7.x and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Utility\TableSort::getContextFromRequest() instead.
  *
  * @see \Drupal\Core\Utility\TableSortInterface::getContextFromRequest()
@@ -40,7 +40,7 @@
  * @param array $ts
  *   The current table sort context as returned from tablesort_init().
  *
- * @deprecated as of Drupal 8.7.x and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Utility\TableSort::header() instead.
  *
  * @see \Drupal\Core\Utility\TableSortInterface::header()
@@ -58,7 +58,7 @@
  *   A URL query parameter array that consists of all components of the current
  *   page request except for those pertaining to table sorting.
  *
- * @deprecated as of Drupal 8.7.x and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Utility\TableSort::getQueryParameters() instead.
  *
  * @see \Drupal\Core\Utility\TableSort::getQueryParameters()
@@ -80,7 +80,7 @@
  *   - "name": The localized title of the table column.
  *   - "sql": The name of the database field to sort on.
  *
- * @deprecated as of Drupal 8.7.x and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Utility\TableSort::getOrder() instead.
  *
  * @see \Drupal\Core\Utility\TableSortInterface::getOrder()
@@ -100,7 +100,7 @@
  * @return
  *   The current sort direction ("asc" or "desc").
  *
- * @deprecated as of Drupal 8.7.x and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Utility\TableSort::getSort() instead.
  *
  * @see \Drupal\Core\Utility\TableSortInterface::getSort()
--- a/core/includes/schema.inc
+++ b/core/includes/schema.inc
@@ -218,7 +218,7 @@
  * @return mixed
  *   The converted value.
  *
- * @deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema::castValue() instead.
  *
  * @see https://www.drupal.org/node/3051983
--- a/core/includes/module.inc
+++ b/core/includes/module.inc
@@ -19,7 +19,7 @@
  *   For $type 'theme', the array values are objects representing the
  *   respective database row, with the 'info' property already unserialized.
  *
- * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal::service('theme_handler')->listInfo() instead.
  *
  * @see https://www.drupal.org/node/2709919
@@ -45,7 +45,7 @@
 /**
  * Resets all system_list() caches.
  *
- * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. There
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. There
  *   is no direct replacement. Call each
  *   \Drupal::service('extension.list.TYPE')->reset() as necessary.
  *
@@ -70,7 +70,7 @@
  *   The relative URI of the primary extension file; e.g.,
  *   'core/modules/node/node.module'.
  *
- * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0. There is
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. There is
  *   no replacement for this function. Use the following sequence of code to
  *   achieve the same functionality:
  *   @code
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -106,7 +106,7 @@
  * @see hook_menu_local_tasks_alter()
  * @see https://www.drupal.org/node/2544940
  *
- * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  */
 function menu_local_tasks($level = 0) {
   /** @var \Drupal\Core\Menu\LocalTaskManagerInterface $manager */
@@ -172,7 +172,7 @@
  * This should be called any time broad changes
  * might have been made to the router items or menu links.
  *
- * @deprecated in Drupal 8.6.0, will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Use
  *   \Drupal::cache('menu')->invalidateAll() instead.
  *
  * @see https://www.drupal.org/node/2989138
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -540,7 +540,7 @@
  * @return bool
  *   TRUE if the config directory exists and is writable.
  *
- * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.x. Use
+ * @deprecated in drupal:8.1.0 and is removed from drupal:9.0.0. Use
  *   config_get_config_directory() and
  *  \Drupal\Core\File\FileSystemInterface::prepareDirectory() instead.
  *
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -2287,7 +2287,7 @@
  *
  * @see _install_select_profile()
  *
- * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0. The
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. The
  *    install profile is written to core.extension.
  */
 function install_write_profile($install_state) {
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -20,7 +20,7 @@
 /**
  * Default mode for new directories.
  *
- * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystem::CHMOD_DIRECTORY.
  *
  * @see \Drupal\Core\File\FileSystemInterface::chmod()
@@ -31,7 +31,7 @@
 /**
  * Default mode for new files.
  *
- * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystem::CHMOD_FILE.
  *
  * @see \Drupal\Core\File\FileSystemInterface::chmod()
@@ -48,7 +48,7 @@
 /**
  * Flag used to create a directory if not present.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystemInterface::CREATE_DIRECTORY.
  */
 const FILE_CREATE_DIRECTORY = FileSystemInterface::CREATE_DIRECTORY;
@@ -56,7 +56,7 @@
 /**
  * Flag used to indicate file permissions may be changed.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystemInterface::MODIFY_PERMISSIONS.
  */
 const FILE_MODIFY_PERMISSIONS = FileSystemInterface::MODIFY_PERMISSIONS;
@@ -64,7 +64,7 @@
 /**
  * Flag for dealing with existing files: Appends number until name is unique.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystemInterface::EXISTS_RENAME.
  */
 const FILE_EXISTS_RENAME = FileSystemInterface::EXISTS_RENAME;
@@ -72,7 +72,7 @@
 /**
  * Flag for dealing with existing files: Replace the existing file.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystemInterface::EXISTS_REPLACE.
  */
 const FILE_EXISTS_REPLACE = FileSystemInterface::EXISTS_REPLACE;
@@ -80,7 +80,7 @@
 /**
  * Flag for dealing with existing files: Do nothing and return FALSE.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystemInterface::EXISTS_ERROR.
  */
 const FILE_EXISTS_ERROR = FileSystemInterface::EXISTS_ERROR;
@@ -98,7 +98,7 @@
 /**
  * Returns the scheme of a URI (e.g. a stream).
  *
- * @deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Core\StreamWrapper\StreamWrapperManagerInterface::getScheme()
  *   instead.
  *
@@ -112,7 +112,7 @@
 /**
  * Checks that the scheme of a stream URI is valid.
  *
- * @deprecated in drupal:8.8.0 and will be removed from Drupal 9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   Drupal\Core\StreamWrapper\StreamWrapperManagerInterface::isValidScheme()
  *   instead.
  *
@@ -134,7 +134,7 @@
  *   For example, the URI "public://sample/test.txt" would return
  *   "sample/test.txt".
  *
- * @deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface::getTarget()
  *   instead.
  *
@@ -151,7 +151,7 @@
  * @return string
  *   'public', 'private' or any other file scheme defined as the default.
  *
- * @deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   \Drupal::config('system.file')->get('default_scheme') instead.
  *
  * @see https://www.drupal.org/node/3049030
@@ -176,7 +176,7 @@
  * @return string
  *   The normalized URI.
  *
- * @deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface::normalizeUri()
  *   instead.
  *
@@ -316,7 +316,7 @@
  *   TRUE if the directory exists (or was created) and is writable. FALSE
  *   otherwise.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystemInterface::prepareDirectory().
  */
 function file_prepare_directory(&$directory, $options = FileSystemInterface::MODIFY_PERMISSIONS) {
@@ -387,7 +387,7 @@
  * @return string
  *   The desired contents of the .htaccess file.
  *
- * @deprecated in Drupal 8.0.x-dev and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Component\FileSecurity\FileSecurity::htaccessLines().
  *
  * @see https://www.drupal.org/node/2418133
@@ -409,7 +409,7 @@
  * @return
  *   TRUE if the URI is allowed.
  *
- * @deprecated in drupal:8.8.0 and will be removed before drupal:9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface::isValidUri()
  *   instead.
  *
@@ -451,7 +451,7 @@
  * @return
  *   The path to the new file, or FALSE in the event of an error.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystemInterface::copy().
  *
  * @see file_copy()
@@ -500,7 +500,7 @@
  * @return
  *   TRUE, or FALSE in the event of an error.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystemInterface::getDestinationFilename() instead.
  *
  * @see file_unmanaged_copy()
@@ -596,7 +596,7 @@
  *   The destination filepath, or FALSE if the file already exists
  *   and FILE_EXISTS_ERROR is specified.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystemInterface::getDestinationFilename().
  *
  * @see https://www.drupal.org/node/3006851
@@ -637,7 +637,7 @@
  * @return
  *   The path to the new file, or FALSE in the event of an error.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystemInterface::move().
  *
  * @see file_move()
@@ -756,7 +756,7 @@
  *   File path consisting of $directory and a unique filename based off
  *   of $basename.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystemInterface::createFilename().
  *
  * @see https://www.drupal.org/node/3006851
@@ -776,7 +776,7 @@
  * @param $fid
  *   The file id.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Entity\EntityStorageInterface::delete() instead.
  *
  * @see file_unmanaged_delete()
@@ -799,7 +799,7 @@
  * @param $fids
  *   An array of file ids.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Entity\EntityStorageInterface::delete() instead.
  *
  * @see file_unmanaged_delete()
@@ -827,7 +827,7 @@
  *   TRUE for success or path does not exist, or FALSE in the event of an
  *   error.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystemInterface::delete().
  *
  * @see file_delete()
@@ -867,7 +867,7 @@
  *   TRUE for success or if path does not exist, FALSE in the event of an
  *   error.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystemInterface::deleteRecursive().
  *
  * @see file_unmanaged_delete()
@@ -887,7 +887,7 @@
 /**
  * Moves an uploaded file to a new location.
  *
- * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystem::moveUploadedFile().
  *
  * @see https://www.drupal.org/node/2418133
@@ -921,7 +921,7 @@
  * @return
  *   A string with the path of the resulting file, or FALSE on error.
  *
- * @deprecated in Drupal 8.7.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystemInterface::saveData().
  *
  * @see file_save_data()
@@ -1008,7 +1008,7 @@
  *   A file size limit in bytes based on the PHP upload_max_filesize and
  *   post_max_size
  *
- * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Component\Utility\Environment::getUploadMaxSize() instead.
  */
 function file_upload_max_size() {
@@ -1019,7 +1019,7 @@
 /**
  * Sets the permissions on a file or directory.
  *
- * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystem::chmod().
  *
  * @see https://www.drupal.org/node/2418133
@@ -1032,7 +1032,7 @@
 /**
  * Deletes a file.
  *
- * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystem::unlink().
  *
  * @see \Drupal\Core\File\FileSystem::unlink()
@@ -1046,7 +1046,7 @@
 /**
  * Resolves the absolute filepath of a local URI or filepath.
  *
- * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystem::realpath().
  *
  * @see https://www.drupal.org/node/2418133
@@ -1059,7 +1059,7 @@
 /**
  * Gets the name of the directory from a given path.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystem::dirname().
  *
  * @see https://www.drupal.org/node/2418133
@@ -1072,7 +1072,7 @@
 /**
  * Gets the filename from a given path.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystem::basename().
  *
  * @see https://www.drupal.org/node/2418133
@@ -1086,7 +1086,7 @@
  * Creates a directory, optionally creating missing components in the path to
  * the directory.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystem::mkdir().
  *
  * @see https://www.drupal.org/node/2418133
@@ -1099,7 +1099,7 @@
 /**
  * Removes a directory.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystem::rmdir().
  *
  * @see https://www.drupal.org/node/2418133
@@ -1112,7 +1112,7 @@
 /**
  * Creates a file with a unique filename in the specified directory.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\File\FileSystem::tempnam().
  *
  * @see https://www.drupal.org/node/2418133
@@ -1145,7 +1145,7 @@
  * @return mixed
  *   A string containing the path to the temporary directory.
  *
- * @deprecated in Drupal 8.3.x-dev, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Component\FileSystem\FileSystem::getOsTemporaryDirectory().
  *
  * @see https://www.drupal.org/node/2418133
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -10,7 +10,7 @@
 /**
  * Clears the entity render cache for all entity types.
  *
- * @deprecated in Drupal 8.7.x and will be removed before Drupal 9.0.0. Instead,
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Instead,
  *   use \Drupal\Core\Entity\EntityViewBuilderInterface::resetCache() on the
  *   required entity types or invalidate specific cache tags.
  *
@@ -38,7 +38,7 @@
  * @return array
  *   The bundle info for a specific entity type, or all entity types.
  *
- * @deprecated in Drupal 8.x-dev and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Entity\EntityTypeBundleInfoInterface::getBundleInfo() for a
  *   single bundle, or
  *   \Drupal\Core\Entity\EntityTypeBundleInfoInterface::getAllBundleInfo() for
@@ -71,7 +71,7 @@
  * @return \Drupal\Core\Entity\EntityInterface|null
  *   The entity object, or NULL if there is no entity with the given ID.
  *
- * @deprecated in Drupal 8.0.x, will be removed before Drupal 9.0.0. Use the
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use the
  *   entity type storage's load() method.
  *
  * @see https://www.drupal.org/node/2266845
@@ -97,7 +97,7 @@
  *   The entity object, or NULL if there is no entity with the given revision
  *   id.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use the
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use the
  *   entity type storage's loadRevision() method.
  *
  * @see https://www.drupal.org/node/1818376
@@ -117,7 +117,7 @@
  * @param $revision_id
  *   The revision ID to delete.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use the
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use the
  *   entity type storage's deleteRevision() method.
  *
  * @see https://www.drupal.org/node/1818376
@@ -157,7 +157,7 @@
  * @return array
  *   An array of entity objects indexed by their IDs.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use the
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use the
  *   entity type storage's loadMultiple() method.
  *
  * @see https://www.drupal.org/node/2266845
@@ -184,7 +184,7 @@
  *   An array of entity objects indexed by their IDs. Returns an empty array if
  *   no matching entities are found.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use the
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use the
  *   entity type storage's loadByProperties() method.
  *
  * @see https://www.drupal.org/node/3050910
@@ -212,7 +212,7 @@
  * @return \Drupal\Core\Entity\EntityInterface|null
  *   The unchanged entity, or FALSE if the entity cannot be loaded.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use the
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use the
  *   entity type storage's loadUnchanged() method.
  *
  * @see https://www.drupal.org/node/1935744
@@ -232,7 +232,7 @@
  * @param array $ids
  *   An array of entity IDs of the entities to delete.
  *
- * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   the entity storage's delete() method to delete multiple entities:
  *   @code
  *     $storage_handler = \Drupal::entityTypeManager()->getStorage($entity_type);
@@ -264,7 +264,7 @@
  * @return \Drupal\Core\Entity\EntityInterface
  *   A new entity object.
  *
- * @deprecated in Drupal 8.0.x, will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   The method overriding Entity::create() for the entity type, e.g.
  *   \Drupal\node\Entity\Node::create() if the entity type is known. If the
  *   entity type is variable, use the entity storage's create() method to
@@ -297,7 +297,7 @@
  * @return string|null
  *   The label of the entity, or NULL if there is no label defined.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use the
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use the
  *   entity's label() method.
  *
  * @see https://www.drupal.org/node/2549923
@@ -325,7 +325,7 @@
  * @return array
  *   A render array for the entity.
  *
- * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use the entity view builder's view() method for creating a render array:
  *   @code
  *     $view_builder = \Drupal::entityTypeManager()
@@ -364,7 +364,7 @@
  *   A render array for the entities, indexed by the same keys as the
  *   entities array passed in $entities.
  *
- * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use the entity view builder's viewMultiple() method for creating a render
  *   array for the provided entities:
  *   @code
@@ -425,7 +425,7 @@
  * @return \Drupal\Core\Entity\Display\EntityViewDisplayInterface
  *   The entity view display associated with the view mode.
  *
- * @deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   EntityDisplayRepositoryInterface::getViewDisplay() instead.
  *
  * @see https://www.drupal.org/node/2835616
@@ -471,7 +471,7 @@
  * @return \Drupal\Core\Entity\Display\EntityFormDisplayInterface
  *   The entity form display associated with the given form mode.
  *
- * @deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   EntityDisplayRepositoryInterface::getFormDisplay() instead.
  *
  * @see https://www.drupal.org/node/2835616
--- a/core/includes/database.inc
+++ b/core/includes/database.inc
@@ -45,7 +45,7 @@
  * @return \Drupal\Core\Database\StatementInterface
  *   A prepared statement object, already executed.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container
  *   and call query() on it. For example,
  *   $injected_database->query($query, $args, $options);
@@ -81,7 +81,7 @@
  * @return \Drupal\Core\Database\StatementInterface
  *   A prepared statement object, already executed.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container
  *   and call queryRange() on it. For example,
  *   $injected_database->queryRange($query, $from, $count, $args, $options);
@@ -115,7 +115,7 @@
  * @return string
  *   The name of the temporary table.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container
  *   and call queryTemporary() on it. For example,
  *   $injected_database->queryTemporary($query, $args, $options);
@@ -140,7 +140,7 @@
  * @return \Drupal\Core\Database\Query\Insert
  *   A new Insert object for this connection.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get
  *   a database connection injected into your service from the container and
  *   call insert() on it. For example,
  *   $injected_database->insert($table, $options);
@@ -165,7 +165,7 @@
  * @return \Drupal\Core\Database\Query\Merge
  *   A new Merge object for this connection.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get
  *   a database connection injected into your service from the container and
  *   call merge() on it. For example,
  *   $injected_database->merge($table, $options);
@@ -190,7 +190,7 @@
  * @return \Drupal\Core\Database\Query\Update
  *   A new Update object for this connection.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get
  *   a database connection injected into your service from the container and
  *   call update() on it. For example,
  *   $injected_database->update($table, $options);
@@ -215,7 +215,7 @@
  * @return \Drupal\Core\Database\Query\Delete
  *   A new Delete object for this connection.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get
  *   a database connection injected into your service from the container and
  *   call delete() on it. For example,
  *   $injected_database->delete($table, $options);
@@ -240,7 +240,7 @@
  * @return \Drupal\Core\Database\Query\Truncate
  *   A new Truncate object for this connection.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get
  *   a database connection injected into your service from the container and
  *   call truncate() on it. For example,
  *   $injected_database->truncate($table, $options);
@@ -269,7 +269,7 @@
  * @return \Drupal\Core\Database\Query\Select
  *   A new Select object for this connection.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get
  *   a database connection injected into your service from the container and
  *   call select() on it. For example,
  *   $injected_database->select($table, $alias, $options);
@@ -295,7 +295,7 @@
  * @return \Drupal\Core\Database\Transaction
  *   A new Transaction object for this connection.
  *
- * @deprecated in drupal:8.0.x and will be removed from drupal:9.0.0. Instead, get
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get
  *   a database connection injected into your service from the container and
  *   call startTransaction() on it. For example,
  *   $injected_database->startTransaction($name);
@@ -318,7 +318,7 @@
  * @return string|null
  *   The key of the formerly active database.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  * \Drupal\Core\Database\Database::setActiveConnection().
  *
  * @see https://www.drupal.org/node/2993033
@@ -339,7 +339,7 @@
  * @return string
  *   The escaped table name as a string.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container
  *   and call escapeTable() on it. For example,
  *   $injected_database->escapeTable($table);
@@ -363,7 +363,7 @@
  * @return string
  *   The escaped field name as a string.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container
  *   and call escapeField() on it. For example,
  *   $injected_database->escapeField($field);
@@ -407,7 +407,7 @@
  * @return string
  *   The escaped string.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container
  *   and call escapeLike() on it. For example,
  *   $injected_database->escapeLike($string);
@@ -426,7 +426,7 @@
  * @return string
  *   The name of the currently active database driver.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container
  *   and call driver() on it. For example, $injected_database->driver($string);
  *
@@ -445,7 +445,7 @@
  *   An array of options to control which connection is closed. Only the target
  *   key has any meaning in this case.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Database\Database::closeConnection($target).
  *
  * @see https://www.drupal.org/node/2993033
@@ -474,7 +474,7 @@
  *
  * @internal
  *
- * @deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. There is
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. There is
  *   no replacement, this function should not be used. It was introduced in
  *   Drupal 8.8.0 only as a byproduct of the deprecation of the db_* procedural
  *   functions.
@@ -506,7 +506,7 @@
  * @return int
  *   An integer number larger than any number returned before for this sequence.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container
  *   and call nextId() on it.
  *   For example, $injected_database->nextId($existing_id);
@@ -525,7 +525,7 @@
  * @return \Drupal\Core\Database\Query\Condition
  *   A new Condition object, set to "OR" all conditions together.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Create
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Create
  *   a \Drupal\Core\Database\Query\Condition object, specifying an OR
  *   conjunction: new Condition('OR');
  *
@@ -543,7 +543,7 @@
  * @return \Drupal\Core\Database\Query\Condition
  *   A new Condition object, set to "AND" all conditions together.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Create
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Create
  *   a \Drupal\Core\Database\Query\Condition object, specifying an AND
  *   conjunction: new Condition('AND');
  *
@@ -561,7 +561,7 @@
  * @return \Drupal\Core\Database\Query\Condition
  *   A new Condition object, set to "XOR" all conditions together.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Create
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Create
  *   a \Drupal\Core\Database\Query\Condition object, specifying a XOR
  *   conjunction: new Condition('XOR');
  *
@@ -586,7 +586,7 @@
  * @return \Drupal\Core\Database\Query\Condition
  *   A new Condition object, set to the specified conjunction.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Create
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Create
  *   a \Drupal\Core\Database\Query\Condition object, specifying the desired
  *   conjunction: new Condition($conjunction);
  *
@@ -616,7 +616,7 @@
  * @param array $table
  *   A Schema API table definition array.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call createTable() on it. For example,
  *   $injected_database->schema()->createTable($name, $table);
@@ -641,7 +641,7 @@
  * @return array
  *   An array of field names.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call fieldNames() on it. For example,
  *   $injected_database->schema()->fieldNames($fields);
@@ -665,7 +665,7 @@
  * @return bool
  *   TRUE if the given index exists, otherwise FALSE.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call indexExists() on it. For example,
  *   $injected_database->schema()->indexExists($table, $name);
@@ -687,7 +687,7 @@
  * @return bool
  *   TRUE if the given table exists, otherwise FALSE.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call tableExists() on it. For example,
  *   $injected_database->schema()->tableExists($table);
@@ -715,7 +715,7 @@
  * @return bool
  *   TRUE if the given column exists, otherwise FALSE.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call fieldExists() on it. For example,
  *   $injected_database->schema()->fieldExists($table, $field);
@@ -737,7 +737,7 @@
  * @return array
  *   Array, both the keys and the values are the matching tables.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call findTables() on it. For example,
  *   $injected_database->schema()->findTables($table_expression);
@@ -761,7 +761,7 @@
  * @param $new_name
  *   The new name for the table.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call renameTable() on it. For example,
  *   $injected_database->schema()->renameTable($table, $new_name);
@@ -780,7 +780,7 @@
  * @param $table
  *   The table to be dropped.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call dropTable() on it. For example,
  *   $injected_database->schema()->dropTable($table);
@@ -812,7 +812,7 @@
  *   MUST specify at least one key or index including it in this array. See
  *   \Drupal\Core\Database\Schema::changeField() for more explanation why.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call addField() on it. For example,
  *   $injected_database->schema()->addField($table, $field, $spec, $keys_new);
@@ -838,7 +838,7 @@
  *   TRUE if the field was successfully dropped, FALSE if there was no field by
  *   that name to begin with.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call dropField() on it. For example,
  *   $injected_database->schema()->dropField($table, $field);
@@ -861,7 +861,7 @@
  * @param $default
  *   Default value to be set. NULL for 'default NULL'.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call changeField() on it, passing a full field
  *   specification. For example,
@@ -884,7 +884,7 @@
  * @param $field
  *   The field to be altered.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call changeField() on it, passing a full field
  *   specification. For example,
@@ -907,7 +907,7 @@
  * @param $fields
  *   Array of fields for the primary key.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call addPrimaryKey() on it. For example,
  *   $injected_database->schema()->addPrimaryKey($table, $fields);
@@ -930,7 +930,7 @@
  *   TRUE if the primary key was successfully dropped, FALSE if there was no
  *   primary key on this table to begin with.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call dropPrimaryKey() on it. For example,
  *   $injected_database->schema()->dropPrimaryKey($table);
@@ -953,7 +953,7 @@
  * @param array $fields
  *   An array of field names.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call addUniqueKey() on it. For example,
  *   $injected_database->schema()->addUniqueKey($table, $name, $fields);
@@ -978,7 +978,7 @@
  *   TRUE if the key was successfully dropped, FALSE if there was no key by
  *   that name to begin with.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call dropUniqueKey() on it. For example,
  *   $injected_database->schema()->dropUniqueKey($table, $name);
@@ -1005,7 +1005,7 @@
  *   definition. See \Drupal\Core\Database\Schema::addIndex() for how to obtain
  *   this specification.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call addIndex() on it. For example,
  *   $injected_database->schema()->addIndex($table, $name, $fields, $spec);
@@ -1032,7 +1032,7 @@
  *   TRUE if the index was successfully dropped, FALSE if there was no index
  *   by that name to begin with.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call dropIndex() on it. For example,
  *   $injected_database->schema()->dropIndex($table, $name);
@@ -1108,7 +1108,7 @@
  *   with changing the field. The format is the same as a table specification
  *   but without the 'fields' element.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container,
  *   get its schema driver, and call changeField() on it. For example,
  *   $injected_database->schema()
@@ -1131,7 +1131,7 @@
  * server (A replica server is traditionally referred to as
  * a "slave" in database server documentation).
  *
- * @deprecated in drupal:8.7.0, will be removed from drupal:9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal::service('database.replica_kill_switch')->trigger() instead.
  *
  * @see https://www.drupal.org/node/2997500
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -126,7 +126,7 @@
 /**
  * The delimiter used to split plural strings.
  *
- * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use Drupal\Component\Gettext\PoItem::DELIMITER instead.
  */
 const LOCALE_PLURAL_DELIMITER = PoItem::DELIMITER;
@@ -149,7 +149,7 @@
  *
  * @ingroup form_api
  *
- * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use the redirect.destination service.
  *
  * @see \Drupal\Core\EventSubscriber\RedirectResponseSubscriber::checkRedirectUrl()
@@ -174,7 +174,7 @@
  * @return bool
  *   TRUE if the address is in a valid format.
  *
- * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal::service('email.validator')->isValid().
  *
  * @see https://www.drupal.org/node/2912661
@@ -211,7 +211,7 @@
  *   Drupal\Core\Template\Attribute, call
  *   \Drupal\Component\Utility\UrlHelper::stripDangerousProtocols() instead.
  *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use UrlHelper::stripDangerousProtocols() or UrlHelper::filterBadProtocol()
  *   instead. UrlHelper::stripDangerousProtocols() can be used in conjunction
  *   with \Drupal\Component\Render\FormattableMarkup and an @variable
@@ -323,7 +323,7 @@
  * @return
  *   A translated date string in the requested format.
  *
- * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal::service('date.formatter')->format().
  *
  * @see \Drupal\Core\Datetime\DateFormatter::format()
@@ -343,7 +343,7 @@
  * @return string
  *   An ISO8601 formatted date.
  *
- * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   date('c', $date) instead.
  *
  * @see https://www.drupal.org/node/2999991
@@ -369,7 +369,7 @@
  *   A ; separated string ready for insertion in a HTTP header. No escaping is
  *   performed for HTML entities, so this string is not safe to be printed.
  *
- * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Render\HtmlResponseAttachmentsProcessor::formatHttpHeaderAttributes()
  *   instead.
  *
@@ -408,7 +408,7 @@
  *
  * @ingroup php_wrappers
  *
- * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Environment::setTimeLimit() instead.
  *
  * @see https://www.drupal.org/node/3000058
@@ -435,7 +435,7 @@
 /**
  * Deletes old cached CSS files.
  *
- * @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Asset\AssetCollectionOptimizerInterface::deleteAll().
  *
  * @see https://www.drupal.org/node/2317841
@@ -754,7 +754,7 @@
 /**
  * Deletes old cached JavaScript files and variables.
  *
- * @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Asset\AssetCollectionOptimizerInterface::deleteAll().
  *
  * @see https://www.drupal.org/node/2317841
@@ -766,7 +766,7 @@
 /**
  * Pre-render callback: Renders a link into #markup.
  *
- * @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Render\Element\Link::preRenderLink().
  */
 function drupal_pre_render_link($element) {
@@ -776,7 +776,7 @@
 /**
  * Pre-render callback: Collects child links into a single array.
  *
- * @deprecated in drupal:8.0.0 and will be removed before drupal:9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Render\Element\Link::preRenderLinks() instead.
  *
  * @see https://www.drupal.org/node/2966725
@@ -789,7 +789,7 @@
 /**
  * Renders final HTML given a structured array tree.
  *
- * @deprecated as of drupal:8.0.0 and is removed from drupal:9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Render\RendererInterface::renderRoot() instead.
  *
  * @see \Drupal\Core\Render\RendererInterface::renderRoot()
@@ -803,7 +803,7 @@
 /**
  * Renders HTML given a structured array tree.
  *
- * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0. Use the
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use the
  *   'renderer' service instead.
  *
  * @see \Drupal\Core\Render\RendererInterface::render()
@@ -826,7 +826,7 @@
  * @return string|\Drupal\Component\Render\MarkupInterface
  *   The rendered HTML of all children of the element.
  *
- * @deprecated in Drupal 8.0.x and will be removed before 9.0.0. Avoid early
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Avoid early
  *   rendering when possible or loop through the elements and render them as
  *   they are available.
  *
@@ -943,7 +943,7 @@
  * @param $type
  *   An element type as defined by an element plugin.
  *
- * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal::service('element_info')->getInfo() instead.
  *
  * @see https://www.drupal.org/node/2235461
@@ -963,7 +963,7 @@
  *   (Optional) The value to return if the element type does not specify a
  *   value for the property. Defaults to NULL.
  *
- * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal::service('element_info')->getInfoProperty() instead.
  *
  * @see https://www.drupal.org/node/2235461
@@ -1144,7 +1144,7 @@
  *   NULL if compatible, otherwise the original dependency version string that
  *   caused the incompatibility.
  *
- * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Extension\Dependency::isCompatible() instead.
  *
  * @see https://www.drupal.org/node/2756875
@@ -1167,7 +1167,7 @@
  *   A space-separated string of extensions suitable for use by the file
  *   validation system.
  *
- * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Archiver\ArchiverManager::getExtensions() instead.
  *
  * @see https://www.drupal.org/node/2999951
@@ -1192,7 +1192,7 @@
  * @throws \Exception
  *   If a remote stream wrapper path was passed.
  *
- * @deprecated in Drupal 8.8.0 and will be removed before Drupal 9.0.0. Instead,
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Instead,
  *   get plugin.manager.archiver service from container and call getInstance()
  *   method on it. For example $archiver->getInstance(['filepath' => $file]);
  *
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -96,7 +96,7 @@
 /**
  * Role ID for anonymous users; should match what's in the "role" table.
  *
- * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use Drupal\Core\Session\AccountInterface::ANONYMOUS_ROLE or
  *   \Drupal\user\RoleInterface::ANONYMOUS_ID instead.
  *
@@ -107,7 +107,7 @@
 /**
  * Role ID for authenticated users; should match what's in the "role" table.
  *
- * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use Drupal\Core\Session\AccountInterface::AUTHENTICATED_ROLE or
  *   \Drupal\user\RoleInterface::AUTHENTICATED_ID instead.
  *
@@ -130,7 +130,7 @@
  * @see http://php.net/manual/reserved.variables.server.php
  * @see http://php.net/manual/function.time.php
  *
- * @deprecated in Drupal 8.3.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
  *   Use \Drupal::time()->getRequestTime();
  *
  * @see https://www.drupal.org/node/2785211
@@ -149,7 +149,7 @@
  *
  * @see config_get_config_directory()
  *
- * @deprecated in Drupal 8.0.x and will be removed before 9.0.0. Drupal core no
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Drupal core no
  *   longer creates an active directory.
  *
  * @see https://www.drupal.org/node/2501187
@@ -172,7 +172,7 @@
  * @see config_get_config_directory()
  * @see CONFIG_SYNC_DIRECTORY
  *
- * @deprecated in Drupal 8.0.x and will be removed before 9.0.0. The staging
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. The staging
  *   directory was renamed to sync.
  *
  * @see https://www.drupal.org/node/2574957
@@ -394,7 +394,7 @@
  *
  * @see \Drupal\Component\Utility\Unicode::validateUtf8()
  *
- * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Component\Utility\Unicode::validateUtf8().
  *
  * @see https://www.drupal.org/node/1992584
@@ -495,7 +495,7 @@
  * @see status-messages.html.twig
  * @see https://www.drupal.org/node/2774931
  *
- * @deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Messenger\MessengerInterface::addMessage() instead.
  */
 function drupal_set_message($message = NULL, $type = 'status', $repeat = FALSE) {
@@ -533,7 +533,7 @@
  * @see status-messages.html.twig
  * @see https://www.drupal.org/node/2774931
  *
- * @deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
  *   Use \Drupal\Core\Messenger\MessengerInterface::all() or
  *   \Drupal\Core\Messenger\MessengerInterface::messagesByType() instead.
  */
@@ -565,7 +565,7 @@
  * @return string
  *   The name of the current user's timezone or the name of the default timezone.
  *
- * @deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. Use
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
  *   date_default_timezone_get() instead.
  *
  * @see https://www.drupal.org/node/3009387
@@ -817,7 +817,7 @@
  * @param string $path
  *   The relative path to the Drupal component in the filesystem.
  *
- * @deprecated in Drupal 8.8.0, will be removed before Drupal 9.0.0. Use the
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use the
  *   class loader as injected service instance to register the namespace:
  *   @code
  *   $this->classLoader->addPsr4('Drupal\\' . $name . '\\', \Drupal::root() . '/' . $path . '/src');
@@ -995,7 +995,7 @@
 /**
  * Formats text for emphasized display in a placeholder inside a sentence.
  *
- * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Component\Render\FormattableMarkup or Twig's "placeholder" filter
  *   instead. Note this method should not be used to simply emphasize a string
  *   and therefore has few valid use-cases. Note also, that this method does not