From 82d62f45c0f655232b01f195e9859c464c61ff55 Mon Sep 17 00:00:00 2001
From: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Date: Thu, 14 Oct 2021 21:49:38 +0200
Subject: [PATCH] Eliminate documentation link and make a manual fix more
 detailed.

---
 x-pack/plugins/security/server/config_deprecations.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/security/server/config_deprecations.ts b/x-pack/plugins/security/server/config_deprecations.ts
index e5bed341f2fc6..477bde81aa747 100644
--- a/x-pack/plugins/security/server/config_deprecations.ts
+++ b/x-pack/plugins/security/server/config_deprecations.ts
@@ -166,7 +166,7 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
     }
   },
   // Default values for session expiration timeouts.
-  (settings, fromPath, addDeprecation, { branch }) => {
+  (settings, fromPath, addDeprecation) => {
     if (settings?.xpack?.security?.session?.idleTimeout === undefined) {
       addDeprecation({
         level: 'warning',
@@ -177,11 +177,11 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
           defaultMessage:
             'User sessions will automatically time out after 1 hour of inactivity starting in 8.0. Override this value to change the timeout.',
         }),
-        documentationUrl: `https://www.elastic.co/guide/en/kibana/${branch}/xpack-security-session-management.html#session-idle-timeout`,
         correctiveActions: {
           manualSteps: [
             i18n.translate('xpack.security.deprecations.idleTimeout.manualStepOneMessage', {
-              defaultMessage: `To configure a custom timeout, set "xpack.security.session.idleTimeout". A value of 0 disables the timeout.`,
+              defaultMessage:
+                'To configure a custom timeout, set "xpack.security.session.idleTimeout". Use the format <count>[ms|s|m|h|d|w|M|Y], for example, 20m, 24h, 7d, 1w. A value of 0 disables the timeout.',
             }),
           ],
         },
@@ -198,11 +198,11 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
           defaultMessage:
             'Users are automatically required to log in again after 30 days starting in 8.0. Override this value to change the timeout.',
         }),
-        documentationUrl: `https://www.elastic.co/guide/en/kibana/${branch}/xpack-security-session-management.html#session-lifespan`,
         correctiveActions: {
           manualSteps: [
             i18n.translate('xpack.security.deprecations.lifespan.manualStepOneMessage', {
-              defaultMessage: `To configure a custom timeout, set "xpack.security.session.lifespan". A value of 0 disables the timeout.`,
+              defaultMessage:
+                'To configure a custom timeout, set "xpack.security.session.lifespan". Use the format <count>[ms|s|m|h|d|w|M|Y], for example, 20m, 24h, 7d, 1w. A value of 0 disables the timeout.',
             }),
           ],
         },