summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/adt-manual/adt-manual.xml4
-rw-r--r--documentation/bsp-guide/bsp-guide.xml4
-rw-r--r--documentation/dev-manual/dev-manual.xml6
-rw-r--r--documentation/kernel-dev/kernel-dev.xml4
-rw-r--r--documentation/mega-manual/mega-manual.xml6
-rw-r--r--documentation/poky.ent10
-rw-r--r--documentation/profile-manual/profile-manual.xml4
-rw-r--r--documentation/ref-manual/ref-manual.xml4
-rw-r--r--documentation/toaster-manual/toaster-manual.xml6
-rw-r--r--documentation/tools/mega-manual.sed40
10 files changed, 44 insertions, 44 deletions
diff --git a/documentation/adt-manual/adt-manual.xml b/documentation/adt-manual/adt-manual.xml
index 6ce62c98d0..67b330a53d 100644
--- a/documentation/adt-manual/adt-manual.xml
+++ b/documentation/adt-manual/adt-manual.xml
@@ -87,9 +87,9 @@
87 <revremark>Released with the Yocto Project 1.8 Release.</revremark> 87 <revremark>Released with the Yocto Project 1.8 Release.</revremark>
88 </revision> 88 </revision>
89 <revision> 89 <revision>
90 <revnumber>1.9</revnumber> 90 <revnumber>2.0</revnumber>
91 <date>October 2015</date> 91 <date>October 2015</date>
92 <revremark>Released with the Yocto Project 1.9 Release.</revremark> 92 <revremark>Released with the Yocto Project 2.0 Release.</revremark>
93 </revision> 93 </revision>
94 </revhistory> 94 </revhistory>
95 95
diff --git a/documentation/bsp-guide/bsp-guide.xml b/documentation/bsp-guide/bsp-guide.xml
index 5477ca866b..db8f87b77e 100644
--- a/documentation/bsp-guide/bsp-guide.xml
+++ b/documentation/bsp-guide/bsp-guide.xml
@@ -99,9 +99,9 @@
99 <revremark>Released with the Yocto Project 1.8 Release.</revremark> 99 <revremark>Released with the Yocto Project 1.8 Release.</revremark>
100 </revision> 100 </revision>
101 <revision> 101 <revision>
102 <revnumber>1.9</revnumber> 102 <revnumber>2.0</revnumber>
103 <date>October 2015</date> 103 <date>October 2015</date>
104 <revremark>Released with the Yocto Project 1.9 Release.</revremark> 104 <revremark>Released with the Yocto Project 2.0 Release.</revremark>
105 </revision> 105 </revision>
106 </revhistory> 106 </revhistory>
107 107
diff --git a/documentation/dev-manual/dev-manual.xml b/documentation/dev-manual/dev-manual.xml
index 608d3a9da6..3ddd01fde9 100644
--- a/documentation/dev-manual/dev-manual.xml
+++ b/documentation/dev-manual/dev-manual.xml
@@ -26,7 +26,7 @@
26 <affiliation> 26 <affiliation>
27 <orgname>Intel Corporation</orgname> 27 <orgname>Intel Corporation</orgname>
28 </affiliation> 28 </affiliation>
29 <email>scott.m.rifenbark@intel.com</email> 29 <email>srifenbark@gmail.com</email>
30 </author> 30 </author>
31 </authorgroup> 31 </authorgroup>
32 32
@@ -77,9 +77,9 @@
77 <revremark>Released with the Yocto Project 1.8 Release.</revremark> 77 <revremark>Released with the Yocto Project 1.8 Release.</revremark>
78 </revision> 78 </revision>
79 <revision> 79 <revision>
80 <revnumber>1.9</revnumber> 80 <revnumber>2.0</revnumber>
81 <date>October 2015</date> 81 <date>October 2015</date>
82 <revremark>Released with the Yocto Project 1.9 Release.</revremark> 82 <revremark>Released with the Yocto Project 2.0 Release.</revremark>
83 </revision> 83 </revision>
84 </revhistory> 84 </revhistory>
85 85
diff --git a/documentation/kernel-dev/kernel-dev.xml b/documentation/kernel-dev/kernel-dev.xml
index e3df2cc235..38850fa3c8 100644
--- a/documentation/kernel-dev/kernel-dev.xml
+++ b/documentation/kernel-dev/kernel-dev.xml
@@ -62,9 +62,9 @@
62 <revremark>Released with the Yocto Project 1.8 Release.</revremark> 62 <revremark>Released with the Yocto Project 1.8 Release.</revremark>
63 </revision> 63 </revision>
64 <revision> 64 <revision>
65 <revnumber>1.9</revnumber> 65 <revnumber>2.0</revnumber>
66 <date>October 2015</date> 66 <date>October 2015</date>
67 <revremark>Released with the Yocto Project 1.9 Release.</revremark> 67 <revremark>Released with the Yocto Project 2.0 Release.</revremark>
68 </revision> 68 </revision>
69 </revhistory> 69 </revhistory>
70 70
diff --git a/documentation/mega-manual/mega-manual.xml b/documentation/mega-manual/mega-manual.xml
index a75ebf1b56..5c1faec7a3 100644
--- a/documentation/mega-manual/mega-manual.xml
+++ b/documentation/mega-manual/mega-manual.xml
@@ -35,7 +35,7 @@
35 <affiliation> 35 <affiliation>
36 <orgname>Intel Corporation</orgname> 36 <orgname>Intel Corporation</orgname>
37 </affiliation> 37 </affiliation>
38 <email>scott.m.rifenbark@intel.com</email> 38 <email>srifenbark@gmail.com</email>
39 </author> 39 </author>
40 </authorgroup> 40 </authorgroup>
41 41
@@ -46,9 +46,9 @@
46 <revremark>Released with the Yocto Project 1.8 Release.</revremark> 46 <revremark>Released with the Yocto Project 1.8 Release.</revremark>
47 </revision> 47 </revision>
48 <revision> 48 <revision>
49 <revnumber>1.9</revnumber> 49 <revnumber>2.0</revnumber>
50 <date>October 2015</date> 50 <date>October 2015</date>
51 <revremark>Released with the Yocto Project 1.9 Release.</revremark> 51 <revremark>Released with the Yocto Project 2.0 Release.</revremark>
52 </revision> 52 </revision>
53 </revhistory> 53 </revhistory>
54 54
diff --git a/documentation/poky.ent b/documentation/poky.ent
index 07c4f6d472..165b291eed 100644
--- a/documentation/poky.ent
+++ b/documentation/poky.ent
@@ -1,8 +1,8 @@
1<!ENTITY DISTRO "1.9"> 1<!ENTITY DISTRO "2.0">
2<!ENTITY DISTRO_COMPRESSED "19"> 2<!ENTITY DISTRO_COMPRESSED "20">
3<!ENTITY DISTRO_NAME "tbd"> 3<!ENTITY DISTRO_NAME "jethro">
4<!ENTITY YOCTO_DOC_VERSION "1.9"> 4<!ENTITY YOCTO_DOC_VERSION "2.0">
5<!ENTITY POKYVERSION "14.0.0"> 5<!ENTITY POKYVERSION "15.0.0">
6<!ENTITY POKYVERSION_COMPRESSED "1400"> 6<!ENTITY POKYVERSION_COMPRESSED "1400">
7<!ENTITY YOCTO_POKY "poky-&DISTRO_NAME;-&POKYVERSION;"> 7<!ENTITY YOCTO_POKY "poky-&DISTRO_NAME;-&POKYVERSION;">
8<!ENTITY COPYRIGHT_YEAR "2010-2015"> 8<!ENTITY COPYRIGHT_YEAR "2010-2015">
diff --git a/documentation/profile-manual/profile-manual.xml b/documentation/profile-manual/profile-manual.xml
index 38620df877..7f9b2c43b1 100644
--- a/documentation/profile-manual/profile-manual.xml
+++ b/documentation/profile-manual/profile-manual.xml
@@ -62,9 +62,9 @@
62 <revremark>Released with the Yocto Project 1.8 Release.</revremark> 62 <revremark>Released with the Yocto Project 1.8 Release.</revremark>
63 </revision> 63 </revision>
64 <revision> 64 <revision>
65 <revnumber>1.9</revnumber> 65 <revnumber>2.0</revnumber>
66 <date>October 2015</date> 66 <date>October 2015</date>
67 <revremark>Released with the Yocto Project 1.9 Release.</revremark> 67 <revremark>Released with the Yocto Project 2.0 Release.</revremark>
68 </revision> 68 </revision>
69 </revhistory> 69 </revhistory>
70 70
diff --git a/documentation/ref-manual/ref-manual.xml b/documentation/ref-manual/ref-manual.xml
index 0b4eddf00c..a296b9bc3d 100644
--- a/documentation/ref-manual/ref-manual.xml
+++ b/documentation/ref-manual/ref-manual.xml
@@ -93,9 +93,9 @@
93 <revremark>Released with the Yocto Project 1.8 Release.</revremark> 93 <revremark>Released with the Yocto Project 1.8 Release.</revremark>
94 </revision> 94 </revision>
95 <revision> 95 <revision>
96 <revnumber>1.9</revnumber> 96 <revnumber>2.0</revnumber>
97 <date>October 2015</date> 97 <date>October 2015</date>
98 <revremark>Released with the Yocto Project 1.9 Release.</revremark> 98 <revremark>Released with the Yocto Project 2.0 Release.</revremark>
99 </revision> 99 </revision>
100 </revhistory> 100 </revhistory>
101 101
diff --git a/documentation/toaster-manual/toaster-manual.xml b/documentation/toaster-manual/toaster-manual.xml
index 9dac6d9655..59dca8f62c 100644
--- a/documentation/toaster-manual/toaster-manual.xml
+++ b/documentation/toaster-manual/toaster-manual.xml
@@ -26,7 +26,7 @@
26 <affiliation> 26 <affiliation>
27 <orgname>Intel Corporation</orgname> 27 <orgname>Intel Corporation</orgname>
28 </affiliation> 28 </affiliation>
29 <email>scott.m.rifenbark@intel.com</email> 29 <email>srifenbark@gmail.com</email>
30 </author> 30 </author>
31 </authorgroup> 31 </authorgroup>
32 32
@@ -37,9 +37,9 @@
37 <revremark>Released with the Yocto Project 1.8 Release.</revremark> 37 <revremark>Released with the Yocto Project 1.8 Release.</revremark>
38 </revision> 38 </revision>
39 <revision> 39 <revision>
40 <revnumber>1.9</revnumber> 40 <revnumber>2.0</revnumber>
41 <date>October 2015</date> 41 <date>October 2015</date>
42 <revremark>Released with the Yocto Project 1.9 Release.</revremark> 42 <revremark>Released with the Yocto Project 2.0 Release.</revremark>
43 </revision> 43 </revision>
44 </revhistory> 44 </revhistory>
45 45
diff --git a/documentation/tools/mega-manual.sed b/documentation/tools/mega-manual.sed
index bec40b3f94..088a99b34b 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\/1.9\/[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.0\/[a-z]*-[a-z]*-[a-z]*\/[a-z]*-[a-z]*-[a-z]*.html#/\"link\" href=\"#/g
6s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/1.9\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g 6s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g
7s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/1.9\/poky-ref-manual\/poky-ref-manual.html#/\"link\" href=\"#/g 7s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/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\/1.9\/[a-z]*-[a-z]*\/[a-z]*-[a-z]*.html#/\"link\" href=\"#/g 14# s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/[a-z]*-[a-z]*\/[a-z]*-[a-z]*.html#/\"link\" href=\"#/g
15 15
16s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/1.9\/adt-manual\/adt-manual.html#/\"link\" href=\"#/g 16s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/adt-manual\/adt-manual.html#/\"link\" href=\"#/g
17s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/1.9\/bsp-guide\/bsp-guide.html#/\"link\" href=\"#/g 17s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/bsp-guide\/bsp-guide.html#/\"link\" href=\"#/g
18s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/1.9\/dev-manual\/dev-manual.html#/\"link\" href=\"#/g 18s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/dev-manual\/dev-manual.html#/\"link\" href=\"#/g
19s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/1.9\/kernel-dev\/kernel-dev.html#/\"link\" href=\"#/g 19s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/kernel-dev\/kernel-dev.html#/\"link\" href=\"#/g
20s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/1.9\/profile-manual\/profile-manual.html#/\"link\" href=\"#/g 20s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/profile-manual\/profile-manual.html#/\"link\" href=\"#/g
21s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/1.9\/ref-manual\/ref-manual.html#/\"link\" href=\"#/g 21s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/ref-manual\/ref-manual.html#/\"link\" href=\"#/g
22s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/1.9\/toaster-manual\/toaster-manual.html#/\"link\" href=\"#/g 22s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/toaster-manual\/toaster-manual.html#/\"link\" href=\"#/g
23s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/1.9\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g 23s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/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\/1.9\/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.0\/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\/1.9\/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.0\/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\/1.9\/adt-manual\/adt-manual.html\" target=\"_top\">Yocto Project Application Developer's Guide<\/a>/Yocto Project Application Developer's Guide/g 28s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/adt-manual\/adt-manual.html\" target=\"_top\">Yocto Project Application Developer's Guide<\/a>/Yocto Project Application Developer's Guide/g
29s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/1.9\/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.0\/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\/1.9\/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.0\/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\/1.9\/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.0\/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\/1.9\/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.0\/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\/1.9\/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.0\/toaster-manual\/toaster-manual.html\" target=\"_top\">Toaster User Manual<\/a>/Toaster User Manual/g