Merge pull request #1876 from petk/patch-whitespace

Fix one sentence per line

Author: ben

book/01-introduction/sections/first-time-setup.asc

@@ -21,8 +21,7 @@ Each level overrides values in the previous level, so values in `.git/config` tr
 
 On Windows systems, Git looks for the `.gitconfig` file in the `$HOME` directory (`C:\Users\$USER` for most people).
 It also still looks for `[path]/etc/gitconfig`, although it's relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer.
-If you are using version 2.x or later of Git for Windows, there is also a system-level config file at
-`C:\Documents and Settings\All Users\Application Data\Git\config` on Windows XP, and in `C:\ProgramData\Git\config` on Windows Vista and newer.
+If you are using version 2.x or later of Git for Windows, there is also a system-level config file at `C:\Documents and Settings\All Users\Application Data\Git\config` on Windows XP, and in `C:\ProgramData\Git\config` on Windows Vista and newer.
 This config file can only be changed by `git config -f <file>` as an admin.
 
 You can view all of your settings and where they are coming from using:

book/02-git-basics/sections/viewing-history.asc

@@ -246,10 +246,7 @@ The `--author` option allows you to filter on a specific author, and the `--grep
 
 [NOTE]
 ====
-You can specify more than one instance of both the `--author` and `--grep` search criteria, which
-will limit the commit output to commits that match _any_ of the `--author` patterns and _any_
-of the `--grep` patterns; however, adding the `--all-match` option further limits the output to
-just those commits that match _all_ `--grep` patterns.
+You can specify more than one instance of both the `--author` and `--grep` search criteria, which will limit the commit output to commits that match _any_ of the `--author` patterns and _any_ of the `--grep` patterns; however, adding the `--all-match` option further limits the output to just those commits that match _all_ `--grep` patterns.
 ====
 
 Another really helpful filter is the `-S` option (colloquially referred to as Git's "`pickaxe`" option), which takes a string and shows only those commits that changed the number of occurrences of that string.

book/09-git-and-other-scms/sections/import-custom.asc

@@ -155,7 +155,7 @@ Dir.glob("**/*").each do |file|
 end
 ----
 
-Note:  Because many systems think of their revisions as changes from one commit to another, fast-import can also take commands with each commit to specify which files have been added, removed, or modified and what the new contents are.
+Note: Because many systems think of their revisions as changes from one commit to another, fast-import can also take commands with each commit to specify which files have been added, removed, or modified and what the new contents are.
 You could calculate the differences between snapshots and provide only this data, but doing so is more complex – you may as well give Git all the data and let it figure it out.
 If this is better suited to your data, check the `fast-import` man page for details about how to provide your data in this manner.
 

book/10-git-internals/sections/environment.asc

@@ -9,16 +9,16 @@ This isn't an exhaustive list of all the environment variables Git pays attentio
 Some of Git's general behavior as a computer program depends on environment variables.
 
 *`GIT_EXEC_PATH`* determines where Git looks for its sub-programs (like `git-commit`, `git-diff`, and others).
-  You can check the current setting by running `git --exec-path`.
+You can check the current setting by running `git --exec-path`.
 
 *`HOME`* isn't usually considered customizable (too many other things depend on it), but it's where Git looks for the global configuration file.
-  If you want a truly portable Git installation, complete with global configuration, you can override `HOME` in the portable Git's shell profile.
+If you want a truly portable Git installation, complete with global configuration, you can override `HOME` in the portable Git's shell profile.
 
 *`PREFIX`* is similar, but for the system-wide configuration.
-  Git looks for this file at `$PREFIX/etc/gitconfig`.
+Git looks for this file at `$PREFIX/etc/gitconfig`.
 
 *`GIT_CONFIG_NOSYSTEM`*, if set, disables the use of the system-wide configuration file.
-  This is useful if your system config is interfering with your commands, but you don't have access to change or remove it.
+This is useful if your system config is interfering with your commands, but you don't have access to change or remove it.
 
 *`GIT_PAGER`* controls the program used to display multi-page output on the command line.
 If this is unset, `PAGER` will be used as a fallback.

book/dedication.asc

@@ -4,5 +4,4 @@
 _To my wife, Becky, without whom this adventure never would have begun. — Ben_
 
 _This edition is dedicated to my girls.
-To my wife Jessica who has supported me for all of these years and to my daughter Josephine,
-who will support me when I'm too old to know what's going on. — Scott_
+To my wife Jessica who has supported me for all of these years and to my daughter Josephine, who will support me when I'm too old to know what's going on. — Scott_

book/introduction.asc

@@ -40,8 +40,7 @@ A lot of organizations still use SVN and are not about to change, but by this po
 We also cover how to import projects from several different systems in case you do convince everyone to make the plunge.
 
 *Chapter 10* delves into the murky yet beautiful depths of Git internals.
-Now that you know all about Git and can wield it with power and grace, you can move on to discuss how Git stores its objects,
-what the object model is, details of packfiles, server protocols, and more.
+Now that you know all about Git and can wield it with power and grace, you can move on to discuss how Git stores its objects, what the object model is, details of packfiles, server protocols, and more.
 Throughout the book, we will refer to sections of this chapter in case you feel like diving deep at that point; but if you are like us and want to dive into the technical details, you may want to read Chapter 10 first.
 We leave that up to you.