Skip to content

Commit d297b38

Browse files
committed
Replace Mac with macOS when referring to the operating system
Apple's operating system for Macintosh computers is called macOS (previously Mac OS). Referring to it with "on Mac" is not that common. Alternatively, "on a Mac" can be used.
1 parent f86a0e2 commit d297b38

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

book/01-introduction/sections/command-line.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ For one, the command line is the only place you can run _all_ Git commands -- mo
77
If you know how to run the command-line version, you can probably also figure out how to run the GUI version, while the opposite is not necessarily true.
88
Also, while your choice of graphical client is a matter of personal taste, _all_ users will have the command-line tools installed and available.
99

10-
So we will expect you to know how to open Terminal in Mac or Command Prompt or PowerShell in Windows.
10+
So we will expect you to know how to open Terminal in macOS or Command Prompt or PowerShell in Windows.
1111
If you don't know what we're talking about here, you may need to stop and research that quickly so that you can follow the rest of the examples and descriptions in this book.

book/01-introduction/sections/installing.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ $ sudo apt install git-all
3131

3232
For more options, there are instructions for installing on several different Unix distributions on the Git website, at http://git-scm.com/download/linux[].
3333

34-
==== Installing on Mac
34+
==== Installing on macOS
3535

3636
(((Mac, installing)))
3737
There are several ways to install Git on a Mac.

book/A-git-in-other-environments/sections/guis.asc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Each of them is tailored for a specific purpose (viewing history and creating co
6969
==== GitHub for Mac and Windows
7070

7171
(((GitHub for Mac)))(((GitHub for Windows)))
72-
GitHub has created two workflow-oriented Git clients: one for Windows, and one for Mac.
72+
GitHub has created two workflow-oriented Git clients: one for Windows, and one for macOS.
7373
These clients are a good example of workflow-oriented tools – rather than expose _all_ of Git's functionality, they instead focus on a curated set of commonly-used features that work well together.
7474
They look like this:
7575

@@ -84,7 +84,7 @@ We won't be doing a detailed rundown of these tools (they have their own documen
8484

8585
* On the left is the list of repositories the client is tracking; you can add a repository (either by cloning or attaching locally) by clicking the ``+'' icon at the top of this area.
8686
* In the center is a commit-input area, which lets you input a commit message, and select which files should be included.
87-
(On Windows, the commit history is displayed directly below this; on Mac, it's on a separate tab.)
87+
(On Windows, the commit history is displayed directly below this; on macOS, it's on a separate tab.)
8888
* On the right is a diff view, which shows what's changed in your working directory, or which changes were included in the selected commit.
8989
* The last thing to notice is the ``Sync'' button at the top-right, which is the primary way you interact over the network.
9090

@@ -114,10 +114,10 @@ The intended workflow for this tool is sometimes called the ``GitHub Flow.''
114114
We cover this in more detail in <<ch06-github#ch06-github_flow>>, but the general gist is that (a) you'll be committing to a branch, and (b) you'll be syncing up with a remote repository fairly regularly.
115115

116116
Branch management is one of the areas where the two tools diverge.
117-
On Mac, there's a button at the top of the window for creating a new branch:
117+
On macOS, there's a button at the top of the window for creating a new branch:
118118

119-
.``Create Branch'' button on Mac.
120-
image::images/branch_widget_mac.png[``Create Branch'' button on Mac.]
119+
.``Create Branch'' button on macOS.
120+
image::images/branch_widget_mac.png[``Create Branch'' button on macOS.]
121121

122122
On Windows, this is done by typing the new branch's name in the branch-switching widget:
123123

0 commit comments

Comments
 (0)