From 4e818ce29742ce6cd9f54ebb27f045a25d99044d Mon Sep 17 00:00:00 2001
From: Kristi Rifenbark <kristi.rifenbark@gmail.com>
Date: Fri, 13 Oct 2017 13:24:02 -0700
Subject: toaster-manual: Updated the "Configuring Toaster" section

Updated with review edits.

(From yocto-docs rev: 43dc539fb195e6194117dbc4de4d053fff53e9ff)

Signed-off-by: Kristi Rifenbark <kristi.rifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../toaster-manual/toaster-manual-reference.xml          | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/documentation/toaster-manual/toaster-manual-reference.xml
index 7c5b844d8a..665dc15ffb 100644
--- a/documentation/toaster-manual/toaster-manual-reference.xml
+++ b/documentation/toaster-manual/toaster-manual-reference.xml
@@ -316,6 +316,9 @@
                 For example, you can add one or more additional selections that
                 present custom layer sets or distros, and any other local or proprietary
                 content.
+            </para>
+
+            <para>
                 Additionally, you can completely disable the content from the
                 <filename>oe-core.xml</filename> and <filename>poky.xml</filename>
                 files by defining the section shown below in the
@@ -331,7 +334,6 @@
                 <literallayout class='monospaced'>
      &lt;object model="orm.toastersetting" pk="99"&gt;
        &lt;field type="CharField" name="name"&gt;CUSTOM_XML_ONLY&lt;/field&gt;
-
        &lt;field type="CharField" name="value"&gt;True&lt;/field&gt;
      &lt;/object&gt;
                 </literallayout>
@@ -342,15 +344,15 @@
             <title>Understanding Fixture File Format</title>
 
             <para>
-                The following is an overview of the file format used by the 
+                The following is an overview of the file format used by the
                 <filename>oe-core.xml</filename>, <filename>poky.xml</filename>,
                 and <filename>custom.xml</filename> files.
             </para>
 
             <para>
-                The following subsections describe each of the sections in the 
+                The following subsections describe each of the sections in the
                 fixture files, and outline an example section of the XML code.
-                you can use to help understand this information and create a local 
+                you can use to help understand this information and create a local
                 <filename>custom.xml</filename> file.
             </para>
 
@@ -447,6 +449,12 @@
                     Layer definitions are the most complex.
                     The following defines each of the layers, and then defines the exact layer
                     version of the layer used for each respective release.
+                    You must have one <filename>orm.layer</filename>
+                    entry for each layer.
+                    Then, with each entry you need a set of
+                    <filename>orm.layer_version</filename> entries that connects
+                    the layer with each release that includes the layer.
+                    In general all releases include the layer.
                     <literallayout class='monospaced'>
      &lt;object model="orm.layer" pk="1"&gt;
        &lt;field type="CharField" name="name"&gt;openembedded-core&lt;/field&gt;
-- 
cgit v1.2.3-54-g00ecf