diff options
-rw-r--r-- | documentation/bsp-guide/bsp-guide.xml | 5 | ||||
-rw-r--r-- | documentation/dev-manual/dev-manual.xml | 5 | ||||
-rw-r--r-- | documentation/kernel-dev/kernel-dev.xml | 5 | ||||
-rw-r--r-- | documentation/mega-manual/mega-manual.xml | 5 | ||||
-rw-r--r-- | documentation/poky.ent | 14 | ||||
-rw-r--r-- | documentation/profile-manual/profile-manual.xml | 5 | ||||
-rw-r--r-- | documentation/ref-manual/ref-manual.xml | 5 | ||||
-rw-r--r-- | documentation/sdk-manual/sdk-manual.xml | 5 | ||||
-rw-r--r-- | documentation/toaster-manual/toaster-manual.xml | 5 | ||||
-rw-r--r-- | documentation/tools/mega-manual.sed | 40 |
10 files changed, 67 insertions, 27 deletions
diff --git a/documentation/bsp-guide/bsp-guide.xml b/documentation/bsp-guide/bsp-guide.xml index c00b3458cc..6c3b00d8a5 100644 --- a/documentation/bsp-guide/bsp-guide.xml +++ b/documentation/bsp-guide/bsp-guide.xml | |||
@@ -108,6 +108,11 @@ | |||
108 | <date>April 2016</date> | 108 | <date>April 2016</date> |
109 | <revremark>Released with the Yocto Project 2.1 Release.</revremark> | 109 | <revremark>Released with the Yocto Project 2.1 Release.</revremark> |
110 | </revision> | 110 | </revision> |
111 | <revision> | ||
112 | <revnumber>2.2</revnumber> | ||
113 | <date>Sometime in 2016</date> | ||
114 | <revremark>Released with the Yocto Project 2.2 Release.</revremark> | ||
115 | </revision> | ||
111 | </revhistory> | 116 | </revhistory> |
112 | 117 | ||
113 | <copyright> | 118 | <copyright> |
diff --git a/documentation/dev-manual/dev-manual.xml b/documentation/dev-manual/dev-manual.xml index 791a8cb6a0..eaa64e93c1 100644 --- a/documentation/dev-manual/dev-manual.xml +++ b/documentation/dev-manual/dev-manual.xml | |||
@@ -86,6 +86,11 @@ | |||
86 | <date>April 2016</date> | 86 | <date>April 2016</date> |
87 | <revremark>Released with the Yocto Project 2.1 Release.</revremark> | 87 | <revremark>Released with the Yocto Project 2.1 Release.</revremark> |
88 | </revision> | 88 | </revision> |
89 | <revision> | ||
90 | <revnumber>2.2</revnumber> | ||
91 | <date>Sometime in 2016</date> | ||
92 | <revremark>Released with the Yocto Project 2.2 Release.</revremark> | ||
93 | </revision> | ||
89 | </revhistory> | 94 | </revhistory> |
90 | 95 | ||
91 | <copyright> | 96 | <copyright> |
diff --git a/documentation/kernel-dev/kernel-dev.xml b/documentation/kernel-dev/kernel-dev.xml index fb11dd15c2..7a5782eaad 100644 --- a/documentation/kernel-dev/kernel-dev.xml +++ b/documentation/kernel-dev/kernel-dev.xml | |||
@@ -71,6 +71,11 @@ | |||
71 | <date>April 2016</date> | 71 | <date>April 2016</date> |
72 | <revremark>Released with the Yocto Project 2.1 Release.</revremark> | 72 | <revremark>Released with the Yocto Project 2.1 Release.</revremark> |
73 | </revision> | 73 | </revision> |
74 | <revision> | ||
75 | <revnumber>2.2</revnumber> | ||
76 | <date>Sometime in 2016</date> | ||
77 | <revremark>Released with the Yocto Project 2.2 Release.</revremark> | ||
78 | </revision> | ||
74 | </revhistory> | 79 | </revhistory> |
75 | 80 | ||
76 | <copyright> | 81 | <copyright> |
diff --git a/documentation/mega-manual/mega-manual.xml b/documentation/mega-manual/mega-manual.xml index 154e369ab0..9a7c385909 100644 --- a/documentation/mega-manual/mega-manual.xml +++ b/documentation/mega-manual/mega-manual.xml | |||
@@ -55,6 +55,11 @@ | |||
55 | <date>April 2016</date> | 55 | <date>April 2016</date> |
56 | <revremark>Released with the Yocto Project 2.1 Release.</revremark> | 56 | <revremark>Released with the Yocto Project 2.1 Release.</revremark> |
57 | </revision> | 57 | </revision> |
58 | <revision> | ||
59 | <revnumber>2.2</revnumber> | ||
60 | <date>Sometime in 2016</date> | ||
61 | <revremark>Released with the Yocto Project 2.2 Release.</revremark> | ||
62 | </revision> | ||
58 | </revhistory> | 63 | </revhistory> |
59 | 64 | ||
60 | <copyright> | 65 | <copyright> |
diff --git a/documentation/poky.ent b/documentation/poky.ent index 673ab23c9c..9a459087c9 100644 --- a/documentation/poky.ent +++ b/documentation/poky.ent | |||
@@ -1,10 +1,10 @@ | |||
1 | <!ENTITY DISTRO "2.1"> | 1 | <!ENTITY DISTRO "2.2"> |
2 | <!ENTITY DISTRO_COMPRESSED "21"> | 2 | <!ENTITY DISTRO_COMPRESSED "22"> |
3 | <!ENTITY DISTRO_NAME_NO_CAP "krogoth"> | 3 | <!ENTITY DISTRO_NAME_NO_CAP "tbd"> |
4 | <!ENTITY DISTRO_NAME "Krogoth"> | 4 | <!ENTITY DISTRO_NAME "Tbd"> |
5 | <!ENTITY YOCTO_DOC_VERSION "2.1"> | 5 | <!ENTITY YOCTO_DOC_VERSION "2.2"> |
6 | <!ENTITY POKYVERSION "15.0.0"> | 6 | <!ENTITY POKYVERSION "16.0.0"> |
7 | <!ENTITY POKYVERSION_COMPRESSED "1500"> | 7 | <!ENTITY POKYVERSION_COMPRESSED "1600"> |
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 1e0ccc1aac..9f63e1180b 100644 --- a/documentation/profile-manual/profile-manual.xml +++ b/documentation/profile-manual/profile-manual.xml | |||
@@ -71,6 +71,11 @@ | |||
71 | <date>April 2016</date> | 71 | <date>April 2016</date> |
72 | <revremark>Released with the Yocto Project 2.1 Release.</revremark> | 72 | <revremark>Released with the Yocto Project 2.1 Release.</revremark> |
73 | </revision> | 73 | </revision> |
74 | <revision> | ||
75 | <revnumber>2.2</revnumber> | ||
76 | <date>Sometime in 2016</date> | ||
77 | <revremark>Released with the Yocto Project 2.2 Release.</revremark> | ||
78 | </revision> | ||
74 | </revhistory> | 79 | </revhistory> |
75 | 80 | ||
76 | <copyright> | 81 | <copyright> |
diff --git a/documentation/ref-manual/ref-manual.xml b/documentation/ref-manual/ref-manual.xml index 6834d5f0ac..d375157b73 100644 --- a/documentation/ref-manual/ref-manual.xml +++ b/documentation/ref-manual/ref-manual.xml | |||
@@ -102,6 +102,11 @@ | |||
102 | <date>April 2016</date> | 102 | <date>April 2016</date> |
103 | <revremark>Released with the Yocto Project 2.1 Release.</revremark> | 103 | <revremark>Released with the Yocto Project 2.1 Release.</revremark> |
104 | </revision> | 104 | </revision> |
105 | <revision> | ||
106 | <revnumber>2.2</revnumber> | ||
107 | <date>Sometime in 2016</date> | ||
108 | <revremark>Released with the Yocto Project 2.2 Release.</revremark> | ||
109 | </revision> | ||
105 | </revhistory> | 110 | </revhistory> |
106 | 111 | ||
107 | <copyright> | 112 | <copyright> |
diff --git a/documentation/sdk-manual/sdk-manual.xml b/documentation/sdk-manual/sdk-manual.xml index c860782fb3..b690a14012 100644 --- a/documentation/sdk-manual/sdk-manual.xml +++ b/documentation/sdk-manual/sdk-manual.xml | |||
@@ -36,6 +36,11 @@ | |||
36 | <date>April 2016</date> | 36 | <date>April 2016</date> |
37 | <revremark>Released with the Yocto Project 2.1 Release.</revremark> | 37 | <revremark>Released with the Yocto Project 2.1 Release.</revremark> |
38 | </revision> | 38 | </revision> |
39 | <revision> | ||
40 | <revnumber>2.2</revnumber> | ||
41 | <date>Sometime in 2016</date> | ||
42 | <revremark>Released with the Yocto Project 2.2 Release.</revremark> | ||
43 | </revision> | ||
39 | </revhistory> | 44 | </revhistory> |
40 | 45 | ||
41 | <copyright> | 46 | <copyright> |
diff --git a/documentation/toaster-manual/toaster-manual.xml b/documentation/toaster-manual/toaster-manual.xml index 7a8912a6e7..859ebb61ca 100644 --- a/documentation/toaster-manual/toaster-manual.xml +++ b/documentation/toaster-manual/toaster-manual.xml | |||
@@ -46,6 +46,11 @@ | |||
46 | <date>April 2016</date> | 46 | <date>April 2016</date> |
47 | <revremark>Released with the Yocto Project 2.1 Release.</revremark> | 47 | <revremark>Released with the Yocto Project 2.1 Release.</revremark> |
48 | </revision> | 48 | </revision> |
49 | <revision> | ||
50 | <revnumber>2.2</revnumber> | ||
51 | <date>Sometime in 2016</date> | ||
52 | <revremark>Released with the Yocto Project 2.2 Release.</revremark> | ||
53 | </revision> | ||
49 | </revhistory> | 54 | </revhistory> |
50 | 55 | ||
51 | <copyright> | 56 | <copyright> |
diff --git a/documentation/tools/mega-manual.sed b/documentation/tools/mega-manual.sed index 5a3bdf9fb9..b6d265f44a 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\/[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.2\/[a-z]*-[a-z]*-[a-z]*\/[a-z]*-[a-z]*-[a-z]*.html#/\"link\" href=\"#/g |
6 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g | 6 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.2\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g |
7 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/poky-ref-manual\/poky-ref-manual.html#/\"link\" href=\"#/g | 7 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.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\/[a-z]*-[a-z]*\/[a-z]*-[a-z]*.html#/\"link\" href=\"#/g | 14 | # s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.2\/[a-z]*-[a-z]*\/[a-z]*-[a-z]*.html#/\"link\" href=\"#/g |
15 | 15 | ||
16 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/sdk-manual\/sdk-manual.html#/\"link\" href=\"#/g | 16 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.2\/sdk-manual\/sdk-manual.html#/\"link\" href=\"#/g |
17 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/bsp-guide\/bsp-guide.html#/\"link\" href=\"#/g | 17 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.2\/bsp-guide\/bsp-guide.html#/\"link\" href=\"#/g |
18 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/dev-manual\/dev-manual.html#/\"link\" href=\"#/g | 18 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.2\/dev-manual\/dev-manual.html#/\"link\" href=\"#/g |
19 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/kernel-dev\/kernel-dev.html#/\"link\" href=\"#/g | 19 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.2\/kernel-dev\/kernel-dev.html#/\"link\" href=\"#/g |
20 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/profile-manual\/profile-manual.html#/\"link\" href=\"#/g | 20 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.2\/profile-manual\/profile-manual.html#/\"link\" href=\"#/g |
21 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/ref-manual\/ref-manual.html#/\"link\" href=\"#/g | 21 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.2\/ref-manual\/ref-manual.html#/\"link\" href=\"#/g |
22 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/toaster-manual\/toaster-manual.html#/\"link\" href=\"#/g | 22 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.2\/toaster-manual\/toaster-manual.html#/\"link\" href=\"#/g |
23 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.1\/yocto-project-qs\/yocto-project-qs.html#/\"link\" href=\"#/g | 23 | s/\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.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 |
26 | s/<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 | 26 | s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.2\/yocto-project-qs\/yocto-project-qs.html\" target=\"_top\">Yocto Project Quick Start<\/a>/Yocto Project Quick Start/g |
27 | s/<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 | 27 | s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.2\/dev-manual\/dev-manual.html\" target=\"_top\">Yocto Project Development Manual<\/a>/Yocto Project Development Manual/g |
28 | s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.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 | 28 | s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.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 |
29 | s/<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 | 29 | s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.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 |
30 | s/<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 | 30 | s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.2\/profile-manual\/profile-manual.html\" target=\"_top\">Yocto Project Profiling and Tracing Manual<\/a>/Yocto Project Profiling and Tracing Manual/g |
31 | s/<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 | 31 | s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.2\/kernel-dev\/kernel-dev.html\" target=\"_top\">Yocto Project Linux Kernel Development Manual<\/a>/Yocto Project Linux Kernel Development Manual/g |
32 | s/<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 | 32 | s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.2\/ref-manual\/ref-manual.html\" target=\"_top\">Yocto Project Reference Manual<\/a>/Yocto Project Reference Manual/g |
33 | s/<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 | 33 | s/<a class=\"ulink\" href=\"http:\/\/www.yoctoproject.org\/docs\/2.2\/toaster-manual\/toaster-manual.html\" target=\"_top\">Toaster User Manual<\/a>/Toaster User Manual/g |