summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-10-02 07:49:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:41:36 +0100
commitd46ab5a5762c4aee836aa22a2b044dcc84ff1bc7 (patch)
tree4e8ab1bd341ffa8265586588cb2dc26702a93fe9
parent6c15b345eafd4bb6abc942c992c9e460b8476d16 (diff)
downloadpoky-d46ab5a5762c4aee836aa22a2b044dcc84ff1bc7.tar.gz
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>
-rw-r--r--documentation/poky-ref-manual/ref-images.xml4
-rw-r--r--documentation/poky-ref-manual/usingpoky.xml6
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 @@
12 </para> 12 </para>
13 13
14 <note> 14 <note>
15 Building an image without GNU Public License Version 3 (GPLv3) components is 15 Building an image without GNU General Public License Version 3 (GPLv3) components
16 only supported for minimal and base images. 16 is only supported for minimal and base images.
17 Furthermore, if you are going to build an image using non-GPLv3 components, 17 Furthermore, if you are going to build an image using non-GPLv3 components,
18 you must make the following changes in the <filename>local.conf</filename> file 18 you must make the following changes in the <filename>local.conf</filename> file
19 before using the BitBake command to build the minimal or base image: 19 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 @@
66 </para> 66 </para>
67 67
68 <note> 68 <note>
69 Building an image without GNU Public License Version 3 (GPLv3) components is 69 Building an image without GNU General Public License Version 3 (GPLv3) components
70 only supported for minimal and base images. 70 is only supported for minimal and base images.
71 See the "<link linkend='ref-images'>Images</link>" chapter for more information. 71 See the "<link linkend='ref-images'>Images</link>" chapter for more information.
72 </note> 72 </note>
73 </section> 73 </section>
@@ -78,7 +78,7 @@
78 <para> 78 <para>
79 When building an image using GPL components, you need to maintain your original 79 When building an image using GPL components, you need to maintain your original
80 settings and not switch back and forth applying different versions of the GNU 80 settings and not switch back and forth applying different versions of the GNU
81 Public License. 81 General Public License.
82 If you rebuild using different versions of GPL, dependency errors might occur 82 If you rebuild using different versions of GPL, dependency errors might occur
83 due to some components not being rebuilt. 83 due to some components not being rebuilt.
84 </para> 84 </para>