friendly reminder: do not forget to cherry-pick to 3.10!

[maximiliankolb]

hi @theforeman/documentation-write

I just realized while opening a PR: we already have a "3.10" branch but it's not part of our template yet. I will check if we've missed some cherry-picked and report back. This issuse serves as a friendly reminder to all maintainers performing cherry-picks :)

✌️

[maximiliankolb]

I have cherry-picked all commits since Feb 15th/the commit "Revert ...":

$ git diff master
diff --git a/guides/common/attributes.adoc b/guides/common/attributes.adoc
index b20e5b5a24..b1c1b18935 100644
--- a/guides/common/attributes.adoc
+++ b/guides/common/attributes.adoc
@@ -1,11 +1,11 @@
 // Document state: "nightly" for master, "stable" for last two releases,
 // "unsupported" for the rest and "satellite" for satellite build
-:DocState: nightly
+:DocState: unsupported
 
 // Version numbers
 :ProjectVersion: nightly
-:ProjectVersionPrevious: 3.9
-:KatelloVersion: nightly
+:ProjectVersionPrevious: 3.10
+:KatelloVersion: 4.12

This looks correct to me unless there are some commits on master that are explicitely "3.11+ only".

PR: #2821 as expected, there were no merge conflicts.

[maximiliankolb]

I have also contacted Griffin who pointed to to the proper place to add an action item: theforeman/theforeman-rel-eng#348

[maximiliankolb]

Merged #2821 which leaves us with the following diff:

$ git diff --name-only master 3.10
guides/common/attributes.adoc

Closing this issue because the follow-up discussion will take place in theforeman/theforeman-rel-eng#348