git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH] doc: fixing two trivial typos in Documentation/
@ 2020-11-05  9:11 Marlon Rac Cambasis
  2020-11-05 20:41 ` Junio C Hamano
  0 siblings, 1 reply; 3+ messages in thread
From: Marlon Rac Cambasis @ 2020-11-05  9:11 UTC (permalink / raw)
  To: git

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 <marlonrc08@gmail.com>
---
 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


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] doc: fixing two trivial typos in Documentation/
  2020-11-05  9:11 [PATCH] doc: fixing two trivial typos in Documentation/ Marlon Rac Cambasis
@ 2020-11-05 20:41 ` Junio C Hamano
  2020-11-05 20:48   ` Junio C Hamano
  0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2020-11-05 20:41 UTC (permalink / raw)
  To: Marlon Rac Cambasis; +Cc: git

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.


>
> Signed-off-by: Marlon Rac Cambasis <marlonrc08@gmail.com>
> ---
>  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.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] doc: fixing two trivial typos in Documentation/
  2020-11-05 20:41 ` Junio C Hamano
@ 2020-11-05 20:48   ` Junio C Hamano
  0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2020-11-05 20:48 UTC (permalink / raw)
  To: Marlon Rac Cambasis; +Cc: git

Junio C Hamano <gitster@pobox.com> writes:

> 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(-)

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


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-11-05 20:48 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-05  9:11 [PATCH] doc: fixing two trivial typos in Documentation/ Marlon Rac Cambasis
2020-11-05 20:41 ` Junio C Hamano
2020-11-05 20:48   ` Junio C Hamano

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.version-control.git
	nntp://ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd.onion/inbox.comp.version-control.git
	nntp://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git