summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2016-09-19 10:31:50 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-23 15:27:25 +0100
commit260ff60f93dc1cea845d3138b4174004cb511454 (patch)
tree11b51322a3e8491bb34cd7cb6fb7cd66d6df8717
parent71291ed53eaab9525108e4c78ad50ad1ce32d666 (diff)
downloadpoky-260ff60f93dc1cea845d3138b4174004cb511454.tar.gz
documentation: Changes to support a 2.1.2 krogoth release.
Updated the poky.ent file to have the 2.1.2 variables. Updated the manual revision tables to use 2.1.2 and October (a guess) Updated the mega-manual.sed file so mega-manual links would resolve (From yocto-docs rev: edf0777e7aa1fc2b41691791284c29d75dc94357) Signed-off-by: Scott Rifenbark <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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.ent8
-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, 64 insertions, 24 deletions
diff --git a/documentation/bsp-guide/bsp-guide.xml b/documentation/bsp-guide/bsp-guide.xml
index 7e9afa76bf..51b89bfd44 100644
--- a/documentation/bsp-guide/bsp-guide.xml
+++ b/documentation/bsp-guide/bsp-guide.xml
@@ -113,6 +113,11 @@
113 <date>August 2016</date> 113 <date>August 2016</date>
114 <revremark>Released with the Yocto Project 2.1.1 Release.</revremark> 114 <revremark>Released with the Yocto Project 2.1.1 Release.</revremark>
115 </revision> 115 </revision>
116 <revision>
117 <revnumber>2.1.2</revnumber>
118 <date>October 2016</date>
119 <revremark>Released with the Yocto Project 2.1.2 Release.</revremark>
120 </revision>
116 </revhistory> 121 </revhistory>
117 122
118 <copyright> 123 <copyright>
diff --git a/documentation/dev-manual/dev-manual.xml b/documentation/dev-manual/dev-manual.xml
index 09d5d14e99..5d3afbc1cb 100644
--- a/documentation/dev-manual/dev-manual.xml
+++ b/documentation/dev-manual/dev-manual.xml
@@ -91,6 +91,11 @@
91 <date>August 2016</date> 91 <date>August 2016</date>
92 <revremark>Released with the Yocto Project 2.1.1 Release.</revremark> 92 <revremark>Released with the Yocto Project 2.1.1 Release.</revremark>
93 </revision> 93 </revision>
94 <revision>
95 <revnumber>2.1.2</revnumber>
96 <date>October 2016</date>
97 <revremark>Released with the Yocto Project 2.1.2 Release.</revremark>
98 </revision>
94 </revhistory> 99 </revhistory>
95 100
96 <copyright> 101 <copyright>
diff --git a/documentation/kernel-dev/kernel-dev.xml b/documentation/kernel-dev/kernel-dev.xml
index a84a1e925b..202003a628 100644
--- a/documentation/kernel-dev/kernel-dev.xml
+++ b/documentation/kernel-dev/kernel-dev.xml
@@ -76,6 +76,11 @@
76 <date>August 2016</date> 76 <date>August 2016</date>
77 <revremark>Released with the Yocto Project 2.1.1 Release.</revremark> 77 <revremark>Released with the Yocto Project 2.1.1 Release.</revremark>
78 </revision> 78 </revision>
79 <revision>
80 <revnumber>2.1.2</revnumber>
81 <date>October 2016</date>
82 <revremark>Released with the Yocto Project 2.1.2 Release.</revremark>
83 </revision>
79 </revhistory> 84 </revhistory>
80 85
81 <copyright> 86 <copyright>
diff --git a/documentation/mega-manual/mega-manual.xml b/documentation/mega-manual/mega-manual.xml
index d54789b0be..68ab76241b 100644
--- a/documentation/mega-manual/mega-manual.xml
+++ b/documentation/mega-manual/mega-manual.xml
@@ -60,6 +60,11 @@
60 <date>August 2016</date> 60 <date>August 2016</date>
61 <revremark>Released with the Yocto Project 2.1.1 Release.</revremark> 61 <revremark>Released with the Yocto Project 2.1.1 Release.</revremark>
62 </revision> 62 </revision>
63 <revision>
64 <revnumber>2.1.2</revnumber>
65 <date>October 2016</date>
66 <revremark>Released with the Yocto Project 2.1.2 Release.</revremark>
67 </revision>
63 </revhistory> 68 </revhistory>
64 69
65 <copyright> 70 <copyright>
diff --git a/documentation/poky.ent b/documentation/poky.ent
index a63c3ea84f..9018a12cbb 100644
--- a/documentation/poky.ent
+++ b/documentation/poky.ent
@@ -1,10 +1,10 @@
1<!ENTITY DISTRO "2.1.1"> 1<!ENTITY DISTRO "2.1.2">
2<!ENTITY DISTRO_COMPRESSED "212"> 2<!ENTITY DISTRO_COMPRESSED "212">
3<!ENTITY DISTRO_NAME_NO_CAP "krogoth"> 3<!ENTITY DISTRO_NAME_NO_CAP "krogoth">
4<!ENTITY DISTRO_NAME "Krogoth"> 4<!ENTITY DISTRO_NAME "Krogoth">
5<!ENTITY YOCTO_DOC_VERSION "2.1.1"> 5<!ENTITY YOCTO_DOC_VERSION "2.1.2">
6<!ENTITY POKYVERSION "15.0.1"> 6<!ENTITY POKYVERSION "15.0.2">
7<!ENTITY POKYVERSION_COMPRESSED "1501"> 7<!ENTITY POKYVERSION_COMPRESSED "1502">
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-2016"> 9<!ENTITY COPYRIGHT_YEAR "2010-2016">
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 5ea28426cb..2e72483cf9 100644
--- a/documentation/profile-manual/profile-manual.xml
+++ b/documentation/profile-manual/profile-manual.xml
@@ -76,6 +76,11 @@
76 <date>August 2016</date> 76 <date>August 2016</date>
77 <revremark>Released with the Yocto Project 2.1.1 Release.</revremark> 77 <revremark>Released with the Yocto Project 2.1.1 Release.</revremark>
78 </revision> 78 </revision>
79 <revision>
80 <revnumber>2.1.2</revnumber>
81 <date>October 2016</date>
82 <revremark>Released with the Yocto Project 2.1.2 Release.</revremark>
83 </revision>
79 </revhistory> 84 </revhistory>
80 85
81 <copyright> 86 <copyright>
diff --git a/documentation/ref-manual/ref-manual.xml b/documentation/ref-manual/ref-manual.xml
index 5e91d69d28..862d76c625 100644
--- a/documentation/ref-manual/ref-manual.xml
+++ b/documentation/ref-manual/ref-manual.xml
@@ -107,6 +107,11 @@
107 <date>August 2016</date> 107 <date>August 2016</date>
108 <revremark>Released with the Yocto Project 2.1.1 Release.</revremark> 108 <revremark>Released with the Yocto Project 2.1.1 Release.</revremark>
109 </revision> 109 </revision>
110 <revision>
111 <revnumber>2.1.2</revnumber>
112 <date>October 2016</date>
113 <revremark>Released with the Yocto Project 2.1.2 Release.</revremark>
114 </revision>
110 </revhistory> 115 </revhistory>
111 116
112 <copyright> 117 <copyright>
diff --git a/documentation/sdk-manual/sdk-manual.xml b/documentation/sdk-manual/sdk-manual.xml
index ed38995001..2581c14f23 100644
--- a/documentation/sdk-manual/sdk-manual.xml
+++ b/documentation/sdk-manual/sdk-manual.xml
@@ -41,6 +41,11 @@
41 <date>August 2016</date> 41 <date>August 2016</date>
42 <revremark>Released with the Yocto Project 2.1.1 Release.</revremark> 42 <revremark>Released with the Yocto Project 2.1.1 Release.</revremark>
43 </revision> 43 </revision>
44 <revision>
45 <revnumber>2.1.2</revnumber>
46 <date>October 2016</date>
47 <revremark>Released with the Yocto Project 2.1.2 Release.</revremark>
48 </revision>
44 </revhistory> 49 </revhistory>
45 50
46 <copyright> 51 <copyright>
diff --git a/documentation/toaster-manual/toaster-manual.xml b/documentation/toaster-manual/toaster-manual.xml
index dbc05cb457..ef36937d9b 100644
--- a/documentation/toaster-manual/toaster-manual.xml
+++ b/documentation/toaster-manual/toaster-manual.xml
@@ -51,6 +51,11 @@
51 <date>August 2016</date> 51 <date>August 2016</date>
52 <revremark>Released with the Yocto Project 2.1.1 Release.</revremark> 52 <revremark>Released with the Yocto Project 2.1.1 Release.</revremark>
53 </revision> 53 </revision>
54 <revision>
55 <revnumber>2.1.2</revnumber>
56 <date>October 2016</date>
57 <revremark>Released with the Yocto Project 2.1.2 Release.</revremark>
58 </revision>
54 </revhistory> 59 </revhistory>
55 60
56 <copyright> 61 <copyright>
diff --git a/documentation/tools/mega-manual.sed b/documentation/tools/mega-manual.sed
index d548348de2..671addabb6 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.1.1\/[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.1.2\/[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.1.1\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g 6s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.2\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g
7s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.1\/poky-ref-manual\/poky-ref-manual.html#/\"link\" href=\"#/g 7s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.2\/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.1.1\/[a-z]*-[a-z]*\/[a-z]*-[a-z]*.html#/\"link\" href=\"#/g 14# s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.2\/[a-z]*-[a-z]*\/[a-z]*-[a-z]*.html#/\"link\" href=\"#/g
15 15
16s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.1\/sdk-manual\/sdk-manual.html#/\"link\" href=\"#/g 16s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.2\/sdk-manual\/sdk-manual.html#/\"link\" href=\"#/g
17s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.1\/bsp-guide\/bsp-guide.html#/\"link\" href=\"#/g 17s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.2\/bsp-guide\/bsp-guide.html#/\"link\" href=\"#/g
18s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.1\/dev-manual\/dev-manual.html#/\"link\" href=\"#/g 18s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.2\/dev-manual\/dev-manual.html#/\"link\" href=\"#/g
19s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.1\/kernel-dev\/kernel-dev.html#/\"link\" href=\"#/g 19s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.2\/kernel-dev\/kernel-dev.html#/\"link\" href=\"#/g
20s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.1\/profile-manual\/profile-manual.html#/\"link\" href=\"#/g 20s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.2\/profile-manual\/profile-manual.html#/\"link\" href=\"#/g
21s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.1\/ref-manual\/ref-manual.html#/\"link\" href=\"#/g 21s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.2\/ref-manual\/ref-manual.html#/\"link\" href=\"#/g
22s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.1\/toaster-manual\/toaster-manual.html#/\"link\" href=\"#/g 22s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.2\/toaster-manual\/toaster-manual.html#/\"link\" href=\"#/g
23s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.1\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g 23s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1.2\/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.1.1\/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.1.2\/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.1.1\/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.1.2\/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.1.1\/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.1.2\/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.1.1\/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.1.2\/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.1.1\/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.1.2\/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.1.1\/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.1.2\/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.1.1\/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.1.2\/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.1.1\/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.1.2\/toaster-manual\/toaster-manual.html\" target=\"_top\">Toaster User Manual<\/a>/Toaster User Manual/g