summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2017-06-13 16:50:32 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-22 09:16:42 +0100
commitb8b87dd690ef2f828c21937ec82c2d1dab405734 (patch)
tree4f4f695f77e6ab8fbbe17085379756e83f8c09af
parent45b16e35b606cfd2c4ab7f89ebe91e43995acb2a (diff)
downloadpoky-b8b87dd690ef2f828c21937ec82c2d1dab405734.tar.gz
ref-manual: Fixed links in the "Yocto Project Terms" section.
Fixes [YOCTO #11630] Moving the "Yocto Project Terms" section from the dev-manual to the ref-manual caused many links local to that section to be incorrect. I scrubbed the section and fixed all the links. (From yocto-docs rev: 4b795159aa80184f26ff1181a564516840c373b2) Signed-off-by: Scott Rifenbark <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/ref-manual/introduction.xml318
1 files changed, 180 insertions, 138 deletions
diff --git a/documentation/ref-manual/introduction.xml b/documentation/ref-manual/introduction.xml
index 58ee073868..deaac033a3 100644
--- a/documentation/ref-manual/introduction.xml
+++ b/documentation/ref-manual/introduction.xml
@@ -43,110 +43,123 @@
43 <title>Yocto Project Terms</title> 43 <title>Yocto Project Terms</title>
44 44
45 <para> 45 <para>
46 Following is a list of terms and definitions users new to the Yocto Project development 46 Following is a list of terms and definitions users new to the Yocto
47 environment might find helpful. 47 Project development environment might find helpful.
48 While some of these terms are universal, the list includes them just in case: 48 While some of these terms are universal, the list includes them
49 just in case:
49 <itemizedlist> 50 <itemizedlist>
50 <listitem><para><emphasis>Append Files:</emphasis> Files that append build information to 51 <listitem><para>
51 a recipe file. 52 <emphasis>Append Files:</emphasis>
52 Append files are known as BitBake append files and <filename>.bbappend</filename> files. 53 Files that append build information to a recipe file.
53 The OpenEmbedded build system expects every append file to have a corresponding 54 Append files are known as BitBake append files and
54 recipe (<filename>.bb</filename>) file. 55 <filename>.bbappend</filename> files.
56 The OpenEmbedded build system expects every append file to have
57 a corresponding recipe (<filename>.bb</filename>) file.
55 Furthermore, the append file and corresponding recipe file 58 Furthermore, the append file and corresponding recipe file
56 must use the same root filename. 59 must use the same root filename.
57 The filenames can differ only in the file type suffix used (e.g. 60 The filenames can differ only in the file type suffix used
58 <filename>formfactor_0.0.bb</filename> and <filename>formfactor_0.0.bbappend</filename>). 61 (e.g.
59 </para> 62 <filename>formfactor_0.0.bb</filename> and
63 <filename>formfactor_0.0.bbappend</filename>).</para>
64
60 <para>Information in append files extends or overrides the 65 <para>Information in append files extends or overrides the
61 information in the similarly-named recipe file. 66 information in the similarly-named recipe file.
62 For an example of an append file in use, see the 67 For an example of an append file in use, see the
63 "<ulink url='&YOCTO_DOCS_DEV_URL;#using-bbappend-files'>Using .bbappend Files</ulink>" 68 "<ulink url='&YOCTO_DOCS_DEV_URL;#using-bbappend-files'>Using .bbappend Files</ulink>"
64 section in the Yocto Project Development Manual. 69 section in the Yocto Project Development Manual.
65 <note> 70 <note>
66 Append files can also use wildcard patterns in their version numbers 71 Append files can also use wildcard patterns in their
67 so they can be applied to more than one version of the underlying recipe file. 72 version numbers so they can be applied to more than one
73 version of the underlying recipe file.
68 </note> 74 </note>
69 </para></listitem> 75 </para></listitem>
70 <listitem><para id='bitbake-term'><emphasis>BitBake:</emphasis> 76 <listitem><para id='bitbake-term'>
77 <emphasis>BitBake:</emphasis>
71 The task executor and scheduler used by the OpenEmbedded build 78 The task executor and scheduler used by the OpenEmbedded build
72 system to build images. 79 system to build images.
73 For more information on BitBake, see the 80 For more information on BitBake, see the
74 <ulink url='&YOCTO_DOCS_BB_URL;'>BitBake User Manual</ulink>. 81 <ulink url='&YOCTO_DOCS_BB_URL;'>BitBake User Manual</ulink>.
75 </para></listitem> 82 </para></listitem>
76 <listitem> 83 <listitem>
77 <para id='build-directory'><emphasis>Build Directory:</emphasis> 84 <para id='build-directory'>
85 <emphasis>Build Directory:</emphasis>
78 This term refers to the area used by the OpenEmbedded build 86 This term refers to the area used by the OpenEmbedded build
79 system for builds. 87 system for builds.
80 The area is created when you <filename>source</filename> the 88 The area is created when you <filename>source</filename> the
81 setup environment script that is found in the Source Directory 89 setup environment script that is found in the Source Directory
82 (i.e. <ulink url='&YOCTO_DOCS_REF_URL;#structure-core-script'><filename>&OE_INIT_FILE;</filename></ulink> 90 (i.e. <link linkend='structure-core-script'><filename>&OE_INIT_FILE;</filename></link>
83 or 91 or
84 <ulink url='&YOCTO_DOCS_REF_URL;#structure-memres-core-script'><filename>oe-init-build-env-memres</filename></ulink>). 92 <link linkend='structure-memres-core-script'><filename>oe-init-build-env-memres</filename></link>).
85 The <ulink url='&YOCTO_DOCS_REF_URL;#var-TOPDIR'><filename>TOPDIR</filename></ulink> 93 The
94 <link linkend='var-TOPDIR'><filename>TOPDIR</filename></link>
86 variable points to the Build Directory.</para> 95 variable points to the Build Directory.</para>
87 96
88 <para> 97 <para>You have a lot of flexibility when creating the Build
89 You have a lot of flexibility when creating the Build 98 Directory.
90 Directory. 99 Following are some examples that show how to create the
91 Following are some examples that show how to create the 100 directory.
92 directory. 101 The examples assume your
93 The examples assume your 102 <link linkend='source-directory'>Source Directory</link> is
94 <link linkend='source-directory'>Source Directory</link> is 103 named <filename>poky</filename>:
95 named <filename>poky</filename>: 104 <itemizedlist>
96 <itemizedlist> 105 <listitem><para>Create the Build Directory inside your
97 <listitem><para>Create the Build Directory inside your 106 Source Directory and let the name of the Build
98 Source Directory and let the name of the Build 107 Directory default to <filename>build</filename>:
99 Directory default to <filename>build</filename>: 108 <literallayout class='monospaced'>
100 <literallayout class='monospaced'>
101 $ cd $HOME/poky 109 $ cd $HOME/poky
102 $ source &OE_INIT_FILE; 110 $ source &OE_INIT_FILE;
103 </literallayout></para></listitem> 111 </literallayout>
104 <listitem><para>Create the Build Directory inside your 112 </para></listitem>
105 home directory and specifically name it 113 <listitem><para>Create the Build Directory inside your
106 <filename>test-builds</filename>: 114 home directory and specifically name it
107 <literallayout class='monospaced'> 115 <filename>test-builds</filename>:
116 <literallayout class='monospaced'>
108 $ cd $HOME 117 $ cd $HOME
109 $ source poky/&OE_INIT_FILE; test-builds 118 $ source poky/&OE_INIT_FILE; test-builds
110 </literallayout></para></listitem> 119 </literallayout>
111 <listitem><para> 120 </para></listitem>
112 Provide a directory path and 121 <listitem><para>
113 specifically name the Build Directory. 122 Provide a directory path and specifically name the
114 Any intermediate folders in the pathname must 123 Build Directory.
115 exist. 124 Any intermediate folders in the pathname must exist.
116 This next example creates a Build Directory named 125 This next example creates a Build Directory named
117 <filename>YP-&POKYVERSION;</filename> 126 <filename>YP-&POKYVERSION;</filename>
118 in your home directory within the existing 127 in your home directory within the existing
119 directory <filename>mybuilds</filename>: 128 directory <filename>mybuilds</filename>:
120 <literallayout class='monospaced'> 129 <literallayout class='monospaced'>
121 $cd $HOME 130 $cd $HOME
122 $ source $HOME/poky/&OE_INIT_FILE; $HOME/mybuilds/YP-&POKYVERSION; 131 $ source $HOME/poky/&OE_INIT_FILE; $HOME/mybuilds/YP-&POKYVERSION;
123 </literallayout></para></listitem> 132 </literallayout>
124 </itemizedlist> 133 </para></listitem>
125 <note> 134 </itemizedlist>
126 By default, the Build Directory contains 135 <note>
127 <ulink url='&YOCTO_DOCS_REF_URL;#var-TMPDIR'><filename>TMPDIR</filename></ulink>, 136 By default, the Build Directory contains
128 which is a temporary directory the build system uses for 137 <link linkend='var-TMPDIR'><filename>TMPDIR</filename></link>,
129 its work. 138 which is a temporary directory the build system uses for
130 <filename>TMPDIR</filename> cannot be under NFS. 139 its work.
131 Thus, by default, the Build Directory cannot be under NFS. 140 <filename>TMPDIR</filename> cannot be under NFS.
132 However, if you need the Build Directory to be under NFS, 141 Thus, by default, the Build Directory cannot be under NFS.
133 you can set this up by setting <filename>TMPDIR</filename> 142 However, if you need the Build Directory to be under NFS,
134 in your <filename>local.conf</filename> file 143 you can set this up by setting <filename>TMPDIR</filename>
135 to use a local drive. 144 in your <filename>local.conf</filename> file
136 Doing so effectively separates <filename>TMPDIR</filename> 145 to use a local drive.
137 from <filename>TOPDIR</filename>, which is the Build 146 Doing so effectively separates <filename>TMPDIR</filename>
138 Directory. 147 from <filename>TOPDIR</filename>, which is the Build
139 </note> 148 Directory.
140 </para></listitem> 149 </note>
141 <listitem><para><emphasis>Classes:</emphasis> Files that provide for logic encapsulation 150 </para></listitem>
142 and inheritance so that commonly used patterns can be defined once and then easily used 151 <listitem><para>
143 in multiple recipes. 152 <emphasis>Classes:</emphasis>
153 Files that provide for logic encapsulation and inheritance so
154 that commonly used patterns can be defined once and then
155 easily used in multiple recipes.
144 For reference information on the Yocto Project classes, see the 156 For reference information on the Yocto Project classes, see the
145 "<ulink url='&YOCTO_DOCS_REF_URL;#ref-classes'>Classes</ulink>" chapter of the 157 "<link linkend='ref-classes'>Classes</link>" chapter.
146 Yocto Project Reference Manual. 158 Class files end with the <filename>.bbclass</filename>
147 Class files end with the <filename>.bbclass</filename> filename extension. 159 filename extension.
148 </para></listitem> 160 </para></listitem>
149 <listitem><para><emphasis>Configuration File:</emphasis> 161 <listitem><para>
162 <emphasis>Configuration File:</emphasis>
150 Configuration information in various <filename>.conf</filename> 163 Configuration information in various <filename>.conf</filename>
151 files provides global definitions of variables. 164 files provides global definitions of variables.
152 The <filename>conf/local.conf</filename> configuration file in 165 The <filename>conf/local.conf</filename> configuration file in
@@ -169,52 +182,58 @@
169 </para></listitem> 182 </para></listitem>
170 <listitem><para id='cross-development-toolchain'> 183 <listitem><para id='cross-development-toolchain'>
171 <emphasis>Cross-Development Toolchain:</emphasis> 184 <emphasis>Cross-Development Toolchain:</emphasis>
172 In general, a cross-development toolchain is a collection of 185 In general, a cross-development toolchain is a collection of
173 software development tools and utilities that run on one 186 software development tools and utilities that run on one
174 architecture and allow you to develop software for a 187 architecture and allow you to develop software for a
175 different, or targeted, architecture. 188 different, or targeted, architecture.
176 These toolchains contain cross-compilers, linkers, and 189 These toolchains contain cross-compilers, linkers, and
177 debuggers that are specific to the target architecture. 190 debuggers that are specific to the target architecture.</para>
178 </para>
179 191
180 <para>The Yocto Project supports two different cross-development 192 <para>The Yocto Project supports two different cross-development
181 toolchains: 193 toolchains:
182 <itemizedlist> 194 <itemizedlist>
183 <listitem><para>A toolchain only used by and within 195 <listitem><para>
184 BitBake when building an image for a target 196 A toolchain only used by and within
185 architecture.</para></listitem> 197 BitBake when building an image for a target
186 <listitem><para>A relocatable toolchain used outside of 198 architecture.
187 BitBake by developers when developing applications 199 </para></listitem>
188 that will run on a targeted device. 200 <listitem><para>A relocatable toolchain used outside of
189 </para></listitem> 201 BitBake by developers when developing applications
190 </itemizedlist> 202 that will run on a targeted device.
191 </para> 203 </para></listitem>
204 </itemizedlist></para>
192 205
193 <para> 206 <para>Creation of these toolchains is simple and automated.
194 Creation of these toolchains is simple and automated. 207 For information on toolchain concepts as they apply to the
195 For information on toolchain concepts as they apply to the 208 Yocto Project, see the
196 Yocto Project, see the 209 "<link linkend='cross-development-toolchain-generation'>Cross-Development Toolchain Generation</link>"
197 "<ulink url='&YOCTO_DOCS_REF_URL;#cross-development-toolchain-generation'>Cross-Development Toolchain Generation</ulink>" 210 section.
198 section in the Yocto Project Reference Manual. 211 You can also find more information on using the
199 You can also find more information on using the 212 relocatable toolchain in the
200 relocatable toolchain in the 213 <ulink url='&YOCTO_DOCS_SDK_URL;'>Yocto Project Software Development Kit (SDK) Developer's Guide</ulink>.
201 <ulink url='&YOCTO_DOCS_SDK_URL;'>Yocto Project Software Development Kit (SDK) Developer's Guide</ulink>. 214 </para></listitem>
202 </para></listitem> 215 <listitem><para>
203 <listitem><para><emphasis>Image:</emphasis> 216 <emphasis>Image:</emphasis>
204 An image is an artifact of the BitBake build process given 217 An image is an artifact of the BitBake build process given
205 a collection of recipes and related Metadata. 218 a collection of recipes and related Metadata.
206 Images are the binary output that run on specific hardware or 219 Images are the binary output that run on specific hardware or
207 QEMU and are used for specific use-cases. 220 QEMU and are used for specific use-cases.
208 For a list of the supported image types that the Yocto Project provides, see the 221 For a list of the supported image types that the Yocto Project
209 "<ulink url='&YOCTO_DOCS_REF_URL;#ref-images'>Images</ulink>" 222 provides, see the
210 chapter in the Yocto Project Reference Manual.</para></listitem> 223 "<link linkend='ref-images'>Images</link>"
211 <listitem><para id='layer'><emphasis>Layer:</emphasis> A collection of recipes representing the core, 224 chapter.
225 </para></listitem>
226 <listitem><para id='layer'>
227 <emphasis>Layer:</emphasis>
228 A collection of recipes representing the core,
212 a BSP, or an application stack. 229 a BSP, or an application stack.
213 For a discussion specifically on BSP Layers, see the 230 For a discussion specifically on BSP Layers, see the
214 "<ulink url='&YOCTO_DOCS_BSP_URL;#bsp-layers'>BSP Layers</ulink>" 231 "<ulink url='&YOCTO_DOCS_BSP_URL;#bsp-layers'>BSP Layers</ulink>"
215 section in the Yocto Project Board Support Packages (BSP) 232 section in the Yocto Project Board Support Packages (BSP)
216 Developer's Guide.</para></listitem> 233 Developer's Guide.
217 <listitem><para id='metadata'><emphasis>Metadata:</emphasis> 234 </para></listitem>
235 <listitem><para id='metadata'>
236 <emphasis>Metadata:</emphasis>
218 The files that BitBake parses when building an image. 237 The files that BitBake parses when building an image.
219 In general, Metadata includes recipes, classes, and 238 In general, Metadata includes recipes, classes, and
220 configuration files. 239 configuration files.
@@ -222,11 +241,16 @@
222 it refers to Metadata in the <filename>meta</filename> 241 it refers to Metadata in the <filename>meta</filename>
223 branches of the kernel source Git repositories. 242 branches of the kernel source Git repositories.
224 </para></listitem> 243 </para></listitem>
225 <listitem><para id='oe-core'><emphasis>OE-Core:</emphasis> A core set of Metadata originating 244 <listitem><para id='oe-core'>
226 with OpenEmbedded (OE) that is shared between OE and the Yocto Project. 245 <emphasis>OE-Core:</emphasis>
227 This Metadata is found in the <filename>meta</filename> directory of the 246 A core set of Metadata originating with OpenEmbedded (OE)
228 <link linkend='source-directory'>Source Directory</link>.</para></listitem> 247 that is shared between OE and the Yocto Project.
229 <listitem><para id='build-system-term'><emphasis>OpenEmbedded Build System:</emphasis> 248 This Metadata is found in the <filename>meta</filename>
249 directory of the
250 <link linkend='source-directory'>Source Directory</link>.
251 </para></listitem>
252 <listitem><para id='build-system-term'>
253 <emphasis>OpenEmbedded Build System:</emphasis>
230 The build system specific to the Yocto Project. 254 The build system specific to the Yocto Project.
231 The OpenEmbedded build system is based on another project known 255 The OpenEmbedded build system is based on another project known
232 as "Poky", which uses 256 as "Poky", which uses
@@ -243,26 +267,33 @@
243 <link linkend='poky'>Poky</link> term. 267 <link linkend='poky'>Poky</link> term.
244 </note> 268 </note>
245 </para></listitem> 269 </para></listitem>
246 <listitem><para><emphasis>Package:</emphasis> 270 <listitem><para>
271 <emphasis>Package:</emphasis>
247 In the context of the Yocto Project, this term refers to a 272 In the context of the Yocto Project, this term refers to a
248 recipe's packaged output produced by BitBake (i.e. a 273 recipe's packaged output produced by BitBake (i.e. a
249 "baked recipe"). 274 "baked recipe").
250 A package is generally the compiled binaries produced from the 275 A package is generally the compiled binaries produced from the
251 recipe's sources. 276 recipe's sources.
252 You "bake" something by running it through BitBake.</para> 277 You "bake" something by running it through BitBake.</para>
253 <para>It is worth noting that the term "package" can, in general, have subtle 278
254 meanings. For example, the packages referred to in the 279 <para>It is worth noting that the term "package" can,
255 "<ulink url='&YOCTO_DOCS_QS_URL;#packages'>The Build Host Packages</ulink>" section are 280 in general, have subtle meanings.
256 compiled binaries that, when installed, add functionality to your Linux 281 For example, the packages referred to in the
282 "<ulink url='&YOCTO_DOCS_QS_URL;#packages'>The Build Host Packages</ulink>"
283 section in the Yocto Project Quick Start are compiled binaries
284 that, when installed, add functionality to your Linux
257 distribution.</para> 285 distribution.</para>
258 <para>Another point worth noting is that historically within the Yocto Project, 286
259 recipes were referred to as packages - thus, the existence of several BitBake 287 <para>Another point worth noting is that historically within
260 variables that are seemingly mis-named, 288 the Yocto Project, recipes were referred to as packages - thus,
261 (e.g. <ulink url='&YOCTO_DOCS_REF_URL;#var-PR'><filename>PR</filename></ulink>, 289 the existence of several BitBake variables that are seemingly
262 <ulink url='&YOCTO_DOCS_REF_URL;#var-PV'><filename>PV</filename></ulink>, and 290 mis-named,
263 <ulink url='&YOCTO_DOCS_REF_URL;#var-PE'><filename>PE</filename></ulink>). 291 (e.g. <link linkend='var-PR'><filename>PR</filename></link>,
264 </para></listitem> 292 <link linkend='var-PV'><filename>PV</filename></link>, and
265 <listitem><para><emphasis>Package Groups:</emphasis> 293 <link linkend='var-PE'><filename>PE</filename></link>).
294 </para></listitem>
295 <listitem><para>
296 <emphasis>Package Groups:</emphasis>
266 Arbitrary groups of software Recipes. 297 Arbitrary groups of software Recipes.
267 You use package groups to hold recipes that, when built, 298 You use package groups to hold recipes that, when built,
268 usually accomplish a single task. 299 usually accomplish a single task.
@@ -272,8 +303,10 @@
272 graphics. 303 graphics.
273 A package group is really just another recipe. 304 A package group is really just another recipe.
274 Because package group files are recipes, they end with the 305 Because package group files are recipes, they end with the
275 <filename>.bb</filename> filename extension.</para></listitem> 306 <filename>.bb</filename> filename extension.
276 <listitem><para id='poky'><emphasis>Poky:</emphasis> 307 </para></listitem>
308 <listitem><para id='poky'>
309 <emphasis>Poky:</emphasis>
277 The term "poky" can mean several things. 310 The term "poky" can mean several things.
278 In its most general sense, it is an open-source 311 In its most general sense, it is an open-source
279 project that was initially developed by OpenedHand. 312 project that was initially developed by OpenedHand.
@@ -283,6 +316,7 @@
283 After Intel Corporation acquired OpenedHand, the 316 After Intel Corporation acquired OpenedHand, the
284 project poky became the basis for the Yocto Project's 317 project poky became the basis for the Yocto Project's
285 build system.</para> 318 build system.</para>
319
286 <para>Within the Yocto Project source repositories, 320 <para>Within the Yocto Project source repositories,
287 <filename>poky</filename> exists as a separate Git 321 <filename>poky</filename> exists as a separate Git
288 repository you can clone to yield a local copy on your 322 repository you can clone to yield a local copy on your
@@ -290,13 +324,15 @@
290 Thus, "poky" can refer to the local copy of the Source 324 Thus, "poky" can refer to the local copy of the Source
291 Directory used for development within the Yocto 325 Directory used for development within the Yocto
292 Project.</para> 326 Project.</para>
327
293 <para>Finally, "poky" can refer to the default 328 <para>Finally, "poky" can refer to the default
294 <ulink url='&YOCTO_DOCS_REF_URL;#var-DISTRO'><filename>DISTRO</filename></ulink> 329 <link linkend='var-DISTRO'><filename>DISTRO</filename></link>
295 (i.e. distribution) created when you use the Yocto 330 (i.e. distribution) created when you use the Yocto
296 Project in conjunction with the 331 Project in conjunction with the
297 <filename>poky</filename> repository to build an image. 332 <filename>poky</filename> repository to build an image.
298 </para></listitem> 333 </para></listitem>
299 <listitem><para><emphasis>Recipe:</emphasis> 334 <listitem><para>
335 <emphasis>Recipe:</emphasis>
300 A set of instructions for building packages. 336 A set of instructions for building packages.
301 A recipe describes where you get source code, which patches 337 A recipe describes where you get source code, which patches
302 to apply, how to configure the source, how to compile it and so on. 338 to apply, how to configure the source, how to compile it and so on.
@@ -307,7 +343,8 @@
307 <filename>.bb</filename> file extension. 343 <filename>.bb</filename> file extension.
308 </para></listitem> 344 </para></listitem>
309 <listitem> 345 <listitem>
310 <para id='source-directory'><emphasis>Source Directory:</emphasis> 346 <para id='source-directory'>
347 <emphasis>Source Directory:</emphasis>
311 This term refers to the directory structure created as a result 348 This term refers to the directory structure created as a result
312 of creating a local copy of the <filename>poky</filename> Git 349 of creating a local copy of the <filename>poky</filename> Git
313 repository <filename>git://git.yoctoproject.org/poky</filename> 350 repository <filename>git://git.yoctoproject.org/poky</filename>
@@ -373,16 +410,21 @@
373 </para></listitem> 410 </para></listitem>
374 <listitem><para><emphasis>Task:</emphasis> 411 <listitem><para><emphasis>Task:</emphasis>
375 A unit of execution for BitBake (e.g. 412 A unit of execution for BitBake (e.g.
376 <ulink url='&YOCTO_DOCS_REF_URL;#ref-tasks-compile'><filename>do_compile</filename></ulink>, 413 <link linkend='ref-tasks-compile'><filename>do_compile</filename></link>,
377 <ulink url='&YOCTO_DOCS_REF_URL;#ref-tasks-fetch'><filename>do_fetch</filename></ulink>, 414 <link linkend='ref-tasks-fetch'><filename>do_fetch</filename></link>,
378 <ulink url='&YOCTO_DOCS_REF_URL;#ref-tasks-patch'><filename>do_patch</filename></ulink>, 415 <link linkend='ref-tasks-patch'><filename>do_patch</filename></link>,
379 and so forth). 416 and so forth).
380 </para></listitem> 417 </para></listitem>
381 <listitem><para><emphasis>Upstream:</emphasis> A reference to source code or repositories 418 <listitem><para>
382 that are not local to the development system but located in a master area that is controlled 419 <emphasis>Upstream:</emphasis>
383 by the maintainer of the source code. 420 A reference to source code or repositories
384 For example, in order for a developer to work on a particular piece of code, they need to 421 that are not local to the development system but located in a
385 first get a copy of it from an "upstream" source.</para></listitem> 422 master area that is controlled by the maintainer of the source
423 code.
424 For example, in order for a developer to work on a particular
425 piece of code, they need to first get a copy of it from an
426 "upstream" source.
427 </para></listitem>
386 </itemizedlist> 428 </itemizedlist>
387 </para> 429 </para>
388</section> 430</section>