# [PATCH] doc: fixing two trivial typos in Documentation/ 3 messages from 2020-11-05 to 2020-11-05. Participants: Marlon Rac Cambasis, Junio C Hamano. Thread: https://gitlist.dev/t/54576 ## Marlon Rac Cambasis, 2020-11-05 09:11 Subject: [PATCH] doc: fixing two trivial typos in Documentation/ Message-ID: <20201105091136.GA28535@marlonpc-debian> URL: https://gitlist.dev/e/20201105091136.GA28535%40marlonpc-debian ``` Changed "speficied" to "specified" in config.txt and "occured" to "occurred" in githooks.txt. This should help any readers of these files. Signed-off-by: Marlon Rac Cambasis --- Documentation/config.txt | 2 +- Documentation/githooks.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 025ca4df11..f292c2689e 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/githooks.txt b/Documentation/githooks.txt index 4e097dc4e9..ffccfc7760 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. -- 2.20.1 ``` ## Junio C Hamano, 2020-11-05 20:41 Subject: Re: [PATCH] doc: fixing two trivial typos in Documentation/ Message-ID: URL: https://gitlist.dev/e/xmqq4km3k03i.fsf%40gitster.c.googlers.com In-Reply-To: <20201105091136.GA28535@marlonpc-debian> ``` Marlon Rac Cambasis 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. > > Signed-off-by: Marlon Rac Cambasis > --- > Documentation/config.txt | 2 +- > Documentation/githooks.txt | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Documentation/config.txt b/Documentation/config.txt > index 025ca4df11..f292c2689e 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/githooks.txt b/Documentation/githooks.txt > index 4e097dc4e9..ffccfc7760 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. ``` ## Junio C Hamano, 2020-11-05 20:48 Subject: Re: [PATCH] doc: fixing two trivial typos in Documentation/ Message-ID: URL: https://gitlist.dev/e/xmqqr1p7il81.fsf%40gitster.c.googlers.com In-Reply-To: ``` Junio C Hamano writes: > Marlon Rac Cambasis 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 Subject: [PATCH] doc: fixing two trivial typos in Documentation/ Fix misspelled "specified" and "occurred" in documentation and comments. Signed-off-by: Marlon Rac Cambasis Signed-off-by: Junio C Hamano --- Documentation/config.txt | 2 +- Documentation/git-p4.txt | 2 +- Documentation/githooks.txt | 2 +- git-p4.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 ```