Skip to content

Commit 06f7887

Browse files
author
Matthew McCullough
committed
Merge pull request #204 from randomecho/foundations-grammar
Tighten grammar; Do PCs still mostly conjure IBM-clones?
2 parents 7f0b3a3 + 1b1b0d0 commit 06f7887

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

foundations/beta.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ git version 1.8.2
2121

2222

2323
#### Git key vocabulary
24-
Three important words that are key to learning Git are:
24+
Three important words key to learning Git are:
2525

2626
* Repository
2727
* Commit
@@ -75,7 +75,7 @@ GitHub is the repository hosting, collaboration, deployment, and distribution pl
7575

7676
GitHub accounts are free for an unlimited quantity of public repositories. Only private repositories cost to host on the service. Private repositories are typically used for closed-source consulting client or corporate products, whereas public repositories are typically used for open source.
7777

78-
Sign up for a free GitHub account at https://github.com/join.
78+
Sign up for a free GitHub account at [github.com/join](https://github.com/join).
7979

8080
Git can be installed as a unified GitHub GUI and command line or merely as a stand-alone command line interface.
8181

@@ -146,7 +146,7 @@ Repositories can be created in numerous ways, including:
146146

147147
#### Details & Resources
148148

149-
In many cases, working with a code project means retriving it to the local disk so that you can leverage your language-specific IDE when making changes. To retrieve a repository to the local disk is to `clone` it, in Git parlance. Some of the most common sources and means of cloning include:
149+
In many cases, working with a code project means retrieving it to the local disk so that you can leverage your language-specific IDE when making changes. To retrieve a repository to the local disk is to `clone` it, in Git parlance. Some of the most common sources and means of cloning include:
150150

151151

152152
{% capture slide %}
@@ -164,7 +164,7 @@ The GitHub Web Flow allows you to:
164164
{% include slide-section %}
165165

166166

167-
The GitHub Web Flow is a path through the GitHub user interface that facilitates governed, named, and reviewed sets of changes. This flow can be performed entirely from a web browser, with no need to download the code to a desktop machine, and yet still having the benefit of syntax highlighting and pre-merge code reviews and discussions.
167+
The GitHub Web Flow is a path through the GitHub user interface that facilitates governed, named, and reviewed sets of changes. This flow can be performed entirely from a web browser, with no need to download the code to a desktop machine, and yet still have the benefit of syntax highlighting and pre-merge code reviews and discussions.
168168

169169

170170

@@ -174,12 +174,12 @@ The GitHub Web Flow is a path through the GitHub user interface that facilitates
174174
{% capture slide %}
175175
### Local repositories
176176

177-
A commit is a transactionally grouped set of changes, described by an brief message explaining the "why" of the attached changes.
177+
A commit is a transactionally grouped set of changes, described by a brief message explaining the "why" of the attached changes.
178178
{% endcapture %}
179179
{% include slide-section %}
180180

181181

182-
Git enables repositories to be created both on GitHub, or locally on a developer's PC. A repository created locally can be synced to a network destination at a later time, preserving all the timestamps and comments in the local commits during the synchronization.
182+
Git enables repositories to be created both on GitHub, or locally on a developer's computer. A repository created locally can be synced to a network destination at a later time, preserving all the timestamps and comments in the local commits during the synchronization.
183183

184184
![](../assets/diagrams/distributed-version-control.svg)
185185

@@ -228,7 +228,7 @@ $ git push origin [master|branch]
228228
{% include slide-section %}
229229

230230

231-
A branch is an divergent path in the history of the code base. It may contain an experiment, fix, or enhancement, and is generally intended to be merged back to the `master` branch after being thoroughly reviewed by a colleague.
231+
A branch is a divergent path in the history of the code base. It may contain an experiment, fix, or enhancement, and is generally intended to be merged back to the `master` branch after being thoroughly reviewed by a colleague.
232232

233233
![](../assets/diagrams/what-is-a-branch.svg)
234234

0 commit comments

Comments
 (0)