diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2011-08-01 16:33:06 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-04 15:07:52 +0100 |
commit | 5ce8039fded9a491f2419bf9b6211af3d7f1045b (patch) | |
tree | 8e30dd1706aaa7bc617a6b16255b1d83e3262fe4 | |
parent | 71dc0c6fdf1605b6ecbfd8d86a0253d9d2b1dc85 (diff) | |
download | poky-5ce8039fded9a491f2419bf9b6211af3d7f1045b.tar.gz |
documentation/dev-manual/dev-manual-newbie.xml: edits suggested by Dave Stewart.
(From yocto-docs rev: c6924422778b525dfe63f5e9a121c92317c3ea25)
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | documentation/dev-manual/dev-manual-newbie.xml | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml index a1652018df..8bed817926 100644 --- a/documentation/dev-manual/dev-manual-newbie.xml +++ b/documentation/dev-manual/dev-manual-newbie.xml | |||
@@ -132,9 +132,10 @@ | |||
132 | environment might find helpful. | 132 | environment might find helpful. |
133 | Some terms are universal but are included here just in case: | 133 | Some terms are universal but are included here just in case: |
134 | <itemizedlist> | 134 | <itemizedlist> |
135 | <listitem><para><emphasis>Image</emphasis> - An image is a collection of recipes created with | 135 | <listitem><para><emphasis>Image</emphasis> - An image is a complete executable file that |
136 | Bitbake (baked). | 136 | runs on specific hardware or in the QEMU emulator. |
137 | Images run on specific hardware and use cases.</para></listitem> | 137 | Images are collections of recipes created with the Bitbake tool in the Yocto Project |
138 | development environment.</para></listitem> | ||
138 | <listitem><para><emphasis>Recipe</emphasis> - A set of instructions for building packages. | 139 | <listitem><para><emphasis>Recipe</emphasis> - A set of instructions for building packages. |
139 | A recipe describes where you get source code and which patches to apply. | 140 | A recipe describes where you get source code and which patches to apply. |
140 | Recipes describe dependencies for libraries or for other recipes and they | 141 | Recipes describe dependencies for libraries or for other recipes and they |
@@ -177,6 +178,11 @@ | |||
177 | extension.</para></listitem> | 178 | extension.</para></listitem> |
178 | <listitem><para><emphasis>Common OE-Core</emphasis> - A core set of metadata originating | 179 | <listitem><para><emphasis>Common OE-Core</emphasis> - A core set of metadata originating |
179 | with OpenEmbedded (OE) that is shared between OE and the Yocto Project.</para></listitem> | 180 | with OpenEmbedded (OE) that is shared between OE and the Yocto Project.</para></listitem> |
181 | <listitem><para><emphasis>Up-stream</emphasis> - A reference to source code or repositories | ||
182 | that are not local to the development system but located in a master area that is controlled | ||
183 | by the maintainer of the source code. | ||
184 | For example, in order for a developer to work on a particular piece of code they need to | ||
185 | first get a copy of it from an "up-stream" source.</para></listitem> | ||
180 | </itemizedlist> | 186 | </itemizedlist> |
181 | </para> | 187 | </para> |
182 | </section> | 188 | </section> |
@@ -244,7 +250,7 @@ | |||
244 | <title>Git</title> | 250 | <title>Git</title> |
245 | 251 | ||
246 | <para> | 252 | <para> |
247 | The Yocto Project uses Git, which is a free, open source distributed version control. | 253 | The Yocto Project uses Git, which is a free, open source distributed version control system. |
248 | Git supports distributed development, non-linear development, can handle large projects, | 254 | Git supports distributed development, non-linear development, can handle large projects, |
249 | cryptographic authentication of history, and toolkit design. | 255 | cryptographic authentication of history, and toolkit design. |
250 | It is best that you know how to work with Git if you are going to use Yocto Project for development. | 256 | It is best that you know how to work with Git if you are going to use Yocto Project for development. |
@@ -275,7 +281,7 @@ | |||
275 | </para> | 281 | </para> |
276 | 282 | ||
277 | <para> | 283 | <para> |
278 | If you don’t know much about Git it is strongly suggested that you educate | 284 | If you don’t know much about Git, we suggest you educate |
279 | yourself by visiting the links previously mentioned. | 285 | yourself by visiting the links previously mentioned. |
280 | </para> | 286 | </para> |
281 | 287 | ||