From 5966b44893a39847d3d590566dd488323a11ff73 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Mon, 2 Jul 2012 14:34:39 -0700
Subject: documentation/poky-ref-manual: Yocto Project scrub

I have changed as many "Yocto Project" terms as possible so that
better reflect reality.

(From yocto-docs rev: 5f729e53b0cb653c97621e4e6598d9295d60ada5)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/poky-ref-manual/ref-bitbake.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'documentation/poky-ref-manual/ref-bitbake.xml')

diff --git a/documentation/poky-ref-manual/ref-bitbake.xml b/documentation/poky-ref-manual/ref-bitbake.xml
index 523caf7090..81a8934e6a 100644
--- a/documentation/poky-ref-manual/ref-bitbake.xml
+++ b/documentation/poky-ref-manual/ref-bitbake.xml
@@ -7,7 +7,8 @@
     <title>Reference: BitBake</title>
 
     <para>
-        BitBake is a program written in Python that interprets the metadata that makes up the Yocto Project. 
+        BitBake is a program written in Python that interprets the metadata used by the Yocto Project. 
+        The OpenEmbedded build system uses BitBake.
         At some point, developers wonder what actually happens when you enter:
         <literallayout class='monospaced'>
      $ bitbake core-image-sato
@@ -34,20 +35,22 @@
 
         <para>
             The first thing BitBake does is look for the <filename>bitbake.conf</filename> file.
-            The Yocto Project keeps this file in the Yocto Project file's <filename>meta/conf/</filename>
-            directory.
-            BitBake finds it by examining its <filename>BBPATH</filename> environment 
+            This file resides in the 
+            <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>source directory</ulink>
+            within the <filename>meta/conf/</filename> directory.
+            BitBake finds it by examining its 
+            <link linkend='var-BBPATH'><filename>BBPATH</filename></link> environment 
             variable and looking for the <filename>meta/conf/</filename> 
             directory.
         </para>
 
         <para>
-            In the Yocto Project, <filename>bitbake.conf</filename> lists other configuration 
+            The <filename>bitbake.conf</filename> file lists other configuration 
             files to include from a <filename>conf/</filename> 
             directory below the directories listed in <filename>BBPATH</filename>. 
             In general, the most important configuration file from a user's perspective 
             is <filename>local.conf</filename>, which contains a user's customized 
-            settings for the Yocto Project build environment. 
+            settings for the OpenEmbedded build environment. 
             Other notable configuration files are the distribution 
             configuration file (set by the 
             <filename><link linkend='var-DISTRO'>DISTRO</link></filename> variable) 
-- 
cgit v1.2.3-54-g00ecf