summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/adt-manual/adt-manual.xml5
-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/toaster-manual/toaster-manual.xml5
-rw-r--r--documentation/tools/mega-manual.sed40
10 files changed, 64 insertions, 24 deletions
diff --git a/documentation/adt-manual/adt-manual.xml b/documentation/adt-manual/adt-manual.xml
index 67b330a53d..972f8bf086 100644
--- a/documentation/adt-manual/adt-manual.xml
+++ b/documentation/adt-manual/adt-manual.xml
@@ -91,6 +91,11 @@
91 <date>October 2015</date> 91 <date>October 2015</date>
92 <revremark>Released with the Yocto Project 2.0 Release.</revremark> 92 <revremark>Released with the Yocto Project 2.0 Release.</revremark>
93 </revision> 93 </revision>
94 <revision>
95 <revnumber>2.1</revnumber>
96 <date>Sometime in 2016</date>
97 <revremark>Released with the future Yocto Project 2.1 Release.</revremark>
98 </revision>
94 </revhistory> 99 </revhistory>
95 100
96 <copyright> 101 <copyright>
diff --git a/documentation/bsp-guide/bsp-guide.xml b/documentation/bsp-guide/bsp-guide.xml
index db8f87b77e..577c19a37f 100644
--- a/documentation/bsp-guide/bsp-guide.xml
+++ b/documentation/bsp-guide/bsp-guide.xml
@@ -103,6 +103,11 @@
103 <date>October 2015</date> 103 <date>October 2015</date>
104 <revremark>Released with the Yocto Project 2.0 Release.</revremark> 104 <revremark>Released with the Yocto Project 2.0 Release.</revremark>
105 </revision> 105 </revision>
106 <revision>
107 <revnumber>2.1</revnumber>
108 <date>Sometime in 2016</date>
109 <revremark>Released with the future Yocto Project 2.1 Release.</revremark>
110 </revision>
106 </revhistory> 111 </revhistory>
107 112
108 <copyright> 113 <copyright>
diff --git a/documentation/dev-manual/dev-manual.xml b/documentation/dev-manual/dev-manual.xml
index 3ddd01fde9..8052646d58 100644
--- a/documentation/dev-manual/dev-manual.xml
+++ b/documentation/dev-manual/dev-manual.xml
@@ -81,6 +81,11 @@
81 <date>October 2015</date> 81 <date>October 2015</date>
82 <revremark>Released with the Yocto Project 2.0 Release.</revremark> 82 <revremark>Released with the Yocto Project 2.0 Release.</revremark>
83 </revision> 83 </revision>
84 <revision>
85 <revnumber>2.1</revnumber>
86 <date>Sometime in 2016</date>
87 <revremark>Released with the future Yocto Project 2.1 Release.</revremark>
88 </revision>
84 </revhistory> 89 </revhistory>
85 90
86 <copyright> 91 <copyright>
diff --git a/documentation/kernel-dev/kernel-dev.xml b/documentation/kernel-dev/kernel-dev.xml
index 38850fa3c8..e7f00b7f6b 100644
--- a/documentation/kernel-dev/kernel-dev.xml
+++ b/documentation/kernel-dev/kernel-dev.xml
@@ -66,6 +66,11 @@
66 <date>October 2015</date> 66 <date>October 2015</date>
67 <revremark>Released with the Yocto Project 2.0 Release.</revremark> 67 <revremark>Released with the Yocto Project 2.0 Release.</revremark>
68 </revision> 68 </revision>
69 <revision>
70 <revnumber>2.1</revnumber>
71 <date>Sometime in 2016</date>
72 <revremark>Released with the future Yocto Project 2.1 Release.</revremark>
73 </revision>
69 </revhistory> 74 </revhistory>
70 75
71 <copyright> 76 <copyright>
diff --git a/documentation/mega-manual/mega-manual.xml b/documentation/mega-manual/mega-manual.xml
index 5c1faec7a3..51e98cd52a 100644
--- a/documentation/mega-manual/mega-manual.xml
+++ b/documentation/mega-manual/mega-manual.xml
@@ -50,6 +50,11 @@
50 <date>October 2015</date> 50 <date>October 2015</date>
51 <revremark>Released with the Yocto Project 2.0 Release.</revremark> 51 <revremark>Released with the Yocto Project 2.0 Release.</revremark>
52 </revision> 52 </revision>
53 <revision>
54 <revnumber>2.1</revnumber>
55 <date>Sometime in 2016</date>
56 <revremark>Released with the future Yocto Project 2.1 Release.</revremark>
57 </revision>
53 </revhistory> 58 </revhistory>
54 59
55 <copyright> 60 <copyright>
diff --git a/documentation/poky.ent b/documentation/poky.ent
index 62c6503215..ab0b7d71be 100644
--- a/documentation/poky.ent
+++ b/documentation/poky.ent
@@ -1,7 +1,7 @@
1<!ENTITY DISTRO "2.0"> 1<!ENTITY DISTRO "2.1">
2<!ENTITY DISTRO_COMPRESSED "20"> 2<!ENTITY DISTRO_COMPRESSED "21">
3<!ENTITY DISTRO_NAME "jethro"> 3<!ENTITY DISTRO_NAME "tbd">
4<!ENTITY YOCTO_DOC_VERSION "2.0"> 4<!ENTITY YOCTO_DOC_VERSION "2.1">
5<!ENTITY POKYVERSION "15.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;">
diff --git a/documentation/profile-manual/profile-manual.xml b/documentation/profile-manual/profile-manual.xml
index 7f9b2c43b1..3b79556803 100644
--- a/documentation/profile-manual/profile-manual.xml
+++ b/documentation/profile-manual/profile-manual.xml
@@ -66,6 +66,11 @@
66 <date>October 2015</date> 66 <date>October 2015</date>
67 <revremark>Released with the Yocto Project 2.0 Release.</revremark> 67 <revremark>Released with the Yocto Project 2.0 Release.</revremark>
68 </revision> 68 </revision>
69 <revision>
70 <revnumber>2.1</revnumber>
71 <date>Sometime in 2016</date>
72 <revremark>Released with the future Yocto Project 2.1 Release.</revremark>
73 </revision>
69 </revhistory> 74 </revhistory>
70 75
71 <copyright> 76 <copyright>
diff --git a/documentation/ref-manual/ref-manual.xml b/documentation/ref-manual/ref-manual.xml
index a296b9bc3d..79c8d9c023 100644
--- a/documentation/ref-manual/ref-manual.xml
+++ b/documentation/ref-manual/ref-manual.xml
@@ -97,6 +97,11 @@
97 <date>October 2015</date> 97 <date>October 2015</date>
98 <revremark>Released with the Yocto Project 2.0 Release.</revremark> 98 <revremark>Released with the Yocto Project 2.0 Release.</revremark>
99 </revision> 99 </revision>
100 <revision>
101 <revnumber>2.1</revnumber>
102 <date>Sometime in 2016</date>
103 <revremark>Released with the future Yocto Project 2.1 Release.</revremark>
104 </revision>
100 </revhistory> 105 </revhistory>
101 106
102 <copyright> 107 <copyright>
diff --git a/documentation/toaster-manual/toaster-manual.xml b/documentation/toaster-manual/toaster-manual.xml
index 59dca8f62c..fd4d37e96f 100644
--- a/documentation/toaster-manual/toaster-manual.xml
+++ b/documentation/toaster-manual/toaster-manual.xml
@@ -41,6 +41,11 @@
41 <date>October 2015</date> 41 <date>October 2015</date>
42 <revremark>Released with the Yocto Project 2.0 Release.</revremark> 42 <revremark>Released with the Yocto Project 2.0 Release.</revremark>
43 </revision> 43 </revision>
44 <revision>
45 <revnumber>2.1</revnumber>
46 <date>Sometime in 2016</date>
47 <revremark>Released with the future Yocto Project 2.1 Release.</revremark>
48 </revision>
44 </revhistory> 49 </revhistory>
45 50
46 <copyright> 51 <copyright>
diff --git a/documentation/tools/mega-manual.sed b/documentation/tools/mega-manual.sed
index 088a99b34b..4d404d436f 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.0\/[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\/[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.0\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g 6s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g
7s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/poky-ref-manual\/poky-ref-manual.html#/\"link\" href=\"#/g 7s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/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.0\/[a-z]*-[a-z]*\/[a-z]*-[a-z]*.html#/\"link\" href=\"#/g 14# s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/[a-z]*-[a-z]*\/[a-z]*-[a-z]*.html#/\"link\" href=\"#/g
15 15
16s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/adt-manual\/adt-manual.html#/\"link\" href=\"#/g 16s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/adt-manual\/adt-manual.html#/\"link\" href=\"#/g
17s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/bsp-guide\/bsp-guide.html#/\"link\" href=\"#/g 17s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/bsp-guide\/bsp-guide.html#/\"link\" href=\"#/g
18s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/dev-manual\/dev-manual.html#/\"link\" href=\"#/g 18s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/dev-manual\/dev-manual.html#/\"link\" href=\"#/g
19s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/kernel-dev\/kernel-dev.html#/\"link\" href=\"#/g 19s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/kernel-dev\/kernel-dev.html#/\"link\" href=\"#/g
20s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/profile-manual\/profile-manual.html#/\"link\" href=\"#/g 20s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/profile-manual\/profile-manual.html#/\"link\" href=\"#/g
21s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/ref-manual\/ref-manual.html#/\"link\" href=\"#/g 21s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/ref-manual\/ref-manual.html#/\"link\" href=\"#/g
22s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/toaster-manual\/toaster-manual.html#/\"link\" href=\"#/g 22s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/toaster-manual\/toaster-manual.html#/\"link\" href=\"#/g
23s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.0\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g 23s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/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.0\/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\/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.0\/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\/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.0\/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.1\/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\/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 29s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.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
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 30s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/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.0\/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\/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.0\/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\/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.0\/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\/toaster-manual\/toaster-manual.html\" target=\"_top\">Toaster User Manual<\/a>/Toaster User Manual/g