diff options
Diffstat (limited to 'documentation/overview-manual/overview-manual-development-environment.rst')
-rw-r--r-- | documentation/overview-manual/overview-manual-development-environment.rst | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/documentation/overview-manual/overview-manual-development-environment.rst b/documentation/overview-manual/overview-manual-development-environment.rst index 273e1027da..3b5147d732 100644 --- a/documentation/overview-manual/overview-manual-development-environment.rst +++ b/documentation/overview-manual/overview-manual-development-environment.rst | |||
@@ -238,7 +238,7 @@ open source projects do so. | |||
238 | 238 | ||
239 | For the Yocto Project, a key individual called the "maintainer" is | 239 | For the Yocto Project, a key individual called the "maintainer" is |
240 | responsible for the integrity of the "master" branch of a given Git | 240 | responsible for the integrity of the "master" branch of a given Git |
241 | repository. The "master" branch is the “upstream” repository from which | 241 | repository. The "master" branch is the "upstream" repository from which |
242 | final or most recent builds of a project occur. The maintainer is | 242 | final or most recent builds of a project occur. The maintainer is |
243 | responsible for accepting changes from other developers and for | 243 | responsible for accepting changes from other developers and for |
244 | organizing the underlying branch structure to reflect release strategies | 244 | organizing the underlying branch structure to reflect release strategies |
@@ -273,19 +273,19 @@ with whatever upstream branch they are working against. They are also | |||
273 | responsible for straightening out any conflicts that might arise within | 273 | responsible for straightening out any conflicts that might arise within |
274 | files that are being worked on simultaneously by more than one person. | 274 | files that are being worked on simultaneously by more than one person. |
275 | All this work is done locally on the development host before anything is | 275 | All this work is done locally on the development host before anything is |
276 | pushed to a "contrib" area and examined at the maintainer’s level. | 276 | pushed to a "contrib" area and examined at the maintainer's level. |
277 | 277 | ||
278 | A somewhat formal method exists by which developers commit changes and | 278 | A somewhat formal method exists by which developers commit changes and |
279 | push them into the "contrib" area and subsequently request that the | 279 | push them into the "contrib" area and subsequently request that the |
280 | maintainer include them into an upstream branch. This process is called | 280 | maintainer include them into an upstream branch. This process is called |
281 | “submitting a patch” or "submitting a change." For information on | 281 | "submitting a patch" or "submitting a change." For information on |
282 | submitting patches and changes, see the | 282 | submitting patches and changes, see the |
283 | ":ref:`dev-manual/dev-manual-common-tasks:submitting a change to the yocto project`" | 283 | ":ref:`dev-manual/dev-manual-common-tasks:submitting a change to the yocto project`" |
284 | section in the Yocto Project Development Tasks Manual. | 284 | section in the Yocto Project Development Tasks Manual. |
285 | 285 | ||
286 | In summary, a single point of entry exists for changes into a "master" | 286 | In summary, a single point of entry exists for changes into a "master" |
287 | or development branch of the Git repository, which is controlled by the | 287 | or development branch of the Git repository, which is controlled by the |
288 | project’s maintainer. And, a set of developers exist who independently | 288 | project's maintainer. And, a set of developers exist who independently |
289 | develop, test, and submit changes to "contrib" areas for the maintainer | 289 | develop, test, and submit changes to "contrib" areas for the maintainer |
290 | to examine. The maintainer then chooses which changes are going to | 290 | to examine. The maintainer then chooses which changes are going to |
291 | become a permanent part of the project. | 291 | become a permanent part of the project. |
@@ -526,7 +526,7 @@ descriptions and strategies on how to use these commands: | |||
526 | Git commands unless you have a ``.git`` repository. | 526 | Git commands unless you have a ``.git`` repository. |
527 | 527 | ||
528 | - *git clone:* Creates a local clone of a Git repository that is on | 528 | - *git clone:* Creates a local clone of a Git repository that is on |
529 | equal footing with a fellow developer’s Git repository or an upstream | 529 | equal footing with a fellow developer's Git repository or an upstream |
530 | repository. | 530 | repository. |
531 | 531 | ||
532 | - *git add:* Locally stages updated file contents to the index that | 532 | - *git add:* Locally stages updated file contents to the index that |
@@ -537,7 +537,7 @@ descriptions and strategies on how to use these commands: | |||
537 | you made. Only changes that have been staged can be committed. | 537 | you made. Only changes that have been staged can be committed. |
538 | Commits are used for historical purposes, for determining if a | 538 | Commits are used for historical purposes, for determining if a |
539 | maintainer of a project will allow the change, and for ultimately | 539 | maintainer of a project will allow the change, and for ultimately |
540 | pushing the change from your local Git repository into the project’s | 540 | pushing the change from your local Git repository into the project's |
541 | upstream repository. | 541 | upstream repository. |
542 | 542 | ||
543 | - *git status:* Reports any modified files that possibly need to be | 543 | - *git status:* Reports any modified files that possibly need to be |