Merge pull request #1161 from easybe/fixes

Fix style issues with macOS and PowerShell

Author: ben

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

@@ -7,5 +7,5 @@ For one, the command line is the only place you can run _all_ Git commands -- mo
 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.
 Also, while your choice of graphical client is a matter of personal taste, _all_ users will have the command-line tools installed and available.
 
-So we will expect you to know how to open Terminal in Mac or Command Prompt or Powershell in Windows.
+So we will expect you to know how to open Terminal in macOS or Command Prompt or PowerShell in Windows.
 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

@@ -31,7 +31,7 @@ $ sudo apt install git-all
 
 For more options, there are instructions for installing on several different Unix distributions on the Git website, at http://git-scm.com/download/linux[].
 
-==== Installing on Mac
+==== Installing on macOS
 
 (((Mac, installing)))
 There are several ways to install Git on a Mac.
@@ -67,7 +67,7 @@ Note that the Chocolatey package is community maintained.
 
 Another easy way to get Git installed is by installing GitHub Desktop.
 The installer includes a command line version of Git as well as the GUI.
-It also works well with Powershell, and sets up solid credential caching and sane CRLF settings.(((Powershell)))(((CRLF)))(((credential caching)))
+It also works well with PowerShell, and sets up solid credential caching and sane CRLF settings.(((PowerShell)))(((CRLF)))(((credential caching)))
 We'll learn more about those things a little later, but suffice it to say they're things you want.
 You can download this from the https://desktop.github.com/[GitHub Desktop website].
 

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

@@ -69,7 +69,7 @@ Each of them is tailored for a specific purpose (viewing history and creating co
 ==== GitHub for Mac and Windows
 
 (((GitHub for Mac)))(((GitHub for Windows)))
-GitHub has created two workflow-oriented Git clients: one for Windows, and one for Mac.
+GitHub has created two workflow-oriented Git clients: one for Windows, and one for macOS.
 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.
 They look like this:
 
@@ -84,7 +84,7 @@ We won't be doing a detailed rundown of these tools (they have their own documen
 
 * 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.
 * In the center is a commit-input area, which lets you input a commit message, and select which files should be included.
-  (On Windows, the commit history is displayed directly below this; on Mac, it's on a separate tab.)
+  (On Windows, the commit history is displayed directly below this; on macOS, it's on a separate tab.)
 * 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.
 * The last thing to notice is the ``Sync'' button at the top-right, which is the primary way you interact over the network.
 
@@ -101,7 +101,7 @@ When the applications are first run, they walk you through all the first-time Gi
 
 Both are ``evergreen'' – updates are downloaded and installed in the background while the applications are open.
 This helpfully includes a bundled version of Git, which means you probably won't have to worry about manually updating it again.
-On Windows, the client includes a shortcut to launch Powershell with Posh-git, which we'll talk more about later in this chapter.
+On Windows, the client includes a shortcut to launch PowerShell with Posh-git, which we'll talk more about later in this chapter.
 
 The next step is to give the tool some repositories to work with.
 The client shows you a list of the repositories you have access to on GitHub, and can clone them in one step.
@@ -114,10 +114,10 @@ The intended workflow for this tool is sometimes called the ``GitHub Flow.''
 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.
 
 Branch management is one of the areas where the two tools diverge.
-On Mac, there's a button at the top of the window for creating a new branch:
+On macOS, there's a button at the top of the window for creating a new branch:
 
-.``Create Branch'' button on Mac.
-image::images/branch_widget_mac.png[``Create Branch'' button on Mac.]
+.``Create Branch'' button on macOS.
+image::images/branch_widget_mac.png[``Create Branch'' button on macOS.]
 
 On Windows, this is done by typing the new branch's name in the branch-switching widget:
 

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

@@ -1,15 +1,15 @@
 [[_git_powershell]]
-=== Git in Powershell
+=== Git in PowerShell
 
 (((powershell)))(((tab completion, powershell)))(((shell prompts, powershell)))
 (((posh-git)))
-The legacy command-line terminal on Windows (`cmd.exe`) isn't really capable of a customized Git experience, but if you're using Powershell, you're in luck.
+The legacy command-line terminal on Windows (`cmd.exe`) isn't really capable of a customized Git experience, but if you're using PowerShell, you're in luck.
 This also works if you're running PowerShell on a non-Windows platform like Debian.
 A package called Posh-Git (https://github.com/dahlbyk/posh-git[]) provides powerful tab-completion facilities, as well as an enhanced prompt to help you stay on top of your repository status.
 It looks like this:
 
-.Powershell with Posh-git.
-image::images/posh-git.png[Powershell with Posh-git.]
+.PowerShell with Posh-git.
+image::images/posh-git.png[PowerShell with Posh-git.]
 
 ==== Installation
 ===== Prerequisites (Windows only)
@@ -45,7 +45,7 @@ If the second command fails with an error like `Module 'PowerShellGet' was not i
 ----
 
 Then you can go back and try again.
-This happens, because the modules that ship with Windows Powershell are signed with a different publishment certificate.
+This happens, because the modules that ship with Windows PowerShell are signed with a different publishment certificate.
 
 ===== Update PowerShell Prompt
 To include git information in your prompt, posh-git needs to be imported. To do this automatically, include the import statement into you $profile script. This script is executed everytime you open a new PowerShell prompt.
@@ -57,8 +57,8 @@ Keep in mind, that there are multiple $profile scripts. E. g. one for the consol
 -----
 
 ===== From Source
-Just download a Posh-Git release from (https://github.com/dahlbyk/posh-git[]), and uncompress it to the `WindowsPowershell` directory.
-Then open a Powershell prompt as an administrator, and do this:
+Just download a Posh-Git release from (https://github.com/dahlbyk/posh-git[]), and uncompress it to the `WindowsPowerShell` directory.
+Then open a PowerShell prompt as an administrator, and do this:
 [source,powershell]
 -----
 > cd ~\Documents\WindowsPowerShell\Module\posh-git