diff options
Diffstat (limited to 'documentation/overview-manual/development-environment.rst')
-rw-r--r-- | documentation/overview-manual/development-environment.rst | 12 |
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 | |||
71 | the Yocto Project Development Tasks Manual. | 71 | the Yocto Project Development Tasks Manual. |
72 | 72 | ||
73 | If your development host is going to be a system that runs a Linux | 73 | If your development host is going to be a system that runs a Linux |
74 | distribution, steps still exist that you must take to prepare the system | 74 | distribution, you must still take steps to prepare the system |
75 | for use with the Yocto Project. You need to be sure that the Linux | 75 | for use with the Yocto Project. You need to be sure that the Linux |
76 | distribution on the system is one that supports the Yocto Project. You | 76 | distribution on the system is one that supports the Yocto Project. You |
77 | also need to be sure that the correct set of host packages are installed | 77 | also 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`" |
81 | section in the Yocto Project Development Tasks Manual. | 81 | section in the Yocto Project Development Tasks Manual. |
82 | 82 | ||
83 | Once your development host is set up to use the Yocto Project, several | 83 | Once your development host is set up to use the Yocto Project, there |
84 | methods exist for you to do work in the Yocto Project environment: | 84 | are 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. | |||
271 | All this work is done locally on the development host before anything is | 271 | All this work is done locally on the development host before anything is |
272 | pushed to a "contrib" area and examined at the maintainer's level. | 272 | pushed to a "contrib" area and examined at the maintainer's level. |
273 | 273 | ||
274 | A somewhat formal method exists by which developers commit changes and | 274 | There is a somewhat formal method by which developers commit changes and |
275 | push them into the "contrib" area and subsequently request that the | 275 | push them into the "contrib" area and subsequently request that the |
276 | maintainer include them into an upstream branch. This process is called | 276 | maintainer 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`" |
280 | section in the Yocto Project Development Tasks Manual. | 280 | section in the Yocto Project Development Tasks Manual. |
281 | 281 | ||
282 | In summary, a single point of entry exists for changes into a "master" | 282 | In summary, there is a single point of entry for changes into a "master" |
283 | or development branch of the Git repository, which is controlled by the | 283 | or development branch of the Git repository, which is controlled by the |
284 | project's maintainer. And, a set of developers exist who independently | 284 | project's maintainer. A set of developers independently |
285 | develop, test, and submit changes to "contrib" areas for the maintainer | 285 | develop, test, and submit changes to "contrib" areas for the maintainer |
286 | to examine. The maintainer then chooses which changes are going to | 286 | to examine. The maintainer then chooses which changes are going to |
287 | become a permanent part of the project. | 287 | become a permanent part of the project. |