Re: [PATCH] doc: fixing two trivial typos in Documentation/
Junio C Hamano <gitster@pobox.com> writes:
Show 7 quoted lines
> Marlon Rac Cambasis <marlonrc08@gmail.com> writes:
>
>> Changed "speficied" to "specified" in config.txt and "occured" to
>> "occurred" in githooks.txt. This should help any readers of these
>> files.
>
> Thanks. Will apply.
I was too fast to respond.
$ git grep -e speficied -e occured
gives more hits than these two. We should cover all of them.
--- >8 ------ >8 --- cut here --- >8 ------ >8 ---
From: Marlon Rac Cambasis <marlonrc08@gmail.com>
Subject: [PATCH] doc: fixing two trivial typos in Documentation/
Fix misspelled "specified" and "occurred" in documentation and comments.
Signed-off-by: Marlon Rac Cambasis <marlonrc08@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/config.txt | 2 +-
Documentation/git-p4.txt | 2 +-
Documentation/githooks.txt | 2 +-
git-p4.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
Show changes to 4 files +4 −4
Documentation/config.txt, Documentation/git-p4.txt, Documentation/githooks.txt, git-p4.py
diff --git a/Documentation/config.txt b/Documentation/config.txt
index bf706b950e..a3cdeaaa14 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -265,7 +265,7 @@ color::
The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
`blue`, `magenta`, `cyan` and `white`. The first color given is the
foreground; the second is the background. All the basic colors except
-`normal` have a bright variant that can be speficied by prefixing the
+`normal` have a bright variant that can be specified by prefixing the
color with `bright`, like `brightred`.
+
Colors may also be given as numbers between 0 and 255; these use ANSI
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index dab9609013..ec233ac0c1 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -417,7 +417,7 @@ p4-post-changelist
~~~~~~~~~~~~~~~~~~
The `p4-post-changelist` hook is invoked after the submit has
-successfully occured in P4. It takes no parameters and is meant
+successfully occurred in P4. It takes no parameters and is meant
primarily for notification and cannot affect the outcome of the
git p4 submit action.
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 6e461ace6e..2bcf9b539f 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -655,7 +655,7 @@ p4-post-changelist
This hook is invoked by `git-p4 submit`.
The `p4-post-changelist` hook is invoked after the submit has
-successfully occured in P4. It takes no parameters and is meant
+successfully occurred in P4. It takes no parameters and is meant
primarily for notification and cannot affect the outcome of the
git p4 submit action.
diff --git a/git-p4.py b/git-p4.py
index 4433ca53de..8af92a5a96 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1668,7 +1668,7 @@ def __init__(self):
Submit after inspect the message file.
The `p4-post-changelist` hook is invoked after the submit has successfully
- occured in P4. It takes no parameters and is meant primarily for notification
+ occurred in P4. It takes no parameters and is meant primarily for notification
and cannot affect the outcome of the git p4 submit action.
"""
--
2.29.2-302-gaa7bd0ae1c
