diff --git a/documentation/translating.rst b/documentation/translating.rst index eb19bf4685..d71d4b65f7 100644 --- a/documentation/translating.rst +++ b/documentation/translating.rst @@ -151,7 +151,7 @@ The important steps look like this: - Create the GitHub repo (anywhere) with the right hierarchy (using the cookiecutter). - Gather people to help you translate. You can't do it alone. -- You can use any tool to translate, as long as you can synchronize with git. +- You can use any tool to translate, as long as you can synchronize with Git. Some use Transifex, and some use only GitHub. You can choose another way if you like; it's up to you. - Ensure we update this page to reflect your work and progress, either via a @@ -211,7 +211,7 @@ Here's what we're using: from one file to others. - `pospell `__ to check for typos in ``.po`` files. - `powrap `__ to rewrap the ``.po`` files - before committing. This helps keep git diffs short. + before committing. This helps keep Git diffs short. - `potodo `__ to list what needs to be translated. @@ -240,7 +240,7 @@ Ask on the `translation mailing list `_, or better, make a PR o `__. -I have a translation, but it's not in git. What should I do? +I have a translation, but it's not in Git. What should I do? ------------------------------------------------------------ You can ask for help on the `translation mailing list `_, and @@ -248,7 +248,7 @@ the team will help you create an appropriate repository. You can still use tools if you like. -My git hierarchy does not match yours. Can I keep it? +My Git hierarchy does not match yours. Can I keep it? ----------------------------------------------------- No, inside the ``github.com/python`` organization we’ll all have the diff --git a/getting-started/git-boot-camp.rst b/getting-started/git-boot-camp.rst index 082232cee7..c9c6c9da92 100644 --- a/getting-started/git-boot-camp.rst +++ b/getting-started/git-boot-camp.rst @@ -10,11 +10,11 @@ Git Bootcamp and Cheat Sheet This section provides instructions on common tasks in CPython's workflow. It's designed to assist new contributors who have - some familiarity with git and GitHub. + some familiarity with Git and GitHub. - If you are new to git and GitHub, please become comfortable with + If you are new to Git and GitHub, please become comfortable with these instructions before submitting a pull request. As there are several - ways to accomplish these tasks using git and GitHub, this section reflects + ways to accomplish these tasks using Git and GitHub, this section reflects one method suitable for new contributors. Experienced contributors may desire a different approach. @@ -23,9 +23,9 @@ In this section, we will go over some commonly used Git commands that are relevant to CPython's workflow. .. note:: - Setting up git aliases for common tasks can be useful to you. You can + Setting up Git aliases for common tasks can be useful to you. You can get more information about that in - `git documentation `_ + `Git documentation `_ .. _fork-cpython: @@ -544,7 +544,7 @@ page. Find the event that says something like:: By following the link to ````, you will get the full commit hash. -Alternatively, the commit hash can also be obtained by the following git +Alternatively, the commit hash can also be obtained by the following Git commands: .. code-block:: bash diff --git a/getting-started/pull-request-lifecycle.rst b/getting-started/pull-request-lifecycle.rst index 06fd90162a..54242ac1f2 100644 --- a/getting-started/pull-request-lifecycle.rst +++ b/getting-started/pull-request-lifecycle.rst @@ -132,7 +132,7 @@ You should have already :ref:`set up your system `, git pull origin # pull = fetch + merge If you have made local changes that have not been pushed to your fork and - there are merge conflicts, git will warn you about this and enter conflict + there are merge conflicts, Git will warn you about this and enter conflict resolution mode. See :ref:`resolving-merge-conflicts` below. * If time passes and there are merge conflicts with the main branch, GitHub @@ -165,14 +165,14 @@ resolved as follows: git status #. Edit the affected files and bring them to their intended final state. - Make sure to remove the special "conflict markers" inserted by git. + Make sure to remove the special "conflict markers" inserted by Git. #. Commit the affected files:: git add git merge --continue -When running the final command, git may open an editor for writing a commit +When running the final command, Git may open an editor for writing a commit message. It is usually okay to leave that as-is and close the editor. See `the merge command's documentation `_ @@ -303,7 +303,7 @@ to explain in proper depth what has happened (detail should be good enough that a core developer reading the commit message understands the justification for the change). -Check :ref:`the git bootcamp ` for further +Check :ref:`the Git bootcamp ` for further instructions on how the commit message should look like when merging a pull request. diff --git a/getting-started/setup-building.rst b/getting-started/setup-building.rst index e91ee07b8f..b507d58aa9 100644 --- a/getting-started/setup-building.rst +++ b/getting-started/setup-building.rst @@ -15,28 +15,28 @@ directory structure of the CPython source code. Alternatively, if you have `Docker `_ installed you might want to use `our official images `_. These -contain the latest releases of several Python versions, along with git head, +contain the latest releases of several Python versions, along with Git head, and are provided for development and testing purposes only. .. seealso:: The :ref:`quick-reference` gives brief summary of the process from - installing git to submitting a pull request. + installing Git to submitting a pull request. .. _vcsetup: -Install ``git`` -=============== +Install Git +=========== -CPython is developed using `git `_ for version control. The git -command line program is named ``git``; this is also used to refer to git -itself. git is easily available for all common operating systems. +CPython is developed using `Git `_ for version control. The Git +command line program is named ``git``; this is also used to refer to Git +itself. Git is easily available for all common operating systems. - **Install** As the CPython repo is hosted on GitHub, please refer to either the `GitHub setup instructions `_ - or the `git project instructions `_ for step-by-step + or the `Git project instructions `_ for step-by-step installation directions. You may also want to consider a graphical client such as `TortoiseGit `_ or `GitHub Desktop `_.