From c387f0c2543a9dd7f8eca069629ede4bb5ec5dba Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Thu, 17 Sep 2020 01:58:59 +0200 Subject: sphinx: replace special quotes with single and double quotes (From yocto-docs rev: 0aeb7a94abcef3cb3850c753dd0a243f381e6675) Signed-off-by: Quentin Schulz Signed-off-by: Nicolas Dechesne Signed-off-by: Richard Purdie --- .../overview-manual-development-environment.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'documentation/overview-manual/overview-manual-development-environment.rst') 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. For the Yocto Project, a key individual called the "maintainer" is responsible for the integrity of the "master" branch of a given Git -repository. The "master" branch is the “upstream” repository from which +repository. The "master" branch is the "upstream" repository from which final or most recent builds of a project occur. The maintainer is responsible for accepting changes from other developers and for organizing the underlying branch structure to reflect release strategies @@ -273,19 +273,19 @@ with whatever upstream branch they are working against. They are also responsible for straightening out any conflicts that might arise within files that are being worked on simultaneously by more than one person. All this work is done locally on the development host before anything is -pushed to a "contrib" area and examined at the maintainer’s level. +pushed to a "contrib" area and examined at the maintainer's level. A somewhat formal method exists by which developers commit changes and push them into the "contrib" area and subsequently request that the maintainer include them into an upstream branch. This process is called -“submitting a patch” or "submitting a change." For information on +"submitting a patch" or "submitting a change." For information on submitting patches and changes, see the ":ref:`dev-manual/dev-manual-common-tasks:submitting a change to the yocto project`" section in the Yocto Project Development Tasks Manual. In summary, a single point of entry exists for changes into a "master" or development branch of the Git repository, which is controlled by the -project’s maintainer. And, a set of developers exist who independently +project's maintainer. And, a set of developers exist who independently develop, test, and submit changes to "contrib" areas for the maintainer to examine. The maintainer then chooses which changes are going to become a permanent part of the project. @@ -526,7 +526,7 @@ descriptions and strategies on how to use these commands: Git commands unless you have a ``.git`` repository. - *git clone:* Creates a local clone of a Git repository that is on - equal footing with a fellow developer’s Git repository or an upstream + equal footing with a fellow developer's Git repository or an upstream repository. - *git add:* Locally stages updated file contents to the index that @@ -537,7 +537,7 @@ descriptions and strategies on how to use these commands: you made. Only changes that have been staged can be committed. Commits are used for historical purposes, for determining if a maintainer of a project will allow the change, and for ultimately - pushing the change from your local Git repository into the project’s + pushing the change from your local Git repository into the project's upstream repository. - *git status:* Reports any modified files that possibly need to be -- cgit v1.2.3-54-g00ecf