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.ent14
-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, 67 insertions, 27 deletions
diff --git a/documentation/bsp-guide/bsp-guide.xml b/documentation/bsp-guide/bsp-guide.xml
index 6cebb13ab5..9f4a28ac6c 100644
--- a/documentation/bsp-guide/bsp-guide.xml
+++ b/documentation/bsp-guide/bsp-guide.xml
@@ -118,6 +118,11 @@
118 <date>May 2017</date> 118 <date>May 2017</date>
119 <revremark>Released with the Yocto Project 2.3 Release.</revremark> 119 <revremark>Released with the Yocto Project 2.3 Release.</revremark>
120 </revision> 120 </revision>
121 <revision>
122 <revnumber>2.4</revnumber>
123 <date>Usually October</date>
124 <revremark>Released with the Yocto Project 2.4 Release.</revremark>
125 </revision>
121 </revhistory> 126 </revhistory>
122 127
123 <copyright> 128 <copyright>
diff --git a/documentation/dev-manual/dev-manual.xml b/documentation/dev-manual/dev-manual.xml
index d72aa24469..55cacb7941 100644
--- a/documentation/dev-manual/dev-manual.xml
+++ b/documentation/dev-manual/dev-manual.xml
@@ -96,6 +96,11 @@
96 <date>May 2017</date> 96 <date>May 2017</date>
97 <revremark>Released with the Yocto Project 2.3 Release.</revremark> 97 <revremark>Released with the Yocto Project 2.3 Release.</revremark>
98 </revision> 98 </revision>
99 <revision>
100 <revnumber>2.4</revnumber>
101 <date>Usually October</date>
102 <revremark>Released with the Yocto Project 2.4 Release.</revremark>
103 </revision>
99 </revhistory> 104 </revhistory>
100 105
101 <copyright> 106 <copyright>
diff --git a/documentation/kernel-dev/kernel-dev.xml b/documentation/kernel-dev/kernel-dev.xml
index 6a8962ec38..71a39bec4e 100644
--- a/documentation/kernel-dev/kernel-dev.xml
+++ b/documentation/kernel-dev/kernel-dev.xml
@@ -81,6 +81,11 @@
81 <date>May 2017</date> 81 <date>May 2017</date>
82 <revremark>Released with the Yocto Project 2.3 Release.</revremark> 82 <revremark>Released with the Yocto Project 2.3 Release.</revremark>
83 </revision> 83 </revision>
84 <revision>
85 <revnumber>2.4</revnumber>
86 <date>Usually October</date>
87 <revremark>Released with the Yocto Project 2.4 Release.</revremark>
88 </revision>
84 </revhistory> 89 </revhistory>
85 90
86 <copyright> 91 <copyright>
diff --git a/documentation/mega-manual/mega-manual.xml b/documentation/mega-manual/mega-manual.xml
index 265596e68f..1e9c50c2c1 100644
--- a/documentation/mega-manual/mega-manual.xml
+++ b/documentation/mega-manual/mega-manual.xml
@@ -65,6 +65,11 @@
65 <date>May 2017</date> 65 <date>May 2017</date>
66 <revremark>Released with the Yocto Project 2.3 Release.</revremark> 66 <revremark>Released with the Yocto Project 2.3 Release.</revremark>
67 </revision> 67 </revision>
68 <revision>
69 <revnumber>2.4</revnumber>
70 <date>Usually October</date>
71 <revremark>Released with the Yocto Project 2.4 Release.</revremark>
72 </revision>
68 </revhistory> 73 </revhistory>
69 74
70 <copyright> 75 <copyright>
diff --git a/documentation/poky.ent b/documentation/poky.ent
index 32d498f09b..1a94be627b 100644
--- a/documentation/poky.ent
+++ b/documentation/poky.ent
@@ -1,10 +1,10 @@
1<!ENTITY DISTRO "2.3"> 1<!ENTITY DISTRO "2.4">
2<!ENTITY DISTRO_COMPRESSED "23"> 2<!ENTITY DISTRO_COMPRESSED "24">
3<!ENTITY DISTRO_NAME_NO_CAP "pyro"> 3<!ENTITY DISTRO_NAME_NO_CAP "tbd">
4<!ENTITY DISTRO_NAME "Pyro"> 4<!ENTITY DISTRO_NAME "Tbd">
5<!ENTITY YOCTO_DOC_VERSION "2.3"> 5<!ENTITY YOCTO_DOC_VERSION "2.4">
6<!ENTITY POKYVERSION "18.0.0"> 6<!ENTITY POKYVERSION "19.0.0">
7<!ENTITY POKYVERSION_COMPRESSED "1800"> 7<!ENTITY POKYVERSION_COMPRESSED "1900">
8<!ENTITY YOCTO_POKY "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;"> 8<!ENTITY YOCTO_POKY "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;">
9<!ENTITY COPYRIGHT_YEAR "2010-2017"> 9<!ENTITY COPYRIGHT_YEAR "2010-2017">
10<!ENTITY YOCTO_DL_URL "http://downloads.yoctoproject.org"> 10<!ENTITY YOCTO_DL_URL "http://downloads.yoctoproject.org">
diff --git a/documentation/profile-manual/profile-manual.xml b/documentation/profile-manual/profile-manual.xml
index e39a3e4fef..0d7df520ba 100644
--- a/documentation/profile-manual/profile-manual.xml
+++ b/documentation/profile-manual/profile-manual.xml
@@ -81,6 +81,11 @@
81 <date>May 2017</date> 81 <date>May 2017</date>
82 <revremark>Released with the Yocto Project 2.3 Release.</revremark> 82 <revremark>Released with the Yocto Project 2.3 Release.</revremark>
83 </revision> 83 </revision>
84 <revision>
85 <revnumber>2.4</revnumber>
86 <date>Usually October</date>
87 <revremark>Released with the Yocto Project 2.4 Release.</revremark>
88 </revision>
84 </revhistory> 89 </revhistory>
85 90
86 <copyright> 91 <copyright>
diff --git a/documentation/ref-manual/ref-manual.xml b/documentation/ref-manual/ref-manual.xml
index 463b10c0cd..16900adfb8 100644
--- a/documentation/ref-manual/ref-manual.xml
+++ b/documentation/ref-manual/ref-manual.xml
@@ -112,6 +112,11 @@
112 <date>May 2017</date> 112 <date>May 2017</date>
113 <revremark>Released with the Yocto Project 2.3 Release.</revremark> 113 <revremark>Released with the Yocto Project 2.3 Release.</revremark>
114 </revision> 114 </revision>
115 <revision>
116 <revnumber>2.4</revnumber>
117 <date>Usually October</date>
118 <revremark>Released with the Yocto Project 2.4 Release.</revremark>
119 </revision>
115 </revhistory> 120 </revhistory>
116 121
117 <copyright> 122 <copyright>
diff --git a/documentation/sdk-manual/sdk-manual.xml b/documentation/sdk-manual/sdk-manual.xml
index 2f6dbd6c97..b339c61dba 100644
--- a/documentation/sdk-manual/sdk-manual.xml
+++ b/documentation/sdk-manual/sdk-manual.xml
@@ -46,6 +46,11 @@
46 <date>May 2017</date> 46 <date>May 2017</date>
47 <revremark>Released with the Yocto Project 2.3 Release.</revremark> 47 <revremark>Released with the Yocto Project 2.3 Release.</revremark>
48 </revision> 48 </revision>
49 <revision>
50 <revnumber>2.4</revnumber>
51 <date>Usually October</date>
52 <revremark>Released with the Yocto Project 2.4 Release.</revremark>
53 </revision>
49 </revhistory> 54 </revhistory>
50 55
51 <copyright> 56 <copyright>
diff --git a/documentation/toaster-manual/toaster-manual.xml b/documentation/toaster-manual/toaster-manual.xml
index 059c4f5c44..f46f7e2c48 100644
--- a/documentation/toaster-manual/toaster-manual.xml
+++ b/documentation/toaster-manual/toaster-manual.xml
@@ -56,6 +56,11 @@
56 <date>May 2017</date> 56 <date>May 2017</date>
57 <revremark>Released with the Yocto Project 2.3 Release.</revremark> 57 <revremark>Released with the Yocto Project 2.3 Release.</revremark>
58 </revision> 58 </revision>
59 <revision>
60 <revnumber>2.4</revnumber>
61 <date>Usually October</date>
62 <revremark>Released with the Yocto Project 2.4 Release.</revremark>
63 </revision>
59 </revhistory> 64 </revhistory>
60 65
61 <copyright> 66 <copyright>
diff --git a/documentation/tools/mega-manual.sed b/documentation/tools/mega-manual.sed
index 90b7aad3e7..f5af0fe5fe 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.3\/[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.4\/[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.3\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g 6s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g
7s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.3\/poky-ref-manual\/poky-ref-manual.html#/\"link\" href=\"#/g 7s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/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.3\/[a-z]*-[a-z]*\/[a-z]*-[a-z]*.html#/\"link\" href=\"#/g 14# s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/[a-z]*-[a-z]*\/[a-z]*-[a-z]*.html#/\"link\" href=\"#/g
15 15
16s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.3\/sdk-manual\/sdk-manual.html#/\"link\" href=\"#/g 16s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/sdk-manual\/sdk-manual.html#/\"link\" href=\"#/g
17s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.3\/bsp-guide\/bsp-guide.html#/\"link\" href=\"#/g 17s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/bsp-guide\/bsp-guide.html#/\"link\" href=\"#/g
18s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.3\/dev-manual\/dev-manual.html#/\"link\" href=\"#/g 18s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/dev-manual\/dev-manual.html#/\"link\" href=\"#/g
19s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.3\/kernel-dev\/kernel-dev.html#/\"link\" href=\"#/g 19s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/kernel-dev\/kernel-dev.html#/\"link\" href=\"#/g
20s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.3\/profile-manual\/profile-manual.html#/\"link\" href=\"#/g 20s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/profile-manual\/profile-manual.html#/\"link\" href=\"#/g
21s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.3\/ref-manual\/ref-manual.html#/\"link\" href=\"#/g 21s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/ref-manual\/ref-manual.html#/\"link\" href=\"#/g
22s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.3\/toaster-manual\/toaster-manual.html#/\"link\" href=\"#/g 22s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/toaster-manual\/toaster-manual.html#/\"link\" href=\"#/g
23s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.3\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g 23s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/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.3\/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.4\/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.3\/dev-manual\/dev-manual.html\" target=\"_top\">Yocto Project Development Manual<\/a>/Yocto Project Development Manual/g 27s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.4\/dev-manual\/dev-manual.html\" target=\"_top\">Yocto Project Development Manual<\/a>/Yocto Project Development Manual/g
28s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.3\/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.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
29s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.3\/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.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
30s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.3\/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.4\/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.3\/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.4\/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.3\/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.4\/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.3\/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.4\/toaster-manual\/toaster-manual.html\" target=\"_top\">Toaster User Manual<\/a>/Toaster User Manual/g