summaryrefslogtreecommitdiffstats
path: root/documentation/ref-manual/closer-look.xml
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2016-01-18 10:02:38 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-29 17:04:47 +0000
commitfded4fa2d2280c661f33d638d4fd7790d7b56168 (patch)
tree291fb06f00abc82178d0eb7dc806331569bd9a36 /documentation/ref-manual/closer-look.xml
parent9f192c81be633e48086ea8e62b07b1b33c79fa26 (diff)
downloadpoky-fded4fa2d2280c661f33d638d4fd7790d7b56168.tar.gz
ref-manual: Updated configuration of auto.conf in closer look
Fixes [YOCTO #8941] Confusing wording existed surrounding how the auto.conf file needs to be created. Early in the section indicates that you must hand create the file. Then later, it indicates to not hand-create it. In reality, this file is not auto-created by any script but is really usually created by an autobuilder. I updated the verbiage to better explain this. (From yocto-docs rev: 2dd8f60251009038d6bc61e2257876baebe8e0be) Signed-off-by: Scott Rifenbark <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/ref-manual/closer-look.xml')
-rw-r--r--documentation/ref-manual/closer-look.xml9
1 files changed, 5 insertions, 4 deletions
diff --git a/documentation/ref-manual/closer-look.xml b/documentation/ref-manual/closer-look.xml
index 45dcd9b3cf..bb7624c9e8 100644
--- a/documentation/ref-manual/closer-look.xml
+++ b/documentation/ref-manual/closer-look.xml
@@ -208,8 +208,10 @@
208 The files <filename>site.conf</filename> and 208 The files <filename>site.conf</filename> and
209 <filename>auto.conf</filename> are not created by the environment 209 <filename>auto.conf</filename> are not created by the environment
210 initialization script. 210 initialization script.
211 If you want these configuration files, you must create them 211 If you want the <filename>site.conf</filename> file, you need to
212 yourself: 212 create that yourself.
213 The <filename>auto.conf</filename> file is typically created by
214 an autobuilder:
213 <itemizedlist> 215 <itemizedlist>
214 <listitem><para><emphasis><filename>site.conf</filename>:</emphasis> 216 <listitem><para><emphasis><filename>site.conf</filename>:</emphasis>
215 You can use the <filename>conf/site.conf</filename> 217 You can use the <filename>conf/site.conf</filename>
@@ -235,8 +237,7 @@
235 directory's <filename>conf/local.conf</filename> file. 237 directory's <filename>conf/local.conf</filename> file.
236 </para></listitem> 238 </para></listitem>
237 <listitem><para><emphasis><filename>auto.conf</filename>:</emphasis> 239 <listitem><para><emphasis><filename>auto.conf</filename>:</emphasis>
238 This file is not hand-created. 240 The file is usually created and written to by
239 Rather, the file is usually created and written to by
240 an autobuilder. 241 an autobuilder.
241 The settings put into the file are typically the same as 242 The settings put into the file are typically the same as
242 you would find in the <filename>conf/local.conf</filename> 243 you would find in the <filename>conf/local.conf</filename>