summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-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/overview-manual/overview-manual.xml5
-rw-r--r--documentation/poky.ent24
-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.sed48
11 files changed, 81 insertions, 36 deletions
diff --git a/documentation/bsp-guide/bsp-guide.xml b/documentation/bsp-guide/bsp-guide.xml
index 7ca4c5d7d1..5833e42c7d 100644
--- a/documentation/bsp-guide/bsp-guide.xml
+++ b/documentation/bsp-guide/bsp-guide.xml
@@ -121,6 +121,11 @@
121 <date>May 2018</date> 121 <date>May 2018</date>
122 <revremark>Released with the Yocto Project 2.5 Release.</revremark> 122 <revremark>Released with the Yocto Project 2.5 Release.</revremark>
123 </revision> 123 </revision>
124 <revision>
125 <revnumber>2.6</revnumber>
126 <date>&REL_MONTH_YEAR;</date>
127 <revremark>Released with the Yocto Project 2.6 Release.</revremark>
128 </revision>
124 </revhistory> 129 </revhistory>
125 130
126 <copyright> 131 <copyright>
diff --git a/documentation/dev-manual/dev-manual.xml b/documentation/dev-manual/dev-manual.xml
index 93a615c2aa..9831e2ac15 100644
--- a/documentation/dev-manual/dev-manual.xml
+++ b/documentation/dev-manual/dev-manual.xml
@@ -106,6 +106,11 @@
106 <date>May 2018</date> 106 <date>May 2018</date>
107 <revremark>Released with the Yocto Project 2.5 Release.</revremark> 107 <revremark>Released with the Yocto Project 2.5 Release.</revremark>
108 </revision> 108 </revision>
109 <revision>
110 <revnumber>2.6</revnumber>
111 <date>&REL_MONTH_YEAR;</date>
112 <revremark>Released with the Yocto Project 2.6 Release.</revremark>
113 </revision>
109 </revhistory> 114 </revhistory>
110 115
111 <copyright> 116 <copyright>
diff --git a/documentation/kernel-dev/kernel-dev.xml b/documentation/kernel-dev/kernel-dev.xml
index 986c440441..4045768493 100644
--- a/documentation/kernel-dev/kernel-dev.xml
+++ b/documentation/kernel-dev/kernel-dev.xml
@@ -91,6 +91,11 @@
91 <date>May 2018</date> 91 <date>May 2018</date>
92 <revremark>Released with the Yocto Project 2.5 Release.</revremark> 92 <revremark>Released with the Yocto Project 2.5 Release.</revremark>
93 </revision> 93 </revision>
94 <revision>
95 <revnumber>2.6</revnumber>
96 <date>&REL_MONTH_YEAR;</date>
97 <revremark>Released with the Yocto Project 2.6 Release.</revremark>
98 </revision>
94 </revhistory> 99 </revhistory>
95 100
96 <copyright> 101 <copyright>
diff --git a/documentation/mega-manual/mega-manual.xml b/documentation/mega-manual/mega-manual.xml
index 2c0943e261..7c6fe7e3a6 100644
--- a/documentation/mega-manual/mega-manual.xml
+++ b/documentation/mega-manual/mega-manual.xml
@@ -75,6 +75,11 @@
75 <date>May 2018</date> 75 <date>May 2018</date>
76 <revremark>Released with the Yocto Project 2.5 Release.</revremark> 76 <revremark>Released with the Yocto Project 2.5 Release.</revremark>
77 </revision> 77 </revision>
78 <revision>
79 <revnumber>2.6</revnumber>
80 <date>&REL_MONTH_YEAR;</date>
81 <revremark>Released with the Yocto Project 2.6 Release.</revremark>
82 </revision>
78 </revhistory> 83 </revhistory>
79 84
80 <copyright> 85 <copyright>
diff --git a/documentation/overview-manual/overview-manual.xml b/documentation/overview-manual/overview-manual.xml
index c283f9a37c..b23c39497c 100644
--- a/documentation/overview-manual/overview-manual.xml
+++ b/documentation/overview-manual/overview-manual.xml
@@ -36,6 +36,11 @@
36 <date>May 2018</date> 36 <date>May 2018</date>
37 <revremark>The initial document released with the Yocto Project 2.5 Release.</revremark> 37 <revremark>The initial document released with the Yocto Project 2.5 Release.</revremark>
38 </revision> 38 </revision>
39 <revision>
40 <revnumber>2.6</revnumber>
41 <date>&REL_MONTH_YEAR;</date>
42 <revremark>Released with the Yocto Project 2.6 Release.</revremark>
43 </revision>
39 </revhistory> 44 </revhistory>
40 45
41 <copyright> 46 <copyright>
diff --git a/documentation/poky.ent b/documentation/poky.ent
index 49b19008f1..abe892cf28 100644
--- a/documentation/poky.ent
+++ b/documentation/poky.ent
@@ -1,17 +1,17 @@
1<!ENTITY DISTRO "2.5"> 1<!ENTITY DISTRO "2.6">
2<!ENTITY DISTRO_COMPRESSED "25"> 2<!ENTITY DISTRO_COMPRESSED "26">
3<!ENTITY DISTRO_NAME_NO_CAP "sumo"> 3<!ENTITY DISTRO_NAME_NO_CAP "thud">
4<!ENTITY DISTRO_NAME "Sumo"> 4<!ENTITY DISTRO_NAME "Thud">
5<!ENTITY DISTRO_NAME_NO_CAP_MINUS_ONE "rocko"> 5<!ENTITY DISTRO_NAME_NO_CAP_MINUS_ONE "sumo">
6<!ENTITY DISTRO_NAME_MINUS_ONE "Rocko"> 6<!ENTITY DISTRO_NAME_MINUS_ONE "Sumo">
7<!ENTITY YOCTO_DOC_VERSION "2.5"> 7<!ENTITY YOCTO_DOC_VERSION "2.6">
8<!ENTITY YOCTO_DOC_VERSION_MINUS_ONE "2.4"> 8<!ENTITY YOCTO_DOC_VERSION_MINUS_ONE "2.5">
9<!ENTITY DISTRO_REL_TAG "yocto-2.5"> 9<!ENTITY DISTRO_REL_TAG "yocto-2.6">
10<!ENTITY METAINTELVERSION "9.0"> 10<!ENTITY METAINTELVERSION "9.0">
11<!ENTITY REL_MONTH_YEAR "May 2018"> 11<!ENTITY REL_MONTH_YEAR "TBD">
12<!ENTITY META_INTEL_REL_TAG "&METAINTELVERSION;-&DISTRO_NAME_NO_CAP;-&YOCTO_DOC_VERSION;"> 12<!ENTITY META_INTEL_REL_TAG "&METAINTELVERSION;-&DISTRO_NAME_NO_CAP;-&YOCTO_DOC_VERSION;">
13<!ENTITY POKYVERSION "20.0.0"> 13<!ENTITY POKYVERSION "21.0.0">
14<!ENTITY POKYVERSION_COMPRESSED "2000"> 14<!ENTITY POKYVERSION_COMPRESSED "2100">
15<!ENTITY YOCTO_POKY "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;"> 15<!ENTITY YOCTO_POKY "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;">
16<!ENTITY COPYRIGHT_YEAR "2010-2018"> 16<!ENTITY COPYRIGHT_YEAR "2010-2018">
17<!ENTITY YOCTO_DL_URL "http://downloads.yoctoproject.org"> 17<!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 b64875b8c2..bce030885a 100644
--- a/documentation/profile-manual/profile-manual.xml
+++ b/documentation/profile-manual/profile-manual.xml
@@ -91,6 +91,11 @@
91 <date>May 2018</date> 91 <date>May 2018</date>
92 <revremark>Released with the Yocto Project 2.5 Release.</revremark> 92 <revremark>Released with the Yocto Project 2.5 Release.</revremark>
93 </revision> 93 </revision>
94 <revision>
95 <revnumber>2.6</revnumber>
96 <date>&REL_MONTH_YEAR;</date>
97 <revremark>Released with the Yocto Project 2.6 Release.</revremark>
98 </revision>
94 </revhistory> 99 </revhistory>
95 100
96 <copyright> 101 <copyright>
diff --git a/documentation/ref-manual/ref-manual.xml b/documentation/ref-manual/ref-manual.xml
index 169a31e995..1504e91581 100644
--- a/documentation/ref-manual/ref-manual.xml
+++ b/documentation/ref-manual/ref-manual.xml
@@ -122,6 +122,11 @@
122 <date>May 2018</date> 122 <date>May 2018</date>
123 <revremark>Released with the Yocto Project 2.5 Release.</revremark> 123 <revremark>Released with the Yocto Project 2.5 Release.</revremark>
124 </revision> 124 </revision>
125 <revision>
126 <revnumber>2.6</revnumber>
127 <date>&REL_MONTH_YEAR;</date>
128 <revremark>Released with the Yocto Project 2.6 Release.</revremark>
129 </revision>
125 </revhistory> 130 </revhistory>
126 131
127 <copyright> 132 <copyright>
diff --git a/documentation/sdk-manual/sdk-manual.xml b/documentation/sdk-manual/sdk-manual.xml
index e858b9b1ce..78c60a620c 100644
--- a/documentation/sdk-manual/sdk-manual.xml
+++ b/documentation/sdk-manual/sdk-manual.xml
@@ -56,6 +56,11 @@
56 <date>May 2018</date> 56 <date>May 2018</date>
57 <revremark>Released with the Yocto Project 2.5 Release.</revremark> 57 <revremark>Released with the Yocto Project 2.5 Release.</revremark>
58 </revision> 58 </revision>
59 <revision>
60 <revnumber>2.6</revnumber>
61 <date>&REL_MONTH_YEAR;</date>
62 <revremark>Released with the Yocto Project 2.6 Release.</revremark>
63 </revision>
59 </revhistory> 64 </revhistory>
60 65
61 <copyright> 66 <copyright>
diff --git a/documentation/toaster-manual/toaster-manual.xml b/documentation/toaster-manual/toaster-manual.xml
index 1888744889..80ac579bbb 100644
--- a/documentation/toaster-manual/toaster-manual.xml
+++ b/documentation/toaster-manual/toaster-manual.xml
@@ -66,6 +66,11 @@
66 <date>May 2018</date> 66 <date>May 2018</date>
67 <revremark>Released with the Yocto Project 2.5 Release.</revremark> 67 <revremark>Released with the Yocto Project 2.5 Release.</revremark>
68 </revision> 68 </revision>
69 <revision>
70 <revnumber>2.6</revnumber>
71 <date>&REL_MONTH_YEAR;</date>
72 <revremark>Released with the Yocto Project 2.6 Release.</revremark>
73 </revision>
69 </revhistory> 74 </revhistory>
70 75
71 <copyright> 76 <copyright>
diff --git a/documentation/tools/mega-manual.sed b/documentation/tools/mega-manual.sed
index 64fa4d2190..83f05e27e5 100644
--- a/documentation/tools/mega-manual.sed
+++ b/documentation/tools/mega-manual.sed
@@ -2,39 +2,39 @@
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.5/[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.6/[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.5/yocto-project-qs/yocto-project-qs.html#@"link" href="#@g 6s@"ulink" href="http://www.yoctoproject.org/docs/2.6/yocto-project-qs/yocto-project-qs.html#@"link" href="#@g
7s@"ulink" href="http://www.yoctoproject.org/docs/2.5/poky-ref-manual/poky-ref-manual.html#@"link" href="#@g 7s@"ulink" href="http://www.yoctoproject.org/docs/2.6/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.5/[a-z]*-[a-z]*/[a-z]*-[a-z]*.html#@"link" href="#@g 14# s@"ulink" href="http://www.yoctoproject.org/docs/2.6/[a-z]*-[a-z]*/[a-z]*-[a-z]*.html#@"link" href="#@g
15 15
16s@"ulink" href="http://www.yoctoproject.org/docs/2.5/sdk-manual/sdk-manual.html#@"link" href="#@g 16s@"ulink" href="http://www.yoctoproject.org/docs/2.6/sdk-manual/sdk-manual.html#@"link" href="#@g
17s@"ulink" href="http://www.yoctoproject.org/docs/2.5/bsp-guide/bsp-guide.html#@"link" href="#@g 17s@"ulink" href="http://www.yoctoproject.org/docs/2.6/bsp-guide/bsp-guide.html#@"link" href="#@g
18s@"ulink" href="http://www.yoctoproject.org/docs/2.5/dev-manual/dev-manual.html#@"link" href="#@g 18s@"ulink" href="http://www.yoctoproject.org/docs/2.6/dev-manual/dev-manual.html#@"link" href="#@g
19s@"ulink" href="http://www.yoctoproject.org/docs/2.5/overview-manual/overview-manual.html#@"link" href="#@g 19s@"ulink" href="http://www.yoctoproject.org/docs/2.6/overview-manual/overview-manual.html#@"link" href="#@g
20s@"ulink" href="http://www.yoctoproject.org/docs/2.5/brief-yoctoprojectqs/brief-yoctoprojectqs.html#@"link" href="#@g 20s@"ulink" href="http://www.yoctoproject.org/docs/2.6/brief-yoctoprojectqs/brief-yoctoprojectqs.html#@"link" href="#@g
21s@"ulink" href="http://www.yoctoproject.org/docs/2.5/kernel-dev/kernel-dev.html#@"link" href="#@g 21s@"ulink" href="http://www.yoctoproject.org/docs/2.6/kernel-dev/kernel-dev.html#@"link" href="#@g
22s@"ulink" href="http://www.yoctoproject.org/docs/2.5/profile-manual/profile-manual.html#@"link" href="#@g 22s@"ulink" href="http://www.yoctoproject.org/docs/2.6/profile-manual/profile-manual.html#@"link" href="#@g
23s@"ulink" href="http://www.yoctoproject.org/docs/2.5/ref-manual/ref-manual.html#@"link" href="#@g 23s@"ulink" href="http://www.yoctoproject.org/docs/2.6/ref-manual/ref-manual.html#@"link" href="#@g
24s@"ulink" href="http://www.yoctoproject.org/docs/2.5/toaster-manual/toaster-manual.html#@"link" href="#@g 24s@"ulink" href="http://www.yoctoproject.org/docs/2.6/toaster-manual/toaster-manual.html#@"link" href="#@g
25 25
26# Process cases where just an external manual is referenced without an id anchor 26# Process cases where just an external manual is referenced without an id anchor
27s@<a class="ulink" href="http://www.yoctoproject.org/docs/2.5/brief-yoctoprojectqs/brief-yoctoprojectqs.html" target="_top">Yocto Project Quick Build</a>@Yocto Project Quick Build@g 27s@<a class="ulink" href="http://www.yoctoproject.org/docs/2.6/brief-yoctoprojectqs/brief-yoctoprojectqs.html" target="_top">Yocto Project Quick Build</a>@Yocto Project Quick Build@g
28s@<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 28s@<a class="ulink" href="http://www.yoctoproject.org/docs/2.6/yocto-project-qs/yocto-project-qs.html" target="_top">Yocto Project Quick Start</a>@Yocto Project Quick Start@g
29s@<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 29s@<a class="ulink" href="http://www.yoctoproject.org/docs/2.6/dev-manual/dev-manual.html" target="_top">Yocto Project Development Tasks Manual</a>@Yocto Project Development Tasks Manual@g
30s@<a class="ulink" href="http://www.yoctoproject.org/docs/2.5/overview-manual/overview-manual.html" target="_top">Yocto Project Overview and Concepts Manual</a>@Yocto project Overview and Concepts Manual@g 30s@<a class="ulink" href="http://www.yoctoproject.org/docs/2.6/overview-manual/overview-manual.html" target="_top">Yocto Project Overview and Concepts Manual</a>@Yocto project Overview and Concepts Manual@g
31s@<a class="ulink" href="http://www.yoctoproject.org/docs/2.5/sdk-manual/sdk-manual.html" target="_top">Yocto Project Application Development and the Extensible Software Development Kit (eSDK)</a>@Yocto Project Application Development and the Extensible Software Development Kit (eSDK)@g 31s@<a class="ulink" href="http://www.yoctoproject.org/docs/2.6/sdk-manual/sdk-manual.html" target="_top">Yocto Project Application Development and the Extensible Software Development Kit (eSDK)</a>@Yocto Project Application Development and the Extensible Software Development Kit (eSDK)@g
32s@<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 32s@<a class="ulink" href="http://www.yoctoproject.org/docs/2.6/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
33s@<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 33s@<a class="ulink" href="http://www.yoctoproject.org/docs/2.6/profile-manual/profile-manual.html" target="_top">Yocto Project Profiling and Tracing Manual</a>@Yocto Project Profiling and Tracing Manual@g
34s@<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 34s@<a class="ulink" href="http://www.yoctoproject.org/docs/2.6/kernel-dev/kernel-dev.html" target="_top">Yocto Project Linux Kernel Development Manual</a>@Yocto Project Linux Kernel Development Manual@g
35s@<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 35s@<a class="ulink" href="http://www.yoctoproject.org/docs/2.6/ref-manual/ref-manual.html" target="_top">Yocto Project Reference Manual</a>@Yocto Project Reference Manual@g
36s@<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 36s@<a class="ulink" href="http://www.yoctoproject.org/docs/2.6/toaster-manual/toaster-manual.html" target="_top">Toaster User Manual</a>@Toaster User Manual@g
37 37
38# Process a single, rouge occurrence of a linked reference to the Mega-Manual. 38# Process a single, rouge occurrence of a linked reference to the Mega-Manual.
39s@<a class="ulink" href="http://www.yoctoproject.org/docs/2.5/mega-manual/mega-manual.html" target="_top">Yocto Project Mega-Manual</a>@Yocto Project Mega-Manual@g 39s@<a class="ulink" href="http://www.yoctoproject.org/docs/2.6/mega-manual/mega-manual.html" target="_top">Yocto Project Mega-Manual</a>@Yocto Project Mega-Manual@g
40 40
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 22:30:13 +0000