Skip to content

Commit 4140830

Browse files
committed
Merge branch 'js/typofix'
* js/typofix: Documentation: clean up various typos in technical docs Documentation: clean up a few misspelled word typos
2 parents 17df9d3 + bbb0c35 commit 4140830

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

Documentation/MyFirstContribution.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1160,7 +1160,7 @@ all named like `v2-000n-my-commit-subject.patch`. `-v2` will also format
11601160
your patches by prefixing them with "[PATCH v2]" instead of "[PATCH]",
11611161
and your range-diff will be prefaced with "Range-diff against v1".
11621162

1163-
Afer you run this command, `format-patch` will output the patches to the `psuh/`
1163+
After you run this command, `format-patch` will output the patches to the `psuh/`
11641164
directory, alongside the v1 patches. Using a single directory makes it easy to
11651165
refer to the old v1 patches while proofreading the v2 patches, but you will need
11661166
to be careful to send out only the v2 patches. We will use a pattern like

Documentation/MyFirstObjectWalk.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ the arguments to `traverse_commit_list()`.
534534
- `void *show_data`: A context buffer which is passed in turn to `show_commit`
535535
and `show_object`.
536536

537-
In addition, `traverse_commit_list_filtered()` has an additional paramter:
537+
In addition, `traverse_commit_list_filtered()` has an additional parameter:
538538

539539
- `struct oidset *omitted`: A linked-list of object IDs which the provided
540540
filter caused to be omitted.

Documentation/git.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ Repository, command and file interfaces
344344

345345
This documentation discusses repository and command interfaces which
346346
users are expected to interact with directly. See `--user-formats` in
347-
linkgit:git-help[1] for more details on the critera.
347+
linkgit:git-help[1] for more details on the criteria.
348348

349349
include::cmds-userinterfaces.txt[]
350350

Documentation/technical/api-parse-options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Subcommands are special in a couple of ways:
6060

6161
* All arguments following the subcommand are considered to be arguments of
6262
the subcommand, and, conversely, arguments meant for the subcommand may
63-
not preceed the subcommand.
63+
not precede the subcommand.
6464

6565
Therefore, if the options array contains at least one subcommand and
6666
`parse_options()` encounters the first dashless argument, it will either:

Documentation/technical/bundle-uri.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ expect that the process will end when all prerequisite commit OIDs in a
289289
thin bundle are already in the object database.
290290

291291
When using the `creationToken` heuristic, the client can avoid downloading
292-
any bundles if their creation tokenss are not larger than the stored
292+
any bundles if their creation tokens are not larger than the stored
293293
creation token. After fetching new bundles, Git updates this local
294294
creation token.
295295

@@ -318,7 +318,7 @@ Here are a few example error conditions:
318318
Git's other HTTP protocols in terms of handling specific 400-level
319319
errors.
320320

321-
* The server reports any other failure reponse.
321+
* The server reports any other failure response.
322322

323323
* The client receives data that is not parsable as a bundle or bundle list.
324324

@@ -446,7 +446,7 @@ created every hour, and then once a day those "hourly" bundles could be
446446
merged into a "daily" bundle. The daily bundles are merged into the
447447
oldest bundle after 30 days.
448448

449-
It is recommened that this bundle strategy is repeated with the `blob:none`
449+
It is recommended that this bundle strategy is repeated with the `blob:none`
450450
filter if clients of this repository are expecting to use blobless partial
451451
clones. This list of blobless bundles stays in the same list as the full
452452
bundles, but uses the `bundle.<id>.filter` key to separate the two groups.

Documentation/technical/commit-graph.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ Values 1-4 satisfy the requirements of parse_commit_gently().
4040

4141
There are two definitions of generation number:
4242
1. Corrected committer dates (generation number v2)
43-
2. Topological levels (generation nummber v1)
43+
2. Topological levels (generation number v1)
4444

4545
Define "corrected committer date" of a commit recursively as follows:
4646

4747
* A commit with no parents (a root commit) has corrected committer date
4848
equal to its committer date.
4949

5050
* A commit with at least one parent has corrected committer date equal to
51-
the maximum of its commiter date and one more than the largest corrected
51+
the maximum of its committer date and one more than the largest corrected
5252
committer date among its parents.
5353

5454
* As a special case, a root commit with timestamp zero has corrected commit

Documentation/technical/remembering-renames.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ considered to be "irrelevant". See for example the following commits:
407407
no longer relevant", 2021-03-13)
408408

409409
Relevance is always determined by what the _other_ side of history has
410-
done, in terms of modifing a file that our side renamed, or adding a
410+
done, in terms of modifying a file that our side renamed, or adding a
411411
file to a directory which our side renamed. This means that a path
412412
that is "irrelevant" when picking the first commit of a series in a
413413
rebase or cherry-pick, may suddenly become "relevant" when picking the

0 commit comments

Comments
 (0)