Merge pull request #2299 from debadair/master

elastic · Dec 7, 2021 · 68ec941 · 68ec941
2 parents 9509ecb + 6ff14c4
commit 68ec941
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/conf.yaml b/conf.yaml
@@ -67,10 +67,10 @@ contents_title:     Elastic Stack and Product Documentation
 #   <key>: &<variable> <value>
 # The keys don't really matter, but by convention the are the same as the variable.
 variables:
-  stackcurrent: &stackcurrent 7.15
-  stacklive: &stacklive [ master, 8.0, 7.16, 7.15, 6.8 ]
+  stackcurrent: &stackcurrent 7.16
+  stacklive: &stacklive [ master, 8.0, 7.16, 6.8 ]
 
-  stacklivemain: &stacklivemain [ main, 8.0, 7.16, 7.15, 6.8 ]
+  stacklivemain: &stacklivemain [ main, 8.0, 7.16, 6.8 ]
 
   cloudSaasCurrent: &cloudSaasCurrent ms-66
 

diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc
@@ -37,13 +37,13 @@
 :apm-server-ref-64:    https://www.elastic.co/guide/en/apm/server/6.4
 :apm-server-ref-70:    https://www.elastic.co/guide/en/apm/server/7.0
 ///////
-APM does not build n.x documentation. Links from .x branches should point to master instead
+Temporarily reroute APM Agent links to the new APM documentation book
 ///////
-ifeval::["{source_branch}"=="7.x"]
-:apm-server-ref:       {apm-server-ref-m}
-:apm-server-ref-v:     {apm-server-ref-m}
-:apm-overview-ref-v:   {apm-overview-ref-m}
-:apm-get-started-ref:  {apm-overview-ref-m}
+ifeval::["{branch}"=="7.16"]
+:apm-server-ref:       {apm-guide-ref}
+:apm-server-ref-v:     {apm-guide-ref}
+:apm-overview-ref-v:   {apm-guide-ref}
+:apm-get-started-ref:  {apm-guide-ref}
 endif::[]
 :apm-agents-ref:       https://www.elastic.co/guide/en/apm/agent
 :apm-py-ref:           https://www.elastic.co/guide/en/apm/agent/python/current

diff --git a/shared/versions/stack/7.15.asciidoc b/shared/versions/stack/7.15.asciidoc
@@ -22,7 +22,7 @@ release-state can be: released | prerelease | unreleased
 //////////
 is-current-version can be: true | false
 //////////
-:is-current-version:    true
+:is-current-version:    false
 
 //////////
 hide-xpack-tags defaults to "false" (they are shown unless set to "true")

diff --git a/shared/versions/stack/7.16.asciidoc b/shared/versions/stack/7.16.asciidoc
@@ -17,12 +17,12 @@ bare_version never includes -alpha or -beta
 //////////
 release-state can be: released | prerelease | unreleased
 //////////
-:release-state:          unreleased
+:release-state:          released
 
 //////////
 is-current-version can be: true | false
 //////////
-:is-current-version:    false
+:is-current-version:    true
 
 //////////
 hide-xpack-tags defaults to "false" (they are shown unless set to "true")

diff --git a/shared/versions/stack/current.asciidoc b/shared/versions/stack/current.asciidoc
@@ -1 +1 @@
-include::7.15.asciidoc[]
+include::7.16.asciidoc[]