[PATCH] Documentation: a/an grammar fixes

[PATCH] Documentation: a/an grammar fixes

[Ville Skyttä]

This takes the stance that `*` is an asterisk rather than a star.

Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
---
 Documentation/blame-options.adoc       | 2 +-
 Documentation/config/blame.adoc        | 2 +-
 Documentation/config/http.adoc         | 2 +-
 Documentation/config/promisor.adoc     | 2 +-
 Documentation/git-merge.adoc           | 2 +-
 Documentation/git-sparse-checkout.adoc | 2 +-
 Documentation/gitprotocol-v2.adoc      | 2 +-
 Documentation/pull-fetch-param.adoc    | 2 +-
 Documentation/rev-list-options.adoc    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Documentation/blame-options.adoc b/Documentation/blame-options.adoc
index 1ae1222b6b..977d5f871f 100644
--- a/Documentation/blame-options.adoc
+++ b/Documentation/blame-options.adoc
@@ -126,7 +126,7 @@ take effect.
 	another commit will be marked with a `?` in the blame output.  If the
 	`blame.markUnblamableLines` config option is set, then those lines touched
 	by an ignored commit that we could not attribute to another revision are
-	marked with a `*`. In the porcelain modes, we print `ignored` and
+	marked with an `*`. In the porcelain modes, we print `ignored` and
 	`unblamable` on a newline respectively.
 
 `--ignore-revs-file <file>`::
diff --git a/Documentation/config/blame.adoc b/Documentation/config/blame.adoc
index 4d047c1790..5ac120d9da 100644
--- a/Documentation/config/blame.adoc
+++ b/Documentation/config/blame.adoc
@@ -29,7 +29,7 @@ blame.ignoreRevsFile::
 
 blame.markUnblamableLines::
 	Mark lines that were changed by an ignored revision that we could not
-	attribute to another commit with a '*' in the output of
+	attribute to another commit with an '*' in the output of
 	linkgit:git-blame[1].
 
 blame.markIgnoredLines::
diff --git a/Documentation/config/http.adoc b/Documentation/config/http.adoc
index 792a71b413..369ac2cd88 100644
--- a/Documentation/config/http.adoc
+++ b/Documentation/config/http.adoc
@@ -388,7 +388,7 @@ http.<url>.*::
 
 . Host/domain name (e.g., `example.com` in `https://example.com/`).
   This field must match between the config key and the URL. It is
-  possible to specify a `*` as part of the host name to match all subdomains
+  possible to specify an `*` as part of the host name to match all subdomains
   at this level. `https://*.example.com/` for example would match
   `https://foo.example.com/`, but not `https://foo.bar.example.com/`.
 
diff --git a/Documentation/config/promisor.adoc b/Documentation/config/promisor.adoc
index c1f3d766a6..e80435f632 100644
--- a/Documentation/config/promisor.adoc
+++ b/Documentation/config/promisor.adoc
@@ -126,7 +126,7 @@ guidelines:
    the latter matches `https://cdn.your-org.com.hacker.net/repo`.
 +
 4. Be careful using globs at the beginning of domain names. While the
-   code ensures a `*` in the host cannot cross into the path, a
+   code ensures an `*` in the host cannot cross into the path, a
    pattern like `https://*.example.com/*` will still match any
    subdomain. This is extremely dangerous on shared hosting platforms
    (e.g., `https://*.github.io/*` trusts every user's site on the
diff --git a/Documentation/git-merge.adoc b/Documentation/git-merge.adoc
index a055384ad6..899330ff9f 100644
--- a/Documentation/git-merge.adoc
+++ b/Documentation/git-merge.adoc
@@ -329,7 +329,7 @@ After seeing a conflict, you can do two things:
    the working tree.  Edit the files into shape and
    `git add` them to the index.  Use `git commit` or
    `git merge --continue` to seal the deal. The latter command
-   checks whether there is a (interrupted) merge in progress
+   checks whether there is an (interrupted) merge in progress
    before calling `git commit`.
 
 You can work through the conflict with a number of tools:
diff --git a/Documentation/git-sparse-checkout.adoc b/Documentation/git-sparse-checkout.adoc
index e286584c67..d30168721a 100644
--- a/Documentation/git-sparse-checkout.adoc
+++ b/Documentation/git-sparse-checkout.adoc
@@ -331,7 +331,7 @@ wasn't transliterated.
 Second, what should bash-completion complete on for set/add commands
 for non-cone users?  If it suggests paths, is it exacerbating the
 problem above?  Also, if it suggests paths, what if the user has a
-file or directory that begins with either a '!' or '#' or has a '*',
+file or directory that begins with either a '!' or '#' or has an '*',
 '\', '?', '[', or ']' in its name?  And if it suggests paths, will
 it complete "/pro" to "/proc" (in the root filesystem) rather than to
 "/progress.txt" in the current directory?  (Note that users are
diff --git a/Documentation/gitprotocol-v2.adoc b/Documentation/gitprotocol-v2.adoc
index 2beb70595f..16d60597f9 100644
--- a/Documentation/gitprotocol-v2.adoc
+++ b/Documentation/gitprotocol-v2.adoc
@@ -772,7 +772,7 @@ be implemented in the future include:
  * Advertise that one or more bundle files are the same (to e.g. have
    clients round-robin or otherwise choose one of N possible files).
 
- * A "oid=<OID>" shortcut and "prerequisite=<OID>" shortcut. For
+ * An "oid=<OID>" shortcut and "prerequisite=<OID>" shortcut. For
    expressing the common case of a bundle with one tip and no
    prerequisites, or one tip and one prerequisite.
 +
diff --git a/Documentation/pull-fetch-param.adoc b/Documentation/pull-fetch-param.adoc
index d903dc8900..401e6edcad 100644
--- a/Documentation/pull-fetch-param.adoc
+++ b/Documentation/pull-fetch-param.adoc
@@ -32,7 +32,7 @@ typically a ref, or a glob pattern with a single `*` that is used
 to match a set of refs, but it can also be a fully spelled hex object
 name.
 +
-A _<refspec>_ may contain a `*` in its _<src>_ to indicate a simple pattern
+A _<refspec>_ may contain an `*` in its _<src>_ to indicate a simple pattern
 match. Such a refspec functions like a glob that matches any ref with the
 pattern. A pattern _<refspec>_ must have one and only one `*` in both the _<src>_ and
 _<dst>_. It will map refs to the destination by replacing the `*` with the
diff --git a/Documentation/rev-list-options.adoc b/Documentation/rev-list-options.adoc
index fd831f0ec6..c856576f5b 100644
--- a/Documentation/rev-list-options.adoc
+++ b/Documentation/rev-list-options.adoc
@@ -1139,7 +1139,7 @@ e.g. ``2 hours ago''. The `-local` option has no effect for
 
 `--date=local` is an alias for `--date=default-local`.
 
-`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format.
+`--date=iso` (or `--date=iso8601`) shows timestamps in an ISO 8601-like format.
 The differences to the strict ISO 8601 format are:
 
 	- a space instead of the `T` date/time delimiter
-- 
2.53.0

Re: [PATCH] Documentation: a/an grammar fixes

[Junio C Hamano]

Ville Skyttä <ville.skytta@iki.fi> writes:

> This takes the stance that `*` is an asterisk rather than a star.
>
> Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
> ---

As long as the changes do not contain an incorrect rewrite, it is OK
even if the patch is not exhausitive.  I went though the changes and
did not spot anything questionable.

But I think I can see a few more of the same kind.  I didn't try to
bee exhaustive, either, though.

 Documentation/config/gpg.adoc | 6 +++---
 Documentation/git-push.adoc   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git i/Documentation/config/gpg.adoc w/Documentation/config/gpg.adoc
index 240e46c050..d4b8c1e570 100644
--- i/Documentation/config/gpg.adoc
+++ w/Documentation/config/gpg.adoc
@@ -38,7 +38,7 @@ gpg.minTrustLevel::
 * `ultimate`
 
 gpg.ssh.defaultKeyCommand::
-	This command will be run when user.signingkey is not set and a ssh
+	This command will be run when user.signingkey is not set and an ssh
 	signature is requested. On successful exit a valid ssh public key
 	prefixed with `key::` is expected in the first line of its output.
 	This allows for a script doing a dynamic lookup of the correct public
@@ -75,11 +75,11 @@ valid-before options. Git will mark signatures as valid if the signing key was
 valid at the time of the signature's creation. This allows users to change a
 signing key without invalidating all previously made signatures.
 +
-Using a SSH CA key with the cert-authority option
+Using an SSH CA key with the cert-authority option
 (see ssh-keygen(1) "CERTIFICATES") is also valid.
 
 gpg.ssh.revocationFile::
-	Either a SSH KRL or a list of revoked public keys (without the principal prefix).
+	Either an SSH KRL or a list of revoked public keys (without the principal prefix).
 	See ssh-keygen(1) for details.
 	If a public key is found in this file then it will always be treated
 	as having trust level "never" and signatures will show as invalid.
diff --git i/Documentation/git-push.adoc w/Documentation/git-push.adoc
index aa221c3909..d05e6020a5 100644
--- i/Documentation/git-push.adoc
+++ w/Documentation/git-push.adoc
@@ -105,7 +105,7 @@ as well as various other special refspec forms:
     directs Git to push "matching" branches: for every branch that exists on
     the local side, the remote side is updated if a branch of the same name
     already exists on the remote side.
- *  _<src>_ may contain a `*` to indicate a simple pattern match.
+ *  _<src>_ may contain an `*` to indicate a simple pattern match.
     This works like a glob that matches any ref matching the pattern.
     There must be only one `*` in both the `<src>` and `<dst>`.
     It will map refs to the destination by replacing the * with the