Skip to contentSkip to conversation

doc: fixing two trivial typos in Documentation/

PATCH In review Marlon Rac Cambasis 2 participants 3 messages Nov 5, 2020 Documentation

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 doc: fixing two trivial typos in Documentation/

Changed "speficied" to "specified" in config.txt and "occured" to "occurred" in githooks.txt. This should help any readers of these files.

---
 Documentation/config.txt   | 2 +-
 Documentation/githooks.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Documentation/config.txt +1 -1
index 025ca4df11..f292c2689e 100644
@@ -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
Documentation/githooks.txt +1 -1
index 4e097dc4e9..ffccfc7760 100644
@@ -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.
 
Signature · 1 line
2.20.1
#1 lore raw
Quoted 3 lines · Marlon Rac Cambasis

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.

Quoted 32 lines
---
 Documentation/config.txt   | 2 +-
 Documentation/githooks.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Documentation/config.txt +1 -1
index 025ca4df11..f292c2689e 100644
@@ -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
Documentation/githooks.txt +1 -1
index 4e097dc4e9..ffccfc7760 100644
@@ -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 lore raw
Quoted 7 lines · Junio C Hamano
Quoted 3 lines · Marlon Rac Cambasis

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 <[email protected]>
Subject: [PATCH] doc: fixing two trivial typos in Documentation/

Fix misspelled "specified" and "occurred" in documentation and comments.

---
 Documentation/config.txt   | 2 +-
 Documentation/git-p4.txt   | 2 +-
 Documentation/githooks.txt | 2 +-
 git-p4.py                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
Documentation/config.txt +1 -1
index bf706b950e..a3cdeaaa14 100644
@@ -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
Documentation/git-p4.txt +1 -1
index dab9609013..ec233ac0c1 100644
@@ -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.
 
Documentation/githooks.txt +1 -1
index 6e461ace6e..2bcf9b539f 100644
@@ -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.
 
git-p4.py +1 -1
index 4433ca53de..8af92a5a96 100755
@@ -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.
     """
 
Signature · 1 line
2.29.2-302-gaa7bd0ae1c