summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/bsp-guide/bsp.xml6
-rw-r--r--documentation/concepts-manual/concepts-manual-concepts.xml2
-rw-r--r--documentation/dev-manual/dev-manual-common-tasks.xml2
-rw-r--r--documentation/getting-started/getting-started-yp-intro.xml10
-rw-r--r--documentation/ref-manual/ref-structure.xml6
-rw-r--r--documentation/ref-manual/ref-terms.xml2
-rw-r--r--documentation/ref-manual/ref-variables.xml8
7 files changed, 18 insertions, 18 deletions
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index b17e826539..ab9ac1888f 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -1283,7 +1283,7 @@
1283 is found in <filename>poky/meta</filename> 1283 is found in <filename>poky/meta</filename>
1284 directory of the 1284 directory of the
1285 <ulink url='&YOCTO_DOCS_REF_URL;#source-directory'>Source Directory</ulink> 1285 <ulink url='&YOCTO_DOCS_REF_URL;#source-directory'>Source Directory</ulink>
1286 or in the OpenEmbedded Core Layer 1286 or in the OpenEmbedded-Core Layer
1287 (<filename>openembedded-core</filename>) at 1287 (<filename>openembedded-core</filename>) at
1288 <ulink url='http://git.openembedded.org/openembedded-core/tree/meta'></ulink>. 1288 <ulink url='http://git.openembedded.org/openembedded-core/tree/meta'></ulink>.
1289 </para> 1289 </para>
@@ -1303,7 +1303,7 @@
1303 <para>Within any particular 1303 <para>Within any particular
1304 <filename>recipes-*</filename> category, the 1304 <filename>recipes-*</filename> category, the
1305 layout should match what is found in the 1305 layout should match what is found in the
1306 OpenEmbedded Core Git repository 1306 OpenEmbedded-Core Git repository
1307 (<filename>openembedded-core</filename>) 1307 (<filename>openembedded-core</filename>)
1308 or the Source Directory (<filename>poky</filename>). 1308 or the Source Directory (<filename>poky</filename>).
1309 In other words, make sure you place related 1309 In other words, make sure you place related
@@ -1994,7 +1994,7 @@
1994 CPU, and application performance. 1994 CPU, and application performance.
1995 These features, which are collectively known 1995 These features, which are collectively known
1996 as "tuning features", exist in the 1996 as "tuning features", exist in the
1997 <ulink url='&YOCTO_DOCS_REF_URL;#oe-core'>OpenEmbedded Core (OE-Core)</ulink> 1997 <ulink url='&YOCTO_DOCS_REF_URL;#oe-core'>OpenEmbedded-Core (OE-Core)</ulink>
1998 layer (e.g. 1998 layer (e.g.
1999 <filename>poky/meta/conf/machine/include</filename>). 1999 <filename>poky/meta/conf/machine/include</filename>).
2000 In this example, the default tunning file is 2000 In this example, the default tunning file is
diff --git a/documentation/concepts-manual/concepts-manual-concepts.xml b/documentation/concepts-manual/concepts-manual-concepts.xml
index 7ff9e40be4..285e1678a1 100644
--- a/documentation/concepts-manual/concepts-manual-concepts.xml
+++ b/documentation/concepts-manual/concepts-manual-concepts.xml
@@ -12,7 +12,7 @@
12 The 12 The
13 <ulink url='&YOCTO_DOCS_REF_URL;#bitbake-term'>BitBake</ulink> 13 <ulink url='&YOCTO_DOCS_REF_URL;#bitbake-term'>BitBake</ulink>
14 task executor together with various types of configuration files 14 task executor together with various types of configuration files
15 form the OpenEmbedded Core. 15 form the OpenEmbedded-Core.
16 This section overviews these components by describing their use and 16 This section overviews these components by describing their use and
17 how they interact. 17 how they interact.
18 </para> 18 </para>
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index d07b290aa7..093cc37cee 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -6031,7 +6031,7 @@
6031 Wic is a completely independent 6031 Wic is a completely independent
6032 standalone utility that initially provides 6032 standalone utility that initially provides
6033 easier-to-use and more flexible replacements for an 6033 easier-to-use and more flexible replacements for an
6034 existing functionality in OE Core's 6034 existing functionality in OE-Core's
6035 <ulink url='&YOCTO_DOCS_REF_URL;#ref-classes-image-live'><filename>image-live</filename></ulink> 6035 <ulink url='&YOCTO_DOCS_REF_URL;#ref-classes-image-live'><filename>image-live</filename></ulink>
6036 class and <filename>mkefidisk.sh</filename> script. 6036 class and <filename>mkefidisk.sh</filename> script.
6037 The difference between 6037 The difference between
diff --git a/documentation/getting-started/getting-started-yp-intro.xml b/documentation/getting-started/getting-started-yp-intro.xml
index 96bab66dff..d98aacc6f1 100644
--- a/documentation/getting-started/getting-started-yp-intro.xml
+++ b/documentation/getting-started/getting-started-yp-intro.xml
@@ -687,13 +687,13 @@
687 <ulink url='&YOCTO_DOCS_BB_URL;'>BitBake User Manual</ulink>. 687 <ulink url='&YOCTO_DOCS_BB_URL;'>BitBake User Manual</ulink>.
688 </para></listitem> 688 </para></listitem>
689 <listitem><para> 689 <listitem><para>
690 <emphasis>Openembedded Core:</emphasis> 690 <emphasis>OpenEmbedded-Core:</emphasis>
691 OpenEmbedded Core (OE-Core) is a common layer of 691 OpenEmbedded-Core (OE-Core) is a common layer of
692 metadata (i.e. recipes, classes, and associated files) 692 metadata (i.e. recipes, classes, and associated files)
693 used by OpenEmbedded-derived systems, which includes 693 used by OpenEmbedded-derived systems, which includes
694 the Yocto Project. 694 the Yocto Project.
695 The Yocto Project and the OpenEmbedded Project both 695 The Yocto Project and the OpenEmbedded Project both
696 maintain the OpenEmbedded Core. 696 maintain the OpenEmbedded-Core.
697 You can find the OE-Core metadata in the Yocto 697 You can find the OE-Core metadata in the Yocto
698 Project 698 Project
699 <ulink url='&YOCTO_DOCS_GS_URL;#source-repositories'>Source Repositories</ulink> 699 <ulink url='&YOCTO_DOCS_GS_URL;#source-repositories'>Source Repositories</ulink>
@@ -961,7 +961,7 @@
961 <ulink url='&YOCTO_DOCS_REF_URL;#build-system-term'>OpenEmbedded Build System</ulink> 961 <ulink url='&YOCTO_DOCS_REF_URL;#build-system-term'>OpenEmbedded Build System</ulink>
962 build system 962 build system
963 (<ulink url='&YOCTO_DOCS_REF_URL;#bitbake-term'>BitBake</ulink> and 963 (<ulink url='&YOCTO_DOCS_REF_URL;#bitbake-term'>BitBake</ulink> and
964 <ulink url='&YOCTO_DOCS_REF_URL;#oe-core'>OpenEmbedded Core</ulink>) 964 <ulink url='&YOCTO_DOCS_REF_URL;#oe-core'>OpenEmbedded-Core</ulink>)
965 as well as a set of 965 as well as a set of
966 <ulink url='&YOCTO_DOCS_REF_URL;#metadata'>metadata</ulink> to get 966 <ulink url='&YOCTO_DOCS_REF_URL;#metadata'>metadata</ulink> to get
967 you started building your own distro. 967 you started building your own distro.
@@ -1219,7 +1219,7 @@
1219 software itself (patches or auxiliary files) that 1219 software itself (patches or auxiliary files) that
1220 are used to fix bugs or customize the software for use 1220 are used to fix bugs or customize the software for use
1221 in a particular situation. 1221 in a particular situation.
1222 OpenEmbedded Core is an important set of validated 1222 OpenEmbedded-Core is an important set of validated
1223 metadata. 1223 metadata.
1224 </para></listitem> 1224 </para></listitem>
1225 <listitem><para id='gs-term-openembedded-build-system'> 1225 <listitem><para id='gs-term-openembedded-build-system'>
diff --git a/documentation/ref-manual/ref-structure.xml b/documentation/ref-manual/ref-structure.xml
index 5d30987956..56f786c21e 100644
--- a/documentation/ref-manual/ref-structure.xml
+++ b/documentation/ref-manual/ref-structure.xml
@@ -114,7 +114,7 @@
114 <title><filename>meta/</filename></title> 114 <title><filename>meta/</filename></title>
115 115
116 <para> 116 <para>
117 This directory contains the OpenEmbedded Core metadata. 117 This directory contains the OpenEmbedded-Core metadata.
118 The directory holds recipes, common classes, and machine 118 The directory holds recipes, common classes, and machine
119 configuration for emulated targets (<filename>qemux86</filename>, 119 configuration for emulated targets (<filename>qemux86</filename>,
120 <filename>qemuarm</filename>, and so forth.) 120 <filename>qemuarm</filename>, and so forth.)
@@ -350,7 +350,7 @@
350 which defaults to <filename>meta-poky/conf</filename> 350 which defaults to <filename>meta-poky/conf</filename>
351 when you are building from the Yocto Project development 351 when you are building from the Yocto Project development
352 environment and defaults to <filename>meta/conf</filename> when 352 environment and defaults to <filename>meta/conf</filename> when
353 you are building from the OpenEmbedded Core environment. 353 you are building from the OpenEmbedded-Core environment.
354 Because the script variable points to the source of the 354 Because the script variable points to the source of the
355 <filename>local.conf.sample</filename> file, this implies that 355 <filename>local.conf.sample</filename> file, this implies that
356 you can configure your build environment from any layer by setting 356 you can configure your build environment from any layer by setting
@@ -402,7 +402,7 @@
402 which defaults to <filename>meta-poky/conf</filename> 402 which defaults to <filename>meta-poky/conf</filename>
403 when you are building from the Yocto Project development 403 when you are building from the Yocto Project development
404 environment and defaults to <filename>meta/conf</filename> when 404 environment and defaults to <filename>meta/conf</filename> when
405 you are building from the OpenEmbedded Core environment. 405 you are building from the OpenEmbedded-Core environment.
406 Because the script variable points to the source of the 406 Because the script variable points to the source of the
407 <filename>bblayers.conf.sample</filename> file, this implies that 407 <filename>bblayers.conf.sample</filename> file, this implies that
408 you can base your build from any layer by setting the variable in 408 you can base your build from any layer by setting the variable in
diff --git a/documentation/ref-manual/ref-terms.xml b/documentation/ref-manual/ref-terms.xml
index 31bd1b5d0d..c2a23e8bf1 100644
--- a/documentation/ref-manual/ref-terms.xml
+++ b/documentation/ref-manual/ref-terms.xml
@@ -273,7 +273,7 @@
273 software itself (patches or auxiliary files) that 273 software itself (patches or auxiliary files) that
274 are used to fix bugs or customize the software for use 274 are used to fix bugs or customize the software for use
275 in a particular situation. 275 in a particular situation.
276 OpenEmbedded Core is an important set of validated 276 OpenEmbedded-Core is an important set of validated
277 metadata.</para> 277 metadata.</para>
278 278
279 <para>In the context of the kernel ("kernel Metadata"), the 279 <para>In the context of the kernel ("kernel Metadata"), the
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 468fa4dfde..76194d450b 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -355,7 +355,7 @@
355 </para> 355 </para>
356 356
357 <para> 357 <para>
358 In OpenEmbedded Core, <filename>ASSUME_PROVIDED</filename> 358 In OpenEmbedded-Core, <filename>ASSUME_PROVIDED</filename>
359 mostly specifies native tools that should not be built. 359 mostly specifies native tools that should not be built.
360 An example is <filename>git-native</filename>, which when 360 An example is <filename>git-native</filename>, which when
361 specified, allows for the Git binary from the host to be 361 specified, allows for the Git binary from the host to be
@@ -2806,13 +2806,13 @@
2806 2806
2807 <glossentry id='var-COREBASE'><glossterm>COREBASE</glossterm> 2807 <glossentry id='var-COREBASE'><glossterm>COREBASE</glossterm>
2808 <info> 2808 <info>
2809 COREBASE[doc] = "Specifies the parent directory of the OpenEmbedded Core Metadata layer (i.e. meta)." 2809 COREBASE[doc] = "Specifies the parent directory of the OpenEmbedded-Core Metadata layer (i.e. meta)."
2810 </info> 2810 </info>
2811 <glossdef> 2811 <glossdef>
2812 <para role="glossdeffirst"> 2812 <para role="glossdeffirst">
2813<!-- <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> --> 2813<!-- <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> -->
2814 Specifies the parent directory of the OpenEmbedded 2814 Specifies the parent directory of the OpenEmbedded-Core
2815 Core Metadata layer (i.e. <filename>meta</filename>). 2815 Metadata layer (i.e. <filename>meta</filename>).
2816 </para> 2816 </para>
2817 2817
2818 <para> 2818 <para>