Skip to content

Commit 8d9e92b

Browse files
committed
Merge branch 'mc/typofix'
Docfix. * mc/typofix: doc: fixing two trivial typos in Documentation/
2 parents ee13beb + b7e20b4 commit 8d9e92b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Documentation/config.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ color::
265265
The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
266266
`blue`, `magenta`, `cyan` and `white`. The first color given is the
267267
foreground; the second is the background. All the basic colors except
268-
`normal` have a bright variant that can be speficied by prefixing the
268+
`normal` have a bright variant that can be specified by prefixing the
269269
color with `bright`, like `brightred`.
270270
+
271271
Colors may also be given as numbers between 0 and 255; these use ANSI

Documentation/git-p4.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ p4-post-changelist
417417
~~~~~~~~~~~~~~~~~~
418418

419419
The `p4-post-changelist` hook is invoked after the submit has
420-
successfully occured in P4. It takes no parameters and is meant
420+
successfully occurred in P4. It takes no parameters and is meant
421421
primarily for notification and cannot affect the outcome of the
422422
git p4 submit action.
423423

Documentation/githooks.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ p4-post-changelist
655655
This hook is invoked by `git-p4 submit`.
656656

657657
The `p4-post-changelist` hook is invoked after the submit has
658-
successfully occured in P4. It takes no parameters and is meant
658+
successfully occurred in P4. It takes no parameters and is meant
659659
primarily for notification and cannot affect the outcome of the
660660
git p4 submit action.
661661

git-p4.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1668,7 +1668,7 @@ def __init__(self):
16681668
Submit after inspect the message file.
16691669
16701670
The `p4-post-changelist` hook is invoked after the submit has successfully
1671-
occured in P4. It takes no parameters and is meant primarily for notification
1671+
occurred in P4. It takes no parameters and is meant primarily for notification
16721672
and cannot affect the outcome of the git p4 submit action.
16731673
"""
16741674

0 commit comments

Comments
 (0)