Merge pull request progit#1445 from finn0/fix/period-before-parentheses

ben · web-flow · commit 2fdc5dc89ae5 · 2020-06-30T11:23:40.000-07:00
diff --git a/book/01-introduction/sections/first-time-setup.asc b/book/01-introduction/sections/first-time-setup.asc
@@ -10,12 +10,12 @@ These variables can be stored in three different places:
 
 1. `/etc/gitconfig` file: Contains values applied to every user on the system and all their repositories.
   If you pass the option `--system` to `git config`, it reads and writes from this file specifically.
-  (Because this is a system configuration file, you would need administrative or superuser privilege to make changes to it.)
+  Because this is a system configuration file, you would need administrative or superuser privilege to make changes to it.
 2. `~/.gitconfig` or `~/.config/git/config` file: Values specific personally to you, the user.
   You can make Git read and write to this file specifically by passing the `--global` option, and this affects _all_ of the repositories you work with on your system.
 3. `config` file in the Git directory (that is, `.git/config`) of whatever repository you're currently using: Specific to that single repository.
   You can force Git to read from and write to this file with the `--local` option, but that is in fact the default.
-  (Unsurprisingly, you need to be located somewhere in a Git repository for this option to work properly.)
+  Unsurprisingly, you need to be located somewhere in a Git repository for this option to work properly.
 
 Each level overrides values in the previous level, so values in `.git/config` trump those in `/etc/gitconfig`.
 
diff --git a/book/02-git-basics/sections/getting-a-repository.asc b/book/02-git-basics/sections/getting-a-repository.asc
@@ -38,7 +38,7 @@ $ git init
 
 This creates a new subdirectory named `.git` that contains all of your necessary repository files -- a Git repository skeleton.
 At this point, nothing in your project is tracked yet.
-(See <<ch10-git-internals#ch10-git-internals>> for more information about exactly what files are contained in the `.git` directory you just created.)(((git commands, init)))
+See <<ch10-git-internals#ch10-git-internals>> for more information about exactly what files are contained in the `.git` directory you just created.(((git commands, init)))
 
 If you want to start version-controlling existing files (as opposed to an empty directory), you should probably begin tracking those files and do an initial commit.
 You can accomplish that with a few `git add` commands that specify the files you want to track, followed by a `git commit`:
diff --git a/book/02-git-basics/sections/recording-changes.asc b/book/02-git-basics/sections/recording-changes.asc
@@ -262,7 +262,7 @@ GitHub maintains a fairly comprehensive list of good `.gitignore` file examples
 In the simple case, a repository might have a single `.gitignore` file in its root directory, which applies recursively to the entire repository.
 However, it is also possible to have additional `.gitignore` files in subdirectories.
 The rules in these nested `.gitignore` files apply only to the files under the directory where they are located.
-(The Linux kernel source repository has 206 `.gitignore` files.)
+The Linux kernel source repository has 206 `.gitignore` files.
 
 It is beyond the scope of this book to get into the details of multiple `.gitignore` files; see `man gitignore` for the details.
 ====
diff --git a/book/02-git-basics/sections/remotes.asc b/book/02-git-basics/sections/remotes.asc
@@ -103,7 +103,7 @@ From https://github.com/paulboone/ticgit
 ----
 
 Paul's `master` branch is now accessible locally as `pb/master` -- you can merge it into one of your branches, or you can check out a local branch at that point if you want to inspect it.
-(We'll go over what branches are and how to use them in much more detail in <<ch03-git-branching#ch03-git-branching>>.)
+We'll go over what branches are and how to use them in much more detail in <<ch03-git-branching#ch03-git-branching>>.
 
 [[_fetching_and_pulling]]
 ==== Fetching and Pulling from Your Remotes
diff --git a/book/05-distributed-git/sections/contributing.asc b/book/05-distributed-git/sections/contributing.asc
@@ -110,7 +110,7 @@ In this environment, you can follow a workflow similar to what you might do when
 You still get the advantages of things like offline committing and vastly simpler branching and merging, but the workflow can be very similar; the main difference is that merges happen client-side rather than on the server at commit time.
 Let's see what it might look like when two developers start to work together with a shared repository.
 The first developer, John, clones the repository, makes a change, and commits locally.
-(The protocol messages have been replaced with `...` in these examples to shorten them somewhat.)
+The protocol messages have been replaced with `...` in these examples to shorten them somewhat.
 
 [source,console]
 ----
diff --git a/book/06-github/sections/1-setting-up-account.asc b/book/06-github/sections/1-setting-up-account.asc
@@ -29,7 +29,7 @@ As of right now, you're fully able to connect with Git repositories using the `h
 However, to simply clone public projects, you don't even need to sign up - the account we just created comes into play when we fork projects and push to our forks a bit later.
 
 If you'd like to use SSH remotes, you'll need to configure a public key.
-(If you don't already have one, see <<ch04-git-on-the-server#_generate_ssh_key>>.)
+If you don't already have one, see <<ch04-git-on-the-server#_generate_ssh_key>>.
 Open up your account settings using the link at the top-right of the window:
 
 .The ``Account settings'' link.
diff --git a/book/07-git-tools/sections/reset.asc b/book/07-git-tools/sections/reset.asc
@@ -10,7 +10,7 @@ For this, we recommend a simple metaphor.
 
 An easier way to think about `reset` and `checkout` is through the mental frame of Git being a content manager of three different trees.
 By ``tree'' here, we really mean ``collection of files'', not specifically the data structure.
-(There are a few cases where the index doesn't exactly act like a tree, but for our purposes it is easier to think about it this way for now.)
+There are a few cases where the index doesn't exactly act like a tree, but for our purposes it is easier to think about it this way for now.
 
 Git as a system manages and manipulates three trees in its normal operation:
 
@@ -220,8 +220,7 @@ If we look at the diagram for that command and think about what `git add` does,
 
 image::images/reset-path2.png[]
 
-This is why the output of the `git status` command suggests that you run this to unstage a file.
-(See <<ch02-git-basics-chapter#_unstaging>> for more on this.)
+This is why the output of the `git status` command suggests that you run this to unstage a file (see <<ch02-git-basics-chapter#_unstaging>> for more on this).
 
 We could just as easily not let Git assume we meant ``pull the data from HEAD'' by specifying a specific commit to pull that file version from.
 We would just run something like `git reset eb43bf file.txt`.
@@ -240,7 +239,7 @@ Let's look at how to do something interesting with this newfound power -- squash
 
 Say you have a series of commits with messages like ``oops.'', ``WIP'' and ``forgot this file''.
 You can use `reset` to quickly and easily squash them into a single commit that makes you look really smart.
-(<<_squashing>> shows another way to do this, but in this example it's simpler to use `reset`.)
+<<_squashing>> shows another way to do this, but in this example it's simpler to use `reset`.
 
 Let's say you have a project where the first commit has one file, the second commit added a new file and changed the first, and the third commit changed the first file again.
 The second commit was a work in progress and you want to squash it down.
diff --git a/book/07-git-tools/sections/submodules.asc b/book/07-git-tools/sections/submodules.asc
@@ -973,7 +973,7 @@ Indeed, if you switch between branches that record the submodule at different co
 That is because the submodule state is by default not carried over when switching branches.
 
 This can be really confusing, so it's a good idea to always `git checkout --recurse-submodules` when your project has submodules.
-(For older Git versions that do not have the  `--recurse-submodules` flag, after the checkout you can use `git submodule update --init --recursive` to put the submodules in the right state.)
+For older Git versions that do not have the  `--recurse-submodules` flag, after the checkout you can use `git submodule update --init --recursive` to put the submodules in the right state.
 
 Luckily, you can tell Git (>=2.14) to always use the  `--recurse-submodules` flag by setting the configuration option `submodule.recurse`: `git config submodule.recurse true`.
 As noted above, this will also make Git recurse into submodules for every command that has a `--recurse-submodules` option (except `git clone`).
diff --git a/book/07-git-tools/sections/subtree-merges.asc b/book/07-git-tools/sections/subtree-merges.asc
@@ -69,7 +69,7 @@ $ git pull
 
 Then, we can merge those changes back into our `master` branch.
 To pull in the changes and prepopulate the commit message, use the `--squash` option, as well as the recursive merge strategy's `-Xsubtree` option.
-(The recursive strategy is the default here, but we include it for clarity.)
+The recursive strategy is the default here, but we include it for clarity.
 
 [source,console]
 ----
diff --git a/book/08-customizing-git/sections/config.asc b/book/08-customizing-git/sections/config.asc
@@ -22,7 +22,7 @@ You can make Git read and write to this file by passing the `--global` option.
 
 Finally, Git looks for configuration values in the configuration file in the Git directory (`.git/config`) of whatever repository you're currently using.
 These values are specific to that single repository, and represent passing the `--local` option to `git config`.
-(If you don't specify which level you want to work with, this is the default.)
+If you don't specify which level you want to work with, this is the default.
 
 Each of these ``levels'' (system, global, local) overwrites values in the previous level, so values in `.git/config` trump those in `/etc/gitconfig`, for instance.
 
diff --git a/book/09-git-and-other-scms/sections/client-bzr.asc b/book/09-git-and-other-scms/sections/client-bzr.asc
@@ -128,8 +128,8 @@ $ git push origin master
 Git's remote-helpers framework has some limitations that apply.
 In particular, these commands don't work:
 
-* git push origin :branch-to-delete (Bazaar can't accept ref deletions in this way.)
-* git push origin old:new (it will push 'old')
+* git push origin :branch-to-delete (Bazaar can't accept ref deletions in this way)
+* git push origin old:new (it will push `old`)
 * git push --dry-run origin branch (it will push)
 
 ===== Summary
diff --git a/book/09-git-and-other-scms/sections/client-hg.asc b/book/09-git-and-other-scms/sections/client-hg.asc
@@ -31,7 +31,7 @@ If you have Python installed, this is as simple as:
 $ pip install mercurial
 ----
 
-(If you don't have Python installed, visit https://www.python.org/[] and get it first.)
+If you don't have Python installed, visit https://www.python.org/[] and get it first.
 
 The last thing you'll need is the Mercurial client.
 Go to https://www.mercurial-scm.org/[] and install it if you haven't already.
diff --git a/book/10-git-internals/sections/environment.asc b/book/10-git-internals/sections/environment.asc
@@ -220,8 +220,7 @@ Note that this isn't the easiest way to customize how `ssh` is invoked; it won't
 It's probably easier just to use the `~/.ssh/config` file for that.
 
 *`GIT_ASKPASS`* is an override for the `core.askpass` configuration value.
-This is the program invoked whenever Git needs to ask the user for credentials, which can expect a text prompt as a command-line argument, and should return the answer on `stdout`.
-(See <<ch07-git-tools#_credential_caching>> for more on this subsystem.)
+This is the program invoked whenever Git needs to ask the user for credentials, which can expect a text prompt as a command-line argument, and should return the answer on `stdout` (see <<ch07-git-tools#_credential_caching>> for more on this subsystem).
 
 *`GIT_NAMESPACE`* controls access to namespaced refs, and is equivalent to the `--namespace` flag.
 This is mostly useful on the server side, where you may want to store multiple forks of a single repository in one repository, only keeping the refs separate.
diff --git a/book/A-git-in-other-environments/sections/guis.asc b/book/A-git-in-other-environments/sections/guis.asc
@@ -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 macOS, 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.
 
diff --git a/book/A-git-in-other-environments/sections/sublimetext.asc b/book/A-git-in-other-environments/sections/sublimetext.asc
@@ -9,6 +9,6 @@ The features are:
 * In the status bar, you can see the current git branch and how many modifications you have made.
 * All changes to a file are now visible via markers in the gutter.
 * You can use part of the Sublime Merge git client functionality from within Sublime Text.
-  (This requires that Sublime Merge is installed. See: https://www.sublimemerge.com/[])
+  This requires that Sublime Merge is installed. See: https://www.sublimemerge.com/[].
 
 The official documentation for Sublime Text can be found here: https://www.sublimetext.com/docs/3/git_integration.html[]
diff --git a/book/A-git-in-other-environments/sections/zsh.asc b/book/A-git-in-other-environments/sections/zsh.asc
@@ -34,7 +34,7 @@ zstyle ':vcs_info:git:*' formats '%b'
 ----
 
 This results in a display of the current branch on the right-hand side of the terminal window, whenever your shell is inside a Git repository.
-(The left side is supported as well, of course; just uncomment the assignment to PROMPT.)
+The left side is supported as well, of course; just uncomment the assignment to PROMPT.
 It looks a bit like this:
 
 .Customized `zsh` prompt
diff --git a/book/B-embedding-git/sections/libgit2.asc b/book/B-embedding-git/sections/libgit2.asc
@@ -133,7 +133,7 @@ error = git_repository_open(&repo, "some-path");
 error = git_repository_set_odb(repo, odb); // <4>
 ----
 
-_(Note that errors are captured, but not handled. We hope your code is better than ours.)_
+_Note that errors are captured, but not handled. We hope your code is better than ours._
 
 <1> Initialize an empty object database (ODB) ``frontend,'' which will act as a container for the ``backends'' which are the ones doing the real work.
 <2> Initialize a custom ODB backend.
