diff --git a/documentation/bsp-guide/bsp-guide.xml b/documentation/bsp-guide/bsp-guide.xml
index addb421181..dd0c76addc 100644
--- a/documentation/bsp-guide/bsp-guide.xml
+++ b/documentation/bsp-guide/bsp-guide.xml
@@ -132,9 +132,9 @@
Released with the Yocto Project 2.7 Release.
- 2.8
+ 3.0
&REL_MONTH_YEAR;
- Released with the Yocto Project 2.8 Release.
+ Released with the Yocto Project 3.0 Release.
diff --git a/documentation/dev-manual/dev-manual.xml b/documentation/dev-manual/dev-manual.xml
index 42deff1028..04fa1e4f9a 100644
--- a/documentation/dev-manual/dev-manual.xml
+++ b/documentation/dev-manual/dev-manual.xml
@@ -117,9 +117,9 @@
Released with the Yocto Project 2.7 Release.
- 2.8
+ 3.0
&REL_MONTH_YEAR;
- Released with the Yocto Project 2.8 Release.
+ Released with the Yocto Project 3.0 Release.
diff --git a/documentation/kernel-dev/kernel-dev.xml b/documentation/kernel-dev/kernel-dev.xml
index c43330a31e..4c5881b071 100644
--- a/documentation/kernel-dev/kernel-dev.xml
+++ b/documentation/kernel-dev/kernel-dev.xml
@@ -102,9 +102,9 @@
Released with the Yocto Project 2.7 Release.
- 2.8
+ 3.0
&REL_MONTH_YEAR;
- Released with the Yocto Project 2.8 Release.
+ Released with the Yocto Project 3.0 Release.
diff --git a/documentation/mega-manual/mega-manual.xml b/documentation/mega-manual/mega-manual.xml
index b66b9334fb..eac5ea7be9 100644
--- a/documentation/mega-manual/mega-manual.xml
+++ b/documentation/mega-manual/mega-manual.xml
@@ -88,9 +88,9 @@
Released with the Yocto Project 2.7 Release.
- 2.8
+ 3.0
&REL_MONTH_YEAR;
- Released with the Yocto Project 2.8 Release.
+ Released with the Yocto Project 3.0 Release.
diff --git a/documentation/overview-manual/overview-manual.xml b/documentation/overview-manual/overview-manual.xml
index 728cad57f3..c7716e460b 100644
--- a/documentation/overview-manual/overview-manual.xml
+++ b/documentation/overview-manual/overview-manual.xml
@@ -47,9 +47,9 @@
Released with the Yocto Project 2.7 Release.
- 2.8
+ 3.0
&REL_MONTH_YEAR;
- Released with the Yocto Project 2.8 Release.
+ Released with the Yocto Project 3.0 Release.
diff --git a/documentation/poky.ent b/documentation/poky.ent
index e77a52deae..7af47df72f 100644
--- a/documentation/poky.ent
+++ b/documentation/poky.ent
@@ -1,12 +1,12 @@
-
-
+
+
-
+
-
+
diff --git a/documentation/profile-manual/profile-manual.xml b/documentation/profile-manual/profile-manual.xml
index c6e8baf023..c1f461f43a 100644
--- a/documentation/profile-manual/profile-manual.xml
+++ b/documentation/profile-manual/profile-manual.xml
@@ -102,9 +102,9 @@
Released with the Yocto Project 2.7 Release.
- 2.8
+ 3.0
&REL_MONTH_YEAR;
- Released with the Yocto Project 2.8 Release.
+ Released with the Yocto Project 3.0 Release.
diff --git a/documentation/ref-manual/ref-manual.xml b/documentation/ref-manual/ref-manual.xml
index fc4319773b..b442f709a6 100644
--- a/documentation/ref-manual/ref-manual.xml
+++ b/documentation/ref-manual/ref-manual.xml
@@ -133,9 +133,9 @@
Released with the Yocto Project 2.7 Release.
- 2.8
+ 3.0
&REL_MONTH_YEAR;
- Released with the Yocto Project 2.8 Release.
+ Released with the Yocto Project 3.0 Release.
diff --git a/documentation/sdk-manual/sdk-manual.xml b/documentation/sdk-manual/sdk-manual.xml
index 7edd2c46aa..8d5f6ec4d6 100644
--- a/documentation/sdk-manual/sdk-manual.xml
+++ b/documentation/sdk-manual/sdk-manual.xml
@@ -67,9 +67,9 @@
Released with the Yocto Project 2.7 Release.
- 2.8
+ 3.0
&REL_MONTH_YEAR;
- Released with the Yocto Project 2.8 Release.
+ Released with the Yocto Project 3.0 Release.
diff --git a/documentation/toaster-manual/toaster-manual.xml b/documentation/toaster-manual/toaster-manual.xml
index b31659ffb5..d7b4bcee61 100644
--- a/documentation/toaster-manual/toaster-manual.xml
+++ b/documentation/toaster-manual/toaster-manual.xml
@@ -77,9 +77,9 @@
Released with the Yocto Project 2.7 Release.
- 2.8
+ 3.0
&REL_MONTH_YEAR;
- Released with the Yocto Project 2.8 Release.
+ Released with the Yocto Project 3.0 Release.
diff --git a/documentation/tools/mega-manual.sed b/documentation/tools/mega-manual.sed
index 9c4f4e2ede..374d8e7b00 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/2.8/[a-z]*-[a-z]*-[a-z]*/[a-z]*-[a-z]*-[a-z]*.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.8/bitbake-user-manual/bitbake-user-manual.html#@"link" href="#@g
+# s@"ulink" href="http://www.yoctoproject.org/docs/3.0/[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.0/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/2.8/[a-z]*-[a-z]*/[a-z]*-[a-z]*.html#@"link" href="#@g
+# s@"ulink" href="http://www.yoctoproject.org/docs/3.0/[a-z]*-[a-z]*/[a-z]*-[a-z]*.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.8/sdk-manual/sdk-manual.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.8/bsp-guide/bsp-guide.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.8/dev-manual/dev-manual.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.8/overview-manual/overview-manual.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.8/brief-yoctoprojectqs/brief-yoctoprojectqs.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.8/kernel-dev/kernel-dev.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.8/profile-manual/profile-manual.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.8/ref-manual/ref-manual.html#@"link" href="#@g
-s@"ulink" href="http://www.yoctoproject.org/docs/2.8/toaster-manual/toaster-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.0/sdk-manual/sdk-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.0/bsp-guide/bsp-guide.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.0/dev-manual/dev-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.0/overview-manual/overview-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.0/brief-yoctoprojectqs/brief-yoctoprojectqs.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.0/kernel-dev/kernel-dev.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.0/profile-manual/profile-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.0/ref-manual/ref-manual.html#@"link" href="#@g
+s@"ulink" href="http://www.yoctoproject.org/docs/3.0/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