Merge pull request #1851 from petk/spelling

ben · web-flow · commit 6dd434e08650 · 2023-03-30T17:27:57.000-07:00
Fix some spellings
diff --git a/C-git-commands.asc b/C-git-commands.asc
@@ -51,7 +51,7 @@ Accompanying the configuration instructions in <<ch01-getting-started#_editor>>,
 |==============================
 |Editor | Configuration command
 |Atom |`git config --global core.editor "atom --wait"`
-|BBEdit (Mac, with command line tools) |`git config --global core.editor "bbedit -w"`
+|BBEdit (macOS, with command line tools) |`git config --global core.editor "bbedit -w"`
 |Emacs |`git config --global core.editor emacs`
 |Gedit (Linux) |`git config --global core.editor "gedit --wait --new-window"`
 |Gvim (Windows 64-bit) |`git config --global core.editor "'C:\Program Files\Vim\vim72\gvim.exe' --nofork '%*'"` (Also see note below)
diff --git a/book/01-introduction/sections/installing.asc b/book/01-introduction/sections/installing.asc
@@ -34,7 +34,7 @@ For more options, there are instructions for installing on several different Uni
 ==== Installing on macOS
 
 (((macOS, installing)))
-There are several ways to install Git on a Mac.
+There are several ways to install Git on macOS.
 The easiest is probably to install the Xcode Command Line Tools.(((Xcode)))
 On Mavericks (10.9) or above you can do this simply by trying to run `git` from the Terminal the very first time.
 
diff --git a/book/02-git-basics/sections/viewing-history.asc b/book/02-git-basics/sections/viewing-history.asc
@@ -276,13 +276,13 @@ In <<limit_options>> we'll list these and a few other common options for your re
 [cols="2,4",options="header"]
 |================================
 | Option                | Description
-| `-<n>`                | Show only the last n commits
+| `-<n>`                | Show only the last n commits.
 | `--since`, `--after`  | Limit the commits to those made after the specified date.
 | `--until`, `--before` | Limit the commits to those made before the specified date.
 | `--author`            | Only show commits in which the author entry matches the specified string.
 | `--committer`         | Only show commits in which the committer entry matches the specified string.
-| `--grep`              | Only show commits with a commit message containing the string
-| `-S`                  | Only show commits adding or removing code matching the string
+| `--grep`              | Only show commits with a commit message containing the string.
+| `-S`                  | Only show commits adding or removing code matching the string.
 |================================
 
 For example, if you want to see which commits modifying test files in the Git source code history were committed by Junio Hamano in the month of October 2008 and are not merge commits, you can run something like this:(((log filtering)))
diff --git a/book/03-git-branching/sections/basic-branching-and-merging.asc b/book/03-git-branching/sections/basic-branching-and-merging.asc
@@ -265,7 +265,7 @@ Normal merge conflict for 'index.html':
 Hit return to start merge resolution tool (opendiff):
 ----
 
-If you want to use a merge tool other than the default (Git chose `opendiff` in this case because the command was run on a Mac), you can see all the supported tools listed at the top after "`one of the following tools.`"
+If you want to use a merge tool other than the default (Git chose `opendiff` in this case because the command was run on macOS), you can see all the supported tools listed at the top after "`one of the following tools.`"
 Just type the name of the tool you'd rather use.
 
 [NOTE]
diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc
@@ -37,7 +37,7 @@ image::images/gitlab-menu.png[The “Admin area” item in the GitLab menu]
 Everybody using your GitLab server must have a user account.
 User accounts are quite simple, they mainly contain personal information attached to login data.
 Each user account has a *namespace*, which is a logical grouping of projects that belong to that user.
-If the user +jane+ had a project named +project+, that project's url would be `http://server/jane/project`.
+If the user +jane+ had a project named +project+, that project's URL would be `http://server/jane/project`.
 
 [[gitlab_users]]
 .The GitLab user administration screen
@@ -54,7 +54,7 @@ This is obviously a much more permanent and destructive action, and you will rar
 ===== Groups
 
 A GitLab group is a collection of projects, along with data about how users can access those projects.
-Each group has a project namespace (the same way that users do), so if the group +training+ has a project +materials+, its url would be `http://server/training/materials`.
+Each group has a project namespace (the same way that users do), so if the group +training+ has a project +materials+, its URL would be `http://server/training/materials`.
 
 [[gitlab_groups]]
 .The GitLab group administration screen
diff --git a/book/04-git-server/sections/gitweb.asc b/book/04-git-server/sections/gitweb.asc
@@ -10,7 +10,7 @@ image::images/git-instaweb.png[The GitWeb web-based user interface]
 
 If you want to check out what GitWeb would look like for your project, Git comes with a command to fire up a temporary instance if you have a lightweight web server on your system like `lighttpd` or `webrick`.
 On Linux machines, `lighttpd` is often installed, so you may be able to get it to run by typing `git instaweb` in your project directory.
-If you're running a Mac, Leopard comes preinstalled with Ruby, so `webrick` may be your best bet.
+If you're running macOS, Leopard comes preinstalled with Ruby, so `webrick` may be your best bet.
 To start `instaweb` with a non-lighttpd handler, you can run it with the `--httpd` option.(((git commands, instaweb)))
 
 [source,console]
diff --git a/book/04-git-server/sections/smart-http.asc b/book/04-git-server/sections/smart-http.asc
@@ -68,5 +68,5 @@ You can do this with nearly any CGI-capable web server, so go with the one that
 
 [NOTE]
 ====
-For more information on configuring authentication in Apache, check out the Apache docs here: https://httpd.apache.org/docs/current/howto/auth.html[^]
+For more information on configuring authentication in Apache, check out the Apache docs here: https://httpd.apache.org/docs/current/howto/auth.html[^].
 ====
diff --git a/book/06-github/sections/2-contributing.asc b/book/06-github/sections/2-contributing.asc
@@ -52,7 +52,7 @@ Let's walk through an example of proposing a change to an open source project ho
 [TIP]
 ====
 You can use the official *GitHub CLI* tool instead of the GitHub web interface for most things.
-The tool can be used on Windows, MacOS, and Linux systems.
+The tool can be used on Windows, macOS, and Linux systems.
 Go to the https://cli.github.com/[GitHub CLI homepage^] for installation instructions and the manual.
 ====
 
diff --git a/book/07-git-tools/sections/credentials.asc b/book/07-git-tools/sections/credentials.asc
@@ -17,7 +17,7 @@ Git has a few options provided in the box:
 * The "`store`" mode saves the credentials to a plain-text file on disk, and they never expire.
   This means that until you change your password for the Git host, you won't ever have to type in your credentials again.
   The downside of this approach is that your passwords are stored in cleartext in a plain file in your home directory.
-* If you're using a Mac, Git comes with an "`osxkeychain`" mode, which caches credentials in the secure keychain that's attached to your system account.
+* If you're using macOS, Git comes with an "`osxkeychain`" mode, which caches credentials in the secure keychain that's attached to your system account.
   This method stores the credentials on disk, and they never expire, but they're encrypted with the same system that stores HTTPS certificates and Safari auto-fills.
 * If you're using Windows, you can enable the *Git Credential Manager* feature when installing https://gitforwindows.org/[Git for Windows] or separately install https://github.com/git-ecosystem/git-credential-manager/releases/latest[the latest GCM] as a standalone service.
   This is similar to the "`osxkeychain`" helper described above, but uses the Windows Credential Store to control sensitive information.
