From 7c84c955fdb4dc006ff9acc7e0a7fcef4e6aa4e5 Mon Sep 17 00:00:00 2001 From: lcawl Date: Wed, 10 Jul 2024 13:34:31 -0700 Subject: [PATCH 1/6] Update banner for master doc versions --- integtest/spec/all_books_spec.rb | 2 +- lib/ES/Book.pm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integtest/spec/all_books_spec.rb b/integtest/spec/all_books_spec.rb index 35dffd848cea4..29b3d64cab13e 100644 --- a/integtest/spec/all_books_spec.rb +++ b/integtest/spec/all_books_spec.rb @@ -639,7 +639,7 @@ def self.setup_example(repo, lang, hash) it 'includes the prelim docs header' do expect(body).to include <<~HTML
- You are looking at preliminary documentation for a future release. + You are looking at documentation that might contain both current Elastic Cloud serverless and future Elastic Stack and Cloud details. Not what you want? See the current release documentation.
diff --git a/lib/ES/Book.pm b/lib/ES/Book.pm index 0648f64113bd8..9dc40ff000c4e 100644 --- a/lib/ES/Book.pm +++ b/lib/ES/Book.pm @@ -25,7 +25,7 @@ will be released for this version. For the latest information, see the current release documentation. HEADER new => <<"HEADER" -You are looking at preliminary documentation for a future release. +You are looking at documentation that might contain both current Elastic Cloud serverless and future Elastic Stack and Cloud details. Not what you want? See the current release documentation. HEADER @@ -52,7 +52,7 @@ will be released for this version. For the latest information, see the current release documentation. HEADER new => <<"HEADER" -You are looking at preliminary documentation for a future release. +You are looking at documentation that might contain both current Elastic Cloud serverless and future Elastic Stack and Cloud details. Not what you want? See the current release documentation. HEADER @@ -68,7 +68,7 @@ will be released for this version. For the latest information, see the current release documentation. HEADER new => <<"HEADER" -You are looking at preliminary documentation for a future release. +You are looking at documentation that might contain both current Elastic Cloud serverless and future Elastic Stack and Cloud details. Not what you want? See the current release documentation. HEADER From dd8a3c463fe59d358683468f7ea927f1dc0b3516 Mon Sep 17 00:00:00 2001 From: lcawl Date: Thu, 11 Jul 2024 12:36:15 -0700 Subject: [PATCH 2/6] Edit banner text --- integtest/spec/all_books_spec.rb | 6 +++--- lib/ES/Book.pm | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/integtest/spec/all_books_spec.rb b/integtest/spec/all_books_spec.rb index 29b3d64cab13e..748e1275ef105 100644 --- a/integtest/spec/all_books_spec.rb +++ b/integtest/spec/all_books_spec.rb @@ -639,9 +639,9 @@ def self.setup_example(repo, lang, hash) it 'includes the prelim docs header' do expect(body).to include <<~HTML
- You are looking at documentation that might contain both current Elastic Cloud serverless and future Elastic Stack and Cloud details. - Not what you want? See the - current release documentation. + This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. + + This documentation also contains the latest Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs.
HTML end diff --git a/lib/ES/Book.pm b/lib/ES/Book.pm index 9dc40ff000c4e..f691b467030e4 100644 --- a/lib/ES/Book.pm +++ b/lib/ES/Book.pm @@ -25,9 +25,9 @@ will be released for this version. For the latest information, see the current release documentation. HEADER new => <<"HEADER" -You are looking at documentation that might contain both current Elastic Cloud serverless and future Elastic Stack and Cloud details. -Not what you want? See the -current release documentation. +This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. + +This documentation also contains the latest Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs. HEADER }, zh_cn => { @@ -52,9 +52,9 @@ will be released for this version. For the latest information, see the current release documentation. HEADER new => <<"HEADER" -You are looking at documentation that might contain both current Elastic Cloud serverless and future Elastic Stack and Cloud details. -Not what you want? See the -current release documentation. +This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. + +This documentation also contains the latest Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs. HEADER }, ko => { @@ -68,9 +68,9 @@ will be released for this version. For the latest information, see the current release documentation. HEADER new => <<"HEADER" -You are looking at documentation that might contain both current Elastic Cloud serverless and future Elastic Stack and Cloud details. -Not what you want? See the -current release documentation. +This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. + +This documentation also contains the latest Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs. HEADER } From 2d4677cd491be117ace5fb3d740f810a1a77cee3 Mon Sep 17 00:00:00 2001 From: lcawl Date: Mon, 15 Jul 2024 09:00:57 -0700 Subject: [PATCH 3/6] Fix trailing whitespace error --- integtest/spec/all_books_spec.rb | 5 ++--- lib/ES/Book.pm | 15 ++++++--------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/integtest/spec/all_books_spec.rb b/integtest/spec/all_books_spec.rb index 748e1275ef105..f2f35dbc77259 100644 --- a/integtest/spec/all_books_spec.rb +++ b/integtest/spec/all_books_spec.rb @@ -639,9 +639,8 @@ def self.setup_example(repo, lang, hash) it 'includes the prelim docs header' do expect(body).to include <<~HTML
- This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. - - This documentation also contains the latest Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs. +

This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs.

+

This documentation also contains the latest Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs.

HTML end diff --git a/lib/ES/Book.pm b/lib/ES/Book.pm index f691b467030e4..65aefe75b5cec 100644 --- a/lib/ES/Book.pm +++ b/lib/ES/Book.pm @@ -25,9 +25,8 @@ will be released for this version. For the latest information, see the current release documentation. HEADER new => <<"HEADER" -This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. - -This documentation also contains the latest Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs. +

This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs.

+

This documentation also contains the latest Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs.

HEADER }, zh_cn => { @@ -52,9 +51,8 @@ will be released for this version. For the latest information, see the current release documentation. HEADER new => <<"HEADER" -This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. - -This documentation also contains the latest Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs. +

This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs.

+

This documentation also contains the latest Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs.

HEADER }, ko => { @@ -68,9 +66,8 @@ will be released for this version. For the latest information, see the current release documentation. HEADER new => <<"HEADER" -This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. - -This documentation also contains the latest Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs. +

This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs.

+

This documentation also contains the latest Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs.

HEADER } From 941ee9d5a4c59495c0fe1e25404288b262c50aa4 Mon Sep 17 00:00:00 2001 From: lcawl Date: Mon, 15 Jul 2024 09:31:01 -0700 Subject: [PATCH 4/6] Update text in integtest --- integtest/spec/all_books_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integtest/spec/all_books_spec.rb b/integtest/spec/all_books_spec.rb index f2f35dbc77259..c2e54685bd302 100644 --- a/integtest/spec/all_books_spec.rb +++ b/integtest/spec/all_books_spec.rb @@ -974,7 +974,7 @@ def self.setup shared_examples 'future version' do it 'contains a "future" header' do expect(body).to include('
') - expect(body).to include('You are looking at preliminary documentation') + expect(body).to include('This documentation contains work-in-progress') end end shared_examples 'past version' do From 697a7196b1c5c373e6e67aecf5d8f5a6d2aa2196 Mon Sep 17 00:00:00 2001 From: lcawl Date: Mon, 15 Jul 2024 11:47:32 -0700 Subject: [PATCH 5/6] Prune banner text --- integtest/spec/all_books_spec.rb | 3 +-- lib/ES/Book.pm | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/integtest/spec/all_books_spec.rb b/integtest/spec/all_books_spec.rb index c2e54685bd302..f00395545f596 100644 --- a/integtest/spec/all_books_spec.rb +++ b/integtest/spec/all_books_spec.rb @@ -639,8 +639,7 @@ def self.setup_example(repo, lang, hash) it 'includes the prelim docs header' do expect(body).to include <<~HTML
-

This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs.

-

This documentation also contains the latest Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs.

+ This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. It also contains some Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs.
HTML end diff --git a/lib/ES/Book.pm b/lib/ES/Book.pm index 65aefe75b5cec..9ef7552154bff 100644 --- a/lib/ES/Book.pm +++ b/lib/ES/Book.pm @@ -25,8 +25,7 @@ will be released for this version. For the latest information, see the current release documentation. HEADER new => <<"HEADER" -

This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs.

-

This documentation also contains the latest Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs.

+This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. It also contains some Elastic Cloud serverless information. Check out our serverless docs for more details. HEADER }, zh_cn => { @@ -51,8 +50,7 @@ will be released for this version. For the latest information, see the current release documentation. HEADER new => <<"HEADER" -

This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs.

-

This documentation also contains the latest Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs.

+This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. It also contains some Elastic Cloud serverless information. Check out our serverless docs for more details. HEADER }, ko => { @@ -66,8 +64,7 @@ will be released for this version. For the latest information, see the current release documentation. HEADER new => <<"HEADER" -

This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs.

-

This documentation also contains the latest Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs.

+This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. It also contains some Elastic Cloud serverless information. Check out our serverless docs for more details. HEADER } From 989c4b4768eeb6c0f22f8bc924f481cdecf0b2c9 Mon Sep 17 00:00:00 2001 From: lcawl Date: Mon, 15 Jul 2024 12:04:13 -0700 Subject: [PATCH 6/6] Missed edit --- integtest/spec/all_books_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integtest/spec/all_books_spec.rb b/integtest/spec/all_books_spec.rb index f00395545f596..9a4164769f8a4 100644 --- a/integtest/spec/all_books_spec.rb +++ b/integtest/spec/all_books_spec.rb @@ -639,7 +639,7 @@ def self.setup_example(repo, lang, hash) it 'includes the prelim docs header' do expect(body).to include <<~HTML
- This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. It also contains some Elastic Cloud serverless information. For our serverless-specific documentation, check out our serverless docs. + This documentation contains work-in-progress information for future Elastic Stack and Cloud releases. Use the version selector to view supported release docs. It also contains some Elastic Cloud serverless information. Check out our serverless docs for more details.
HTML end