elastic · stratoula · May 18, 2021 · May 13, 2021 · May 13, 2021 · May 13, 2021
diff --git a/docs/user/dashboard/timelion.asciidoc b/docs/user/dashboard/timelion.asciidoc
@@ -4,7 +4,7 @@
 Instead of using a visual editor to create charts, you define a graph by chaining functions together, using the *Timelion*-specific syntax. 
 The syntax enables some features that classical point series charts don't offer, such as pulling data from different indices or data sources into one graph.
 
-deprecated::[7.0.0,"*Timelion* is still supported. The *Timelion app* is deprecated in 7.0, replaced by dashboard features. In 8.0 and later, the *Timelion app* is removed from {kib}. To prepare for the removal of *Timelion app*, you must migrate *Timelion app* worksheets to a dashboard. For information on how to migrate *Timelion app* worksheets, refer to the link:https://www.elastic.co/guide/en/kibana/7.10/release-notes-7.10.0.html#deprecation-v7.10.0[7.10.0 Release Notes]."]
+deprecated::[7.0.0,"*Timelion* is still supported. The *Timelion app* is deprecated in 7.0, replaced by dashboard features. In the last 7.x minor version and later, the *Timelion app* is removed from {kib}. To prepare for the removal of *Timelion app*, you must migrate *Timelion app* worksheets to a dashboard. For information on how to migrate *Timelion app* worksheets, refer to the link:https://www.elastic.co/guide/en/kibana/7.10/release-notes-7.10.0.html#deprecation-v7.10.0[7.10.0 Release Notes]."]
 
 [float]
 ==== Timelion expressions
@@ -554,4 +554,4 @@ Save and add the panel to the dashboard.
 
 . Click *Save and return*.
 
-For more information about *Timelion* conditions, refer to https://www.elastic.co/blog/timeseries-if-then-else-with-timelion[I have but one .condition()].
+For more information about *Timelion* conditions, refer to https://www.elastic.co/blog/timeseries-if-then-else-with-timelion[I have but one .condition()].
diff --git a/src/plugins/timelion/public/components/timelion_deprecation.tsx b/src/plugins/timelion/public/components/timelion_deprecation.tsx
@@ -19,7 +19,7 @@ export const TimelionDeprecation = ({ links }: DocLinksStart) => {
         title={
           <FormattedMessage
             id="timelion.deprecation.message"
-            defaultMessage="Deprecated since 7.0, the Timelion app will be removed in 8.0. To continue using your Timelion worksheets, {timeLionDeprecationLink}."
+            defaultMessage="Deprecated since 7.0, the Timelion app will be removed in the last 7.x minor version. To continue using your Timelion worksheets, {timeLionDeprecationLink}."
             values={{
               timeLionDeprecationLink: (
                 <EuiLink href={timelionDeprecationLink} target="_blank" external>

diff --git a/src/plugins/timelion/server/deprecations.ts b/src/plugins/timelion/server/deprecations.ts
@@ -30,7 +30,7 @@ export const showWarningMessageIfTimelionSheetWasFound = async (
   const count = await getTimelionSheetsCount(savedObjectsClient);
   if (count > 0) {
     logger.warn(
-      'Deprecated since 7.0, the Timelion app will be removed in 8.0. To continue using your Timelion worksheets, migrate them to a dashboard. See https://www.elastic.co/guide/en/kibana/current/create-panels-with-timelion.html.'
+      'Deprecated since 7.0, the Timelion app will be removed in the last 7.x minor version. To continue using your Timelion worksheets, migrate them to a dashboard. See https://www.elastic.co/guide/en/kibana/current/create-panels-with-timelion.html.'
     );
   }
 };
@@ -49,7 +49,7 @@ export async function getDeprecations({
 
   if (count > 0) {
     deprecations.push({
-      message: `You have ${count} Timelion worksheets. The Timelion app will be removed in 8.0. To continue using your Timelion worksheets, migrate them to a dashboard.`,
+      message: `You have ${count} Timelion worksheets. The Timelion app will be removed in the last 7.x minor version. To continue using your Timelion worksheets, migrate them to a dashboard.`,
       documentationUrl:
         'https://www.elastic.co/guide/en/kibana/current/create-panels-with-timelion.html',
       level: 'warning',

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -3770,7 +3770,6 @@
     "timelion.cells.actions.reorderTooltip": "ドラッグして並べ替え",
     "timelion.chart.seriesList.noSchemaWarning": "次のパネルタイプは存在しません：{renderType}",
     "timelion.deprecation.here": "ダッシュボードに移行します。",
-    "timelion.deprecation.message": "Timelionアプリは7.0以降で非推奨となっています。8.0では削除される予定です。Timelionワークシートを引き続き使用するには、{timeLionDeprecationLink}。",
     "timelion.emptyExpressionErrorMessage": "Timelion エラー：式が入力されていません",
     "timelion.expressionInputAriaLabel": "Timelion 式",
     "timelion.expressionInputPlaceholder": "{esQuery} でのクエリを試してみてください。",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -3796,7 +3796,6 @@
     "timelion.cells.actions.reorderTooltip": "拖动以重新排序",
     "timelion.chart.seriesList.noSchemaWarning": "没有此类面板类型：{renderType}",
     "timelion.deprecation.here": "请将其迁移至仪表板。",
-    "timelion.deprecation.message": "Timelion 应用自 7.0 版起已过时，将在 8.0 中移除。要继续使用 Timelion 工作表，{timeLionDeprecationLink}。",
     "timelion.emptyExpressionErrorMessage": "Timelion 错误：未提供表达式",
     "timelion.expressionInputAriaLabel": "Timelion 表达式",
     "timelion.expressionInputPlaceholder": "请尝试使用 {esQuery} 查询",