diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2013-03-27 10:49:19 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-04 14:12:55 +0100 |
commit | 4fadd757cd8a93db21a0b93b3e51435a8585f5be (patch) | |
tree | 94b29c8844754a81bb6cff7d4fa8fb8a41611d49 /documentation/ref-manual/ref-structure.xml | |
parent | 619e88f9c4e513aaf03e2ef325db76a105a4306d (diff) | |
download | poky-4fadd757cd8a93db21a0b93b3e51435a8585f5be.tar.gz |
ref-manual: Cleared up ambiguity in "meta/conf".
(From yocto-docs rev: ce6da6f20bd721641b569c3dd57850e9ec6538cf)
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/ref-manual/ref-structure.xml')
-rw-r--r-- | documentation/ref-manual/ref-structure.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/documentation/ref-manual/ref-structure.xml b/documentation/ref-manual/ref-structure.xml index 6bf3acfbbb..5535d58406 100644 --- a/documentation/ref-manual/ref-structure.xml +++ b/documentation/ref-manual/ref-structure.xml | |||
@@ -572,7 +572,8 @@ | |||
572 | This directory contains the core set of configuration files that start from | 572 | This directory contains the core set of configuration files that start from |
573 | <filename>bitbake.conf</filename> and from which all other configuration | 573 | <filename>bitbake.conf</filename> and from which all other configuration |
574 | files are included. | 574 | files are included. |
575 | See the include statements at the end of the file and you will note that even | 575 | See the include statements at the end of the |
576 | <filename>bitbake.conf</filename> file and you will note that even | ||
576 | <filename>local.conf</filename> is loaded from there. | 577 | <filename>local.conf</filename> is loaded from there. |
577 | While <filename>bitbake.conf</filename> sets up the defaults, you can often override | 578 | While <filename>bitbake.conf</filename> sets up the defaults, you can often override |
578 | these by using the (<filename>local.conf</filename>) file, machine file or | 579 | these by using the (<filename>local.conf</filename>) file, machine file or |