summaryrefslogtreecommitdiffstats
path: root/documentation/overview-manual/overview-manual-development-environment.xml
diff options
context:
space:
mode:
Diffstat (limited to 'documentation/overview-manual/overview-manual-development-environment.xml')
-rw-r--r--documentation/overview-manual/overview-manual-development-environment.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/documentation/overview-manual/overview-manual-development-environment.xml b/documentation/overview-manual/overview-manual-development-environment.xml
index 8415d1dd70..08ad071316 100644
--- a/documentation/overview-manual/overview-manual-development-environment.xml
+++ b/documentation/overview-manual/overview-manual-development-environment.xml
@@ -327,7 +327,7 @@
327 For the Yocto Project, a key individual called the "maintainer" is 327 For the Yocto Project, a key individual called the "maintainer" is
328 responsible for the integrity of the "master" branch of a given Git 328 responsible for the integrity of the "master" branch of a given Git
329 repository. 329 repository.
330 The "master" branch is the upstream repository from which final or 330 The "master" branch is the "upstream" repository from which final or
331 most recent builds of a project occur. 331 most recent builds of a project occur.
332 The maintainer is responsible for accepting changes from other 332 The maintainer is responsible for accepting changes from other
333 developers and for organizing the underlying branch structure to 333 developers and for organizing the underlying branch structure to
@@ -372,7 +372,7 @@
372 might arise within files that are being worked on simultaneously by 372 might arise within files that are being worked on simultaneously by
373 more than one person. 373 more than one person.
374 All this work is done locally on the development host before 374 All this work is done locally on the development host before
375 anything is pushed to a "contrib" area and examined at the maintainers 375 anything is pushed to a "contrib" area and examined at the maintainer's
376 level. 376 level.
377 </para> 377 </para>
378 378
@@ -380,7 +380,7 @@
380 A somewhat formal method exists by which developers commit changes 380 A somewhat formal method exists by which developers commit changes
381 and push them into the "contrib" area and subsequently request that 381 and push them into the "contrib" area and subsequently request that
382 the maintainer include them into an upstream branch. 382 the maintainer include them into an upstream branch.
383 This process is called submitting a patch or "submitting a change." 383 This process is called "submitting a patch" or "submitting a change."
384 For information on submitting patches and changes, see the 384 For information on submitting patches and changes, see the
385 "<ulink url='&YOCTO_DOCS_DEV_URL;#how-to-submit-a-change'>Submitting a Change to the Yocto Project</ulink>" 385 "<ulink url='&YOCTO_DOCS_DEV_URL;#how-to-submit-a-change'>Submitting a Change to the Yocto Project</ulink>"
386 section in the Yocto Project Development Tasks Manual. 386 section in the Yocto Project Development Tasks Manual.
@@ -389,7 +389,7 @@
389 <para> 389 <para>
390 In summary, a single point of entry 390 In summary, a single point of entry
391 exists for changes into a "master" or development branch of the 391 exists for changes into a "master" or development branch of the
392 Git repository, which is controlled by the projects maintainer. 392 Git repository, which is controlled by the project's maintainer.
393 And, a set of developers exist who independently develop, test, and 393 And, a set of developers exist who independently develop, test, and
394 submit changes to "contrib" areas for the maintainer to examine. 394 submit changes to "contrib" areas for the maintainer to examine.
395 The maintainer then chooses which changes are going to become a 395 The maintainer then chooses which changes are going to become a
@@ -734,7 +734,7 @@
734 <listitem><para id='git-commands-clone'> 734 <listitem><para id='git-commands-clone'>
735 <emphasis><filename>git clone</filename>:</emphasis> 735 <emphasis><filename>git clone</filename>:</emphasis>
736 Creates a local clone of a Git repository that is on 736 Creates a local clone of a Git repository that is on
737 equal footing with a fellow developers Git repository 737 equal footing with a fellow developer's Git repository
738 or an upstream repository. 738 or an upstream repository.
739 </para></listitem> 739 </para></listitem>
740 <listitem><para> 740 <listitem><para>
@@ -752,7 +752,7 @@
752 Commits are used for historical purposes, for determining 752 Commits are used for historical purposes, for determining
753 if a maintainer of a project will allow the change, 753 if a maintainer of a project will allow the change,
754 and for ultimately pushing the change from your local 754 and for ultimately pushing the change from your local
755 Git repository into the projects upstream repository. 755 Git repository into the project's upstream repository.
756 </para></listitem> 756 </para></listitem>
757 <listitem><para> 757 <listitem><para>
758 <emphasis><filename>git status</filename>:</emphasis> 758 <emphasis><filename>git status</filename>:</emphasis>