docs: add support for mickledore (4.2) release

This adds support for the Mickledore (4.2) release and update the
current dev branch to Nanbield.

(From yocto-docs rev: 5321befbfdc014d469b298bdd5b31d684231b2cb)

Signed-off-by: Michael Halstead <mhalstead@linuxfoundation.org>
Reviewed-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 10 insertions, 8 deletions

diff --git a/documentation/poky.yaml.in b/documentation/poky.yaml.in
index 1c072c1d05..b2b6a6330f 100644
--- a/documentation/poky.yaml.in
+++ b/documentation/poky.yaml.in
@@ -1,10 +1,10 @@
-DISTRO : "4.1"
-DISTRO_NAME_NO_CAP : "langdale"
-DISTRO_NAME : "Langdale"
-DISTRO_NAME_NO_CAP_MINUS_ONE : "kirkstone"
+DISTRO : "4.2"
+DISTRO_NAME_NO_CAP : "mickledore"
+DISTRO_NAME : "Mickledore"
+DISTRO_NAME_NO_CAP_MINUS_ONE : "langdale"
 DISTRO_NAME_NO_CAP_LTS : "kirkstone"
-YOCTO_DOC_VERSION : "4.1"
-DISTRO_REL_TAG : "yocto-4.1"
+YOCTO_DOC_VERSION : "4.2"
+DISTRO_REL_TAG : "yocto-4.2"
 DOCCONF_VERSION : "dev"
 BITBAKE_SERIES : ""
 YOCTO_DL_URL : "https://downloads.yoctoproject.org"
diff --git a/documentation/set_versions.py b/documentation/set_versions.py
index efaebe43b5..354dabe618 100755
--- a/documentation/set_versions.py
+++ b/documentation/set_versions.py
@@ -26,8 +26,8 @@ ourversion = None
 if len(sys.argv) == 2:
     ourversion = sys.argv[1]
 
-activereleases = ["langdale", "kirkstone", "dunfell"]
-devbranch = "mickledore"
+activereleases = ["mickledore", "kirkstone", "dunfell"]
+devbranch = "nanbield"
 ltsseries = ["kirkstone", "dunfell"]
 
 # used by run-docs-builds to get the default page
@@ -36,6 +36,7 @@ if ourversion == "getlatest":
     sys.exit(0)
 
 release_series = collections.OrderedDict()
+release_series["nanbield"] = "4.3"
 release_series["mickledore"] = "4.2"
 release_series["langdale"] = "4.1"
 release_series["kirkstone"] = "4.0"
@@ -66,6 +67,7 @@ release_series["laverne"] = "0.9"
 
 
 bitbake_mapping = {
+    "nanbield" : "2.6",
     "mickledore" : "2.4",
     "langdale" : "2.2",
     "kirkstone" : "2.0",