Skip to content

Commit 69a4743

Browse files
committed
Merge pull request #380 from rmzelle/fix-javascript
Fix capitalization of JavaScript
2 parents 006304b + 887dc24 commit 69a4743

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

book/06-github/sections/4-managing-organization.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Now let's cover some of the things that are a bit different with an organization
3434
Organizations are associated with individual people by way of teams, which are simply a grouping of individual user accounts and repositories within the organization and what kind of access those people have in those repositories.
3535

3636
For example, say your company has three repositories: `frontend`, `backend`, and `deployscripts`.
37-
You'd want your HTML/CSS/Javascript developers to have access to `frontend` and maybe `backend`, and your Operations people to have access to `backend` and `deployscripts`.
37+
You'd want your HTML/CSS/JavaScript developers to have access to `frontend` and maybe `backend`, and your Operations people to have access to `backend` and `deployscripts`.
3838
Teams make this easy, without having to manage the collaborators for every individual repository.
3939

4040
The Organization page shows you a simple dashboard of all the repositories, users and teams that are under this organization.

book/08-customizing-git/sections/attributes.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ You'll see how to tell Git which is which.
1717
===== Identifying Binary Files
1818

1919
Some files look like text files but for all intents and purposes are to be treated as binary data.
20-
For instance, Xcode projects on the Mac contain a file that ends in `.pbxproj`, which is basically a JSON (plain-text Javascript data format) dataset written out to disk by the IDE, which records your build settings and so on.
20+
For instance, Xcode projects on the Mac contain a file that ends in `.pbxproj`, which is basically a JSON (plain-text JavaScript data format) dataset written out to disk by the IDE, which records your build settings and so on.
2121
Although it's technically a text file (because it's all UTF-8), you don't want to treat it as such because it's really a lightweight database – you can't merge the contents if two people change it, and diffs generally aren't helpful.
2222
The file is meant to be consumed by a machine.
2323
In essence, you want to treat it like a binary file.

0 commit comments

Comments
 (0)