From e90d014a0a75b7cb7e3440062afac2e532a47d52 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Fri, 19 Oct 2012 07:34:33 -0700
Subject: documentation: dev-manual - Updated compliance section.

Applied legal changes per Karen Copenhaver's suggestions.

(From yocto-docs rev: 73b68aa349530f6604c7edc87b503f1b614b2c46)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../dev-manual/dev-manual-common-tasks.xml          | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'documentation')

diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 890ea6e26a..df64e1124e 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -2618,7 +2618,7 @@
             While this section does not provide legal advice or  
             comprehensively cover all scenarios, it does 
             present methods that you can use to 
-            meet the compliance requirements during a software
+            assist you in meeting the compliance requirements during a software
             release.
         </para>
 
@@ -2705,12 +2705,13 @@
      INHERIT += "${ARCHIVER_CLASS}"
      SOURCE_ARCHIVE_PACKAGE_TYPE = "tar"
                 </literallayout>
-                During the creation of your image, all needed source 
+                During the creation of your image, all GPL
+                or other copyleft licensed source 
                 is placed within subdirectories of 
                 <filename>DEPLOY_DIR/sources</filename> based on the 
                 <ulink url='&YOCTO_DOCS_REF_URL;#var-LICENSE'><filename>LICENSE</filename></ulink>
                 for each recipe. 
-                Releasing the entire directory ensures compliance with 
+                Releasing the entire directory enables you to comply with 
                 requirements concerning providing the unmodified source.
                 It is important to note that the size of the directory can
                 get large. 
@@ -2773,10 +2774,10 @@
             </para>
 
             <para>
-                Providing compilation scripts and source code modifications
-                can be addressed with one step.
-                All you need to do is ensure that you release the version of 
-                the OpenEmbedded build system and the layers used during the build.
+                By releasing the version of the OpenEmbedded build system
+                and the layers used during the build, you will be providing both
+                compilation scripts and the source code modifications in one 
+                step.
             </para>
 
             <para>
@@ -2785,8 +2786,8 @@
                 and a distro layer, and those those layers are used to patch, 
                 compile, package, or modify (in any way) any open source 
                 software included in your released images, you
-                must release those layers as required by section 3 of GPLv2 
-                and section 1 of GPLv3. 
+                may be required to to release those layers under section 3 of 
+                GPLv2 or section 1 of GPLv3. 
                 One way of doing that is with a clean
                 checkout of the version of the Yocto Project and layers used 
                 during your build.
@@ -2826,7 +2827,7 @@
                 </literallayout>
                 Creating and providing an archive of the metadata layers
                 (recipes, configuration files, and so forth) 
-                ensures that you have met your 
+                enables you to meet your 
                 requirements to include the scripts to control compilation 
                 as well as any modifications to the original source.
             </para>
-- 
cgit v1.2.3-54-g00ecf