summaryrefslogtreecommitdiffstats
path: root/documentation/overview-manual/development-environment.rst
diff options
context:
space:
mode:
Diffstat (limited to 'documentation/overview-manual/development-environment.rst')
-rw-r--r--documentation/overview-manual/development-environment.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/documentation/overview-manual/development-environment.rst b/documentation/overview-manual/development-environment.rst
index 1decf01e43..ab155dc3b0 100644
--- a/documentation/overview-manual/development-environment.rst
+++ b/documentation/overview-manual/development-environment.rst
@@ -71,7 +71,7 @@ section in
71the Yocto Project Development Tasks Manual. 71the Yocto Project Development Tasks Manual.
72 72
73If your development host is going to be a system that runs a Linux 73If your development host is going to be a system that runs a Linux
74distribution, steps still exist that you must take to prepare the system 74distribution, you must still take steps to prepare the system
75for use with the Yocto Project. You need to be sure that the Linux 75for use with the Yocto Project. You need to be sure that the Linux
76distribution on the system is one that supports the Yocto Project. You 76distribution on the system is one that supports the Yocto Project. You
77also need to be sure that the correct set of host packages are installed 77also need to be sure that the correct set of host packages are installed
@@ -80,8 +80,8 @@ set up a development host that runs Linux, see the
80":ref:`dev-manual/start:setting up a native linux host`" 80":ref:`dev-manual/start:setting up a native linux host`"
81section in the Yocto Project Development Tasks Manual. 81section in the Yocto Project Development Tasks Manual.
82 82
83Once your development host is set up to use the Yocto Project, several 83Once your development host is set up to use the Yocto Project, there
84methods exist for you to do work in the Yocto Project environment: 84are several ways of working in the Yocto Project environment:
85 85
86- *Command Lines, BitBake, and Shells:* Traditional development in the 86- *Command Lines, BitBake, and Shells:* Traditional development in the
87 Yocto Project involves using the :term:`OpenEmbedded Build System`, 87 Yocto Project involves using the :term:`OpenEmbedded Build System`,
@@ -271,7 +271,7 @@ files that are being worked on simultaneously by more than one person.
271All this work is done locally on the development host before anything is 271All this work is done locally on the development host before anything is
272pushed to a "contrib" area and examined at the maintainer's level. 272pushed to a "contrib" area and examined at the maintainer's level.
273 273
274A somewhat formal method exists by which developers commit changes and 274There is a somewhat formal method by which developers commit changes and
275push them into the "contrib" area and subsequently request that the 275push them into the "contrib" area and subsequently request that the
276maintainer include them into an upstream branch. This process is called 276maintainer include them into an upstream branch. This process is called
277"submitting a patch" or "submitting a change." For information on 277"submitting a patch" or "submitting a change." For information on
@@ -279,9 +279,9 @@ submitting patches and changes, see the
279":ref:`dev-manual/common-tasks:submitting a change to the yocto project`" 279":ref:`dev-manual/common-tasks:submitting a change to the yocto project`"
280section in the Yocto Project Development Tasks Manual. 280section in the Yocto Project Development Tasks Manual.
281 281
282In summary, a single point of entry exists for changes into a "master" 282In summary, there is a single point of entry for changes into a "master"
283or development branch of the Git repository, which is controlled by the 283or development branch of the Git repository, which is controlled by the
284project's maintainer. And, a set of developers exist who independently 284project's maintainer. A set of developers independently
285develop, test, and submit changes to "contrib" areas for the maintainer 285develop, test, and submit changes to "contrib" areas for the maintainer
286to examine. The maintainer then chooses which changes are going to 286to examine. The maintainer then chooses which changes are going to
287become a permanent part of the project. 287become a permanent part of the project.