From d46ab5a5762c4aee836aa22a2b044dcc84ff1bc7 Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Tue, 2 Oct 2012 07:49:21 -0700
Subject: [PATCH] documentation: poky-ref-manual - GNU terminology fixed.

(From yocto-docs rev: 2c4b78cde433dfc7306c89d64bc8f195368902c5)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/poky-ref-manual/ref-images.xml | 4 ++--
 documentation/poky-ref-manual/usingpoky.xml  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/documentation/poky-ref-manual/ref-images.xml b/documentation/poky-ref-manual/ref-images.xml
index 096f4b5731..79f2409933 100644
--- a/documentation/poky-ref-manual/ref-images.xml
+++ b/documentation/poky-ref-manual/ref-images.xml
@@ -12,8 +12,8 @@
     </para>
 
     <note>
-        Building an image without GNU Public License Version 3 (GPLv3) components is 
-        only supported for minimal and base images.
+        Building an image without GNU General Public License Version 3 (GPLv3) components
+        is only supported for minimal and base images.
         Furthermore, if you are going to build an image using non-GPLv3 components,
         you must make the following changes in the <filename>local.conf</filename> file
         before using the BitBake command to build the minimal or base image:
diff --git a/documentation/poky-ref-manual/usingpoky.xml b/documentation/poky-ref-manual/usingpoky.xml
index 817aa2f13f..18bd8b7eb0 100644
--- a/documentation/poky-ref-manual/usingpoky.xml
+++ b/documentation/poky-ref-manual/usingpoky.xml
@@ -66,8 +66,8 @@
         </para>
 
         <note>
-            Building an image without GNU Public License Version 3 (GPLv3) components is 
-            only supported for minimal and base images.
+            Building an image without GNU General Public License Version 3 (GPLv3) components
+            is only supported for minimal and base images.
             See the "<link linkend='ref-images'>Images</link>" chapter for more information.
         </note>
     </section>
@@ -78,7 +78,7 @@
         <para>
             When building an image using GPL components, you need to maintain your original 
             settings and not switch back and forth applying different versions of the GNU
-            Public License.  
+            General Public License.  
             If you rebuild using different versions of GPL, dependency errors might occur
             due to some components not being rebuilt.
         </para>