summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/bsp-guide/bsp-guide.xml5
-rw-r--r--documentation/dev-manual/dev-manual.xml5
-rw-r--r--documentation/kernel-dev/kernel-dev.xml5
-rw-r--r--documentation/mega-manual/mega-manual.xml5
-rw-r--r--documentation/poky.ent20
-rw-r--r--documentation/profile-manual/profile-manual.xml5
-rw-r--r--documentation/ref-manual/ref-manual.xml5
-rw-r--r--documentation/sdk-manual/sdk-manual.xml5
-rw-r--r--documentation/toaster-manual/toaster-manual.xml5
-rw-r--r--documentation/tools/mega-manual.sed40
10 files changed, 70 insertions, 30 deletions
diff --git a/documentation/bsp-guide/bsp-guide.xml b/documentation/bsp-guide/bsp-guide.xml
index 38b3d6d113..5df7e887f4 100644
--- a/documentation/bsp-guide/bsp-guide.xml
+++ b/documentation/bsp-guide/bsp-guide.xml
@@ -116,6 +116,11 @@
116 <date>October 2017</date> 116 <date>October 2017</date>
117 <revremark>Released with the Yocto Project 2.4 Release.</revremark> 117 <revremark>Released with the Yocto Project 2.4 Release.</revremark>
118 </revision> 118 </revision>
119 <revision>
120 <revnumber>2.5</revnumber>
121 <date>April 2018</date>
122 <revremark>Released with the Yocto Project 2.5 Release.</revremark>
123 </revision>
119 </revhistory> 124 </revhistory>
120 125
121 <copyright> 126 <copyright>
diff --git a/documentation/dev-manual/dev-manual.xml b/documentation/dev-manual/dev-manual.xml
index 998c9b4185..aaeb4e7576 100644
--- a/documentation/dev-manual/dev-manual.xml
+++ b/documentation/dev-manual/dev-manual.xml
@@ -101,6 +101,11 @@
101 <date>October 2017</date> 101 <date>October 2017</date>
102 <revremark>Released with the Yocto Project 2.4 Release.</revremark> 102 <revremark>Released with the Yocto Project 2.4 Release.</revremark>
103 </revision> 103 </revision>
104 <revision>
105 <revnumber>2.5</revnumber>
106 <date>April 2018</date>
107 <revremark>Released with the Yocto Project 2.5 Release.</revremark>
108 </revision>
104 </revhistory> 109 </revhistory>
105 110
106 <copyright> 111 <copyright>
diff --git a/documentation/kernel-dev/kernel-dev.xml b/documentation/kernel-dev/kernel-dev.xml
index e80780fdf2..f697e3cb9d 100644
--- a/documentation/kernel-dev/kernel-dev.xml
+++ b/documentation/kernel-dev/kernel-dev.xml
@@ -86,6 +86,11 @@
86 <date>October 2017</date> 86 <date>October 2017</date>
87 <revremark>Released with the Yocto Project 2.4 Release.</revremark> 87 <revremark>Released with the Yocto Project 2.4 Release.</revremark>
88 </revision> 88 </revision>
89 <revision>
90 <revnumber>2.5</revnumber>
91 <date>April 2018</date>
92 <revremark>Released with the Yocto Project 2.5 Release.</revremark>
93 </revision>
89 </revhistory> 94 </revhistory>
90 95
91 <copyright> 96 <copyright>
diff --git a/documentation/mega-manual/mega-manual.xml b/documentation/mega-manual/mega-manual.xml
index a8d535a1fe..51630f8151 100644
--- a/documentation/mega-manual/mega-manual.xml
+++ b/documentation/mega-manual/mega-manual.xml
@@ -70,6 +70,11 @@
70 <date>October 2017</date> 70 <date>October 2017</date>
71 <revremark>Released with the Yocto Project 2.4 Release.</revremark> 71 <revremark>Released with the Yocto Project 2.4 Release.</revremark>
72 </revision> 72 </revision>
73 <revision>
74 <revnumber>2.5</revnumber>
75 <date>April 2018</date>
76 <revremark>Released with the Yocto Project 2.5 Release.</revremark>
77 </revision>
73 </revhistory> 78 </revhistory>
74 79
75 <copyright> 80 <copyright>
diff --git a/documentation/poky.ent b/documentation/poky.ent
index 6a953f4239..bbef07bb5e 100644
--- a/documentation/poky.ent
+++ b/documentation/poky.ent
@@ -1,15 +1,15 @@
1<!ENTITY DISTRO "2.4"> 1<!ENTITY DISTRO "2.5">
2<!ENTITY DISTRO_COMPRESSED "24"> 2<!ENTITY DISTRO_COMPRESSED "25">
3<!ENTITY DISTRO_NAME_NO_CAP "rocko"> 3<!ENTITY DISTRO_NAME_NO_CAP "sumo">
4<!ENTITY DISTRO_NAME "Rocko"> 4<!ENTITY DISTRO_NAME "Sumo">
5<!ENTITY YOCTO_DOC_VERSION "2.4"> 5<!ENTITY YOCTO_DOC_VERSION "2.5">
6<!ENTITY DISTRO_REL_TAG "yocto-2.4"> 6<!ENTITY DISTRO_REL_TAG "yocto-2.5">
7<!ENTITY METAINTELVERSION "8.0"> 7<!ENTITY METAINTELVERSION "9.0">
8<!ENTITY META_INTEL_REL_TAG "&METAINTELVERSION;-&DISTRO_NAME_NO_CAP;-&YOCTO_DOC_VERSION;"> 8<!ENTITY META_INTEL_REL_TAG "&METAINTELVERSION;-&DISTRO_NAME_NO_CAP;-&YOCTO_DOC_VERSION;">
9<!ENTITY POKYVERSION "19.0.0"> 9<!ENTITY POKYVERSION "20.0.0">
10<!ENTITY POKYVERSION_COMPRESSED "1900"> 10<!ENTITY POKYVERSION_COMPRESSED "2000">
11<!ENTITY YOCTO_POKY "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;"> 11<!ENTITY YOCTO_POKY "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;">
12<!ENTITY COPYRIGHT_YEAR "2010-2017"> 12<!ENTITY COPYRIGHT_YEAR "2010-2018">
13<!ENTITY YOCTO_DL_URL "http://downloads.yoctoproject.org"> 13<!ENTITY YOCTO_DL_URL "http://downloads.yoctoproject.org">
14<!ENTITY YOCTO_HOME_URL "http://www.yoctoproject.org"> 14<!ENTITY YOCTO_HOME_URL "http://www.yoctoproject.org">
15<!ENTITY YOCTO_LISTS_URL "http://lists.yoctoproject.org"> 15<!ENTITY YOCTO_LISTS_URL "http://lists.yoctoproject.org">
diff --git a/documentation/profile-manual/profile-manual.xml b/documentation/profile-manual/profile-manual.xml
index d87f5b46d6..3f8f93a3ae 100644
--- a/documentation/profile-manual/profile-manual.xml
+++ b/documentation/profile-manual/profile-manual.xml
@@ -86,6 +86,11 @@
86 <date>October 2017</date> 86 <date>October 2017</date>
87 <revremark>Released with the Yocto Project 2.4 Release.</revremark> 87 <revremark>Released with the Yocto Project 2.4 Release.</revremark>
88 </revision> 88 </revision>
89 <revision>
90 <revnumber>2.5</revnumber>
91 <date>April 2018</date>
92 <revremark>Released with the Yocto Project 2.5 Release.</revremark>
93 </revision>
89 </revhistory> 94 </revhistory>
90 95
91 <copyright> 96 <copyright>
diff --git a/documentation/ref-manual/ref-manual.xml b/documentation/ref-manual/ref-manual.xml
index 6c7403dc0d..e2aed1fd38 100644
--- a/documentation/ref-manual/ref-manual.xml
+++ b/documentation/ref-manual/ref-manual.xml
@@ -117,6 +117,11 @@
117 <date>October 2017</date> 117 <date>October 2017</date>
118 <revremark>Released with the Yocto Project 2.4 Release.</revremark> 118 <revremark>Released with the Yocto Project 2.4 Release.</revremark>
119 </revision> 119 </revision>
120 <revision>
121 <revnumber>2.5</revnumber>
122 <date>April 2018</date>
123 <revremark>Released with the Yocto Project 2.5 Release.</revremark>
124 </revision>
120 </revhistory> 125 </revhistory>
121 126
122 <copyright> 127 <copyright>
diff --git a/documentation/sdk-manual/sdk-manual.xml b/documentation/sdk-manual/sdk-manual.xml
index 553ba8f809..d33205a846 100644
--- a/documentation/sdk-manual/sdk-manual.xml
+++ b/documentation/sdk-manual/sdk-manual.xml
@@ -51,6 +51,11 @@
51 <date>October 2017</date> 51 <date>October 2017</date>
52 <revremark>Released with the Yocto Project 2.4 Release.</revremark> 52 <revremark>Released with the Yocto Project 2.4 Release.</revremark>
53 </revision> 53 </revision>
54 <revision>
55 <revnumber>2.5</revnumber>
56 <date>April 2018</date>
57 <revremark>Released with the Yocto Project 2.5 Release.</revremark>
58 </revision>
54 </revhistory> 59 </revhistory>
55 60
56 <copyright> 61 <copyright>
diff --git a/documentation/toaster-manual/toaster-manual.xml b/documentation/toaster-manual/toaster-manual.xml
index 506018302a..21fadfca57 100644
--- a/documentation/toaster-manual/toaster-manual.xml
+++ b/documentation/toaster-manual/toaster-manual.xml
@@ -61,6 +61,11 @@
61 <date>October 2017</date> 61 <date>October 2017</date>
62 <revremark>Released with the Yocto Project 2.4 Release.</revremark> 62 <revremark>Released with the Yocto Project 2.4 Release.</revremark>
63 </revision> 63 </revision>
64 <revision>
65 <revnumber>2.5</revnumber>
66 <date>April 2018</date>
67 <revremark>Released with the Yocto Project 2.5 Release.</revremark>
68 </revision>
64 </revhistory> 69 </revhistory>
65 70
66 <copyright> 71 <copyright>
diff --git a/documentation/tools/mega-manual.sed b/documentation/tools/mega-manual.sed
index 75b75b66c6..4d4f34ba35 100644
--- a/documentation/tools/mega-manual.sed
+++ b/documentation/tools/mega-manual.sed
@@ -2,32 +2,32 @@
2# This style is for manual folders like "yocto-project-qs" and "poky-ref-manual". 2# This style is for manual folders like "yocto-project-qs" and "poky-ref-manual".
3# This is the old way that did it. Can't do that now that we have "bitbake-user-manual" strings 3# This is the old way that did it. Can't do that now that we have "bitbake-user-manual" strings
4# in the mega-manual. 4# in the mega-manual.
5# s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/[a-z]*-[a-z]*-[a-z]*\/[a-z]*-[a-z]*-[a-z]*.html#/\"link\" href=\"#/g 5# s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/[a-z]*-[a-z]*-[a-z]*\/[a-z]*-[a-z]*-[a-z]*.html#/\"link\" href=\"#/g
6s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g 6s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g
7s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/poky-ref-manual\/poky-ref-manual.html#/\"link\" href=\"#/g 7s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/poky-ref-manual\/poky-ref-manual.html#/\"link\" href=\"#/g
8 8
9# Processes all other manuals (<word>-<word> style) except for the BitBake User Manual because 9# Processes all other manuals (<word>-<word> style) except for the BitBake User Manual because
10# it is not included in the mega-manual. 10# it is not included in the mega-manual.
11# This style is for manual folders that use two word, which is the standard now (e.g. "ref-manual"). 11# This style is for manual folders that use two word, which is the standard now (e.g. "ref-manual").
12# This was the one-liner that worked before we introduced the BitBake User Manual, which is 12# This was the one-liner that worked before we introduced the BitBake User Manual, which is
13# not in the mega-manual. 13# not in the mega-manual.
14# s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/[a-z]*-[a-z]*\/[a-z]*-[a-z]*.html#/\"link\" href=\"#/g 14# s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/[a-z]*-[a-z]*\/[a-z]*-[a-z]*.html#/\"link\" href=\"#/g
15 15
16s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/sdk-manual\/sdk-manual.html#/\"link\" href=\"#/g 16s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/sdk-manual\/sdk-manual.html#/\"link\" href=\"#/g
17s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/bsp-guide\/bsp-guide.html#/\"link\" href=\"#/g 17s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/bsp-guide\/bsp-guide.html#/\"link\" href=\"#/g
18s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/dev-manual\/dev-manual.html#/\"link\" href=\"#/g 18s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/dev-manual\/dev-manual.html#/\"link\" href=\"#/g
19s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/kernel-dev\/kernel-dev.html#/\"link\" href=\"#/g 19s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/kernel-dev\/kernel-dev.html#/\"link\" href=\"#/g
20s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/profile-manual\/profile-manual.html#/\"link\" href=\"#/g 20s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/profile-manual\/profile-manual.html#/\"link\" href=\"#/g
21s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/ref-manual\/ref-manual.html#/\"link\" href=\"#/g 21s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/ref-manual\/ref-manual.html#/\"link\" href=\"#/g
22s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/toaster-manual\/toaster-manual.html#/\"link\" href=\"#/g 22s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/toaster-manual\/toaster-manual.html#/\"link\" href=\"#/g
23s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g 23s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g
24 24
25# Process cases where just an external manual is referenced without an id anchor 25# Process cases where just an external manual is referenced without an id anchor
26s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/yocto-project-qs\/yocto-project-qs.html\" target=\"_top\">Yocto Project Quick Start<\/a>/Yocto Project Quick Start/g 26s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/yocto-project-qs\/yocto-project-qs.html\" target=\"_top\">Yocto Project Quick Start<\/a>/Yocto Project Quick Start/g
27s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/dev-manual\/dev-manual.html\" target=\"_top\">Yocto Project Development Tasks Manual<\/a>/Yocto Project Development Tasks Manual/g 27s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/dev-manual\/dev-manual.html\" target=\"_top\">Yocto Project Development Tasks Manual<\/a>/Yocto Project Development Tasks Manual/g
28s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/sdk-manual\/sdk-manual.html\" target=\"_top\">Yocto Project Software Development Kit (SDK) Developer's Guide<\/a>/Yocto Project Software Development Kit (SDK) Developer's Guide/g 28s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/sdk-manual\/sdk-manual.html\" target=\"_top\">Yocto Project Software Development Kit (SDK) Developer's Guide<\/a>/Yocto Project Software Development Kit (SDK) Developer's Guide/g
29s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/bsp-guide\/bsp-guide.html\" target=\"_top\">Yocto Project Board Support Package (BSP) Developer's Guide<\/a>/Yocto Project Board Support Package (BSP) Developer's Guide/g 29s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/bsp-guide\/bsp-guide.html\" target=\"_top\">Yocto Project Board Support Package (BSP) Developer's Guide<\/a>/Yocto Project Board Support Package (BSP) Developer's Guide/g
30s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/profile-manual\/profile-manual.html\" target=\"_top\">Yocto Project Profiling and Tracing Manual<\/a>/Yocto Project Profiling and Tracing Manual/g 30s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/profile-manual\/profile-manual.html\" target=\"_top\">Yocto Project Profiling and Tracing Manual<\/a>/Yocto Project Profiling and Tracing Manual/g
31s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/kernel-dev\/kernel-dev.html\" target=\"_top\">Yocto Project Linux Kernel Development Manual<\/a>/Yocto Project Linux Kernel Development Manual/g 31s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/kernel-dev\/kernel-dev.html\" target=\"_top\">Yocto Project Linux Kernel Development Manual<\/a>/Yocto Project Linux Kernel Development Manual/g
32s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/ref-manual\/ref-manual.html\" target=\"_top\">Yocto Project Reference Manual<\/a>/Yocto Project Reference Manual/g 32s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/ref-manual\/ref-manual.html\" target=\"_top\">Yocto Project Reference Manual<\/a>/Yocto Project Reference Manual/g
33s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/toaster-manual\/toaster-manual.html\" target=\"_top\">Toaster User Manual<\/a>/Toaster User Manual/g 33s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.5\/toaster-manual\/toaster-manual.html\" target=\"_top\">Toaster User Manual<\/a>/Toaster User Manual/g