summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorMarlon Rac Cambasis <marlonrc08@gmail.com>2020-11-05 20:48:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-11-05 20:52:50 (GMT)
commitb7e20b43733b81474b3b50a63cabe647538b010f (patch)
tree37e7e2f23c7b09e0ee8ce081feb95e4daa778c3f /Documentation
parent898f80736c75878acc02dc55672317fcc0e0a5a6 (diff)
downloadgit-b7e20b43733b81474b3b50a63cabe647538b010f.zip
git-b7e20b43733b81474b3b50a63cabe647538b010f.tar.gz
git-b7e20b43733b81474b3b50a63cabe647538b010f.tar.bz2
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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt2
-rw-r--r--Documentation/git-p4.txt2
-rw-r--r--Documentation/githooks.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index bf706b9..a3cdeaa 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 dab9609..ec233ac 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 6e461ac..2bcf9b5 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.