diff --git a/documentation/bsp-guide/bsp-guide.xml b/documentation/bsp-guide/bsp-guide.xml
index a189606ce4..6ab89d6531 100755
--- a/documentation/bsp-guide/bsp-guide.xml
+++ b/documentation/bsp-guide/bsp-guide.xml
@@ -127,9 +127,14 @@
3.1
- &REL_MONTH_YEAR;
+ April 2020
Released with the Yocto Project 3.1 Release.
+
+ 3.1.1
+ &REL_MONTH_YEAR;
+ Released with the Yocto Project 3.1.1 Release.
+
diff --git a/documentation/dev-manual/dev-manual.xml b/documentation/dev-manual/dev-manual.xml
index 6f86454ede..5c6b3457f3 100755
--- a/documentation/dev-manual/dev-manual.xml
+++ b/documentation/dev-manual/dev-manual.xml
@@ -117,9 +117,14 @@
3.1
- &REL_MONTH_YEAR;
+ April 2020
Released with the Yocto Project 3.1 Release.
+
+ 3.1.1
+ &REL_MONTH_YEAR;
+ Released with the Yocto Project 3.1.1 Release.
+
diff --git a/documentation/mega-manual/mega-manual.xml b/documentation/mega-manual/mega-manual.xml
index e730f72596..a20843fc1d 100755
--- a/documentation/mega-manual/mega-manual.xml
+++ b/documentation/mega-manual/mega-manual.xml
@@ -93,9 +93,14 @@
3.1
- &REL_MONTH_YEAR;
+ April 2020
Released with the Yocto Project 3.1 Release.
+
+ 3.1.1
+ &REL_MONTH_YEAR;
+ Released with the Yocto Project 3.1.1 Release.
+
diff --git a/documentation/poky.ent b/documentation/poky.ent
index a54793911a..0a0deab8f3 100755
--- a/documentation/poky.ent
+++ b/documentation/poky.ent
@@ -1,17 +1,17 @@
-
-
+
+
-
+
-
+
-
+
-
-
+
+
diff --git a/documentation/profile-manual/profile-manual.xml b/documentation/profile-manual/profile-manual.xml
index fa1fa8ac80..710fb770e5 100755
--- a/documentation/profile-manual/profile-manual.xml
+++ b/documentation/profile-manual/profile-manual.xml
@@ -102,9 +102,14 @@
3.1
- &REL_MONTH_YEAR;
+ April 2020
Released with the Yocto Project 3.1 Release.
+
+ 3.1.1
+ &REL_MONTH_YEAR;
+ Released with the Yocto Project 3.1.1 Release.
+
diff --git a/documentation/toaster-manual/toaster-manual.xml b/documentation/toaster-manual/toaster-manual.xml
index e6d4245231..53d666446b 100755
--- a/documentation/toaster-manual/toaster-manual.xml
+++ b/documentation/toaster-manual/toaster-manual.xml
@@ -82,9 +82,14 @@
3.1
- &REL_MONTH_YEAR;
+ April 2020
Released with the Yocto Project 3.1 Release.
+
+ 3.1.1
+ &REL_MONTH_YEAR;
+ Released with the Yocto Project 3.1.1 Release.
+
diff --git a/documentation/tools/mega-manual.sed b/documentation/tools/mega-manual.sed
index b1ea9edb7b..d52f1ebdbf 100644
--- a/documentation/tools/mega-manual.sed
+++ b/documentation/tools/mega-manual.sed
@@ -1,36 +1,36 @@
# Processes bitbake-user-manual (-- style).
# This style is for manual three-word folders, which currently is only the BitBake User Manual.
# We used to have the "yocto-project-qs" and "poky-ref-manual" folders but no longer do.
-# s@"ulink" href="http://www.yoctoproject.org/docs/3.1/[a-z]*-[a-z]*-[a-z]*/[a-z]*-[a-z]*-[a-z]*.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/3.1/bitbake-user-manual/bitbake-user-manual.html#@"link" href="#@g
+# s@"ulink" href="http://www.yoctoproject.org/docs/3.1.1/[a-z]*-[a-z]*-[a-z]*/[a-z]*-[a-z]*-[a-z]*.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.1.1/bitbake-user-manual/bitbake-user-manual.html#@"link" href="#@g
# Processes all other manuals (- style).
# This style is for manual folders that use two word, which is the standard now (e.g. "ref-manual").
# Here is the one-liner:
-# s@"ulink" href="http://www.yoctoproject.org/docs/3.1/[a-z]*-[a-z]*/[a-z]*-[a-z]*.html#@"link" href="#@g
+# s@"ulink" href="http://www.yoctoproject.org/docs/3.1.1/[a-z]*-[a-z]*/[a-z]*-[a-z]*.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/3.1/sdk-manual/sdk-manual.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/3.1/bsp-guide/bsp-guide.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/3.1/dev-manual/dev-manual.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/3.1/overview-manual/overview-manual.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/3.1/brief-yoctoprojectqs/brief-yoctoprojectqs.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/3.1/kernel-dev/kernel-dev.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/3.1/profile-manual/profile-manual.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/3.1/ref-manual/ref-manual.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/3.1/toaster-manual/toaster-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.1.1/sdk-manual/sdk-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.1.1/bsp-guide/bsp-guide.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.1.1/dev-manual/dev-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.1.1/overview-manual/overview-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.1.1/brief-yoctoprojectqs/brief-yoctoprojectqs.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.1.1/kernel-dev/kernel-dev.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.1.1/profile-manual/profile-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.1.1/ref-manual/ref-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.1.1/toaster-manual/toaster-manual.html#@"link" href="#@g
# Process cases where just an external manual is referenced without an id anchor
-s@Yocto Project Quick Build@Yocto Project Quick Build@g
-s@BitBake User Manual@BitBake User Manual@g
-s@Yocto Project Development Tasks Manual@Yocto Project Development Tasks Manual@g
-s@Yocto Project Overview and Concepts Manual@Yocto project Overview and Concepts Manual@g
-s@Yocto Project Application Development and the Extensible Software Development Kit (eSDK)@Yocto Project Application Development and the Extensible Software Development Kit (eSDK)@g
-s@Yocto Project Board Support Package (BSP) Developer's Guide@Yocto Project Board Support Package (BSP) Developer's Guide@g
-s@Yocto Project Profiling and Tracing Manual@Yocto Project Profiling and Tracing Manual@g
-s@Yocto Project Linux Kernel Development Manual@Yocto Project Linux Kernel Development Manual@g
-s@Yocto Project Reference Manual@Yocto Project Reference Manual@g
-s@Toaster User Manual@Toaster User Manual@g
+s@Yocto Project Quick Build@Yocto Project Quick Build@g
+s@BitBake User Manual@BitBake User Manual@g
+s@Yocto Project Development Tasks Manual@Yocto Project Development Tasks Manual@g
+s@Yocto Project Overview and Concepts Manual@Yocto project Overview and Concepts Manual@g
+s@Yocto Project Application Development and the Extensible Software Development Kit (eSDK)@Yocto Project Application Development and the Extensible Software Development Kit (eSDK)@g
+s@Yocto Project Board Support Package (BSP) Developer's Guide@Yocto Project Board Support Package (BSP) Developer's Guide@g
+s@Yocto Project Profiling and Tracing Manual@Yocto Project Profiling and Tracing Manual@g
+s@Yocto Project Linux Kernel Development Manual@Yocto Project Linux Kernel Development Manual@g
+s@Yocto Project Reference Manual@Yocto Project Reference Manual@g
+s@Toaster User Manual@Toaster User Manual@g
# Process a single, rouge occurrence of a linked reference to the Mega-Manual.
-s@Yocto Project Mega-Manual@Yocto Project Mega-Manual@g
+s@Yocto Project Mega-Manual@Yocto Project Mega-Manual@g