{"thread":{"id":"59842","subject":"[PATCH] docs: typofixes","startedAt":"2023-06-07T00:51:29Z","lastAt":"2023-06-07T19:27:56Z","messageCount":6,"participants":["Linus Arver via GitGitGadget","Eric Sunshine","Kristoffer Haugsbakk","Linus Arver"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"478120","messageId":"pull.1542.git.1686099081989.gitgitgadget@gmail.com","threadId":"59842","inReplyTo":null,"subject":"[PATCH] docs: typofixes","fromName":"Linus Arver via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-07T00:51:21Z","receivedAt":"2023-06-07T00:51:29Z","isPatch":true,"sender":{"key":"linus@ucla.edu","avatar":null},"body":"From: Linus Arver <linusa@google.com>\n\nThese were found with an automated CLI tool [1]. Only the\n\"Documentation\" subfolder (and not source code files) was considered\nbecause the docs are user-facing.\n\n[1]: https://crates.io/crates/typos-cli\n\nSigned-off-by: Linus Arver <linusa@google.com>\n---\n    docs: typofixes\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1542%2Flistx%2Ftypofixes-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1542/listx/typofixes-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1542\n\n Documentation/CodingGuidelines                  | 2 +-\n Documentation/config.txt                        | 2 +-\n Documentation/git-cvsserver.txt                 | 2 +-\n Documentation/git-describe.txt                  | 4 ++--\n Documentation/git-format-patch.txt              | 2 +-\n Documentation/git-ls-tree.txt                   | 2 +-\n Documentation/git-mktag.txt                     | 2 +-\n Documentation/git-sparse-checkout.txt           | 2 +-\n Documentation/git-stash.txt                     | 2 +-\n Documentation/gitweb.txt                        | 2 +-\n Documentation/technical/remembering-renames.txt | 2 +-\n Documentation/urls-remotes.txt                  | 2 +-\n 12 files changed, 13 insertions(+), 13 deletions(-)\n\ndiff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines\nindex 003393ed161..1f3290f1736 100644\n--- a/Documentation/CodingGuidelines\n+++ b/Documentation/CodingGuidelines\n@@ -687,7 +687,7 @@ Writing Documentation:\n    Do: [-q | --quiet]\n    Don't: [-q|--quiet]\n \n- Don't use spacing around \"|\" tokens when they're used to seperate the\n+ Don't use spacing around \"|\" tokens when they're used to separate the\n  alternate arguments of an option:\n     Do: --track[=(direct|inherit)]\n     Don't: --track[=(direct | inherit)]\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 0e93aef8626..229b63a454c 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -182,7 +182,7 @@ included, Git breaks the cycle by prohibiting these files from affecting\n the resolution of these conditions (thus, prohibiting them from\n declaring remote URLs).\n +\n-As for the naming of this keyword, it is for forwards compatibiliy with\n+As for the naming of this keyword, it is for forwards compatibility with\n a naming scheme that supports more variable-based include conditions,\n but currently Git only supports the exact keyword described above.\n \ndiff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt\nindex 53f111bc0ac..cf4a5a283ec 100644\n--- a/Documentation/git-cvsserver.txt\n+++ b/Documentation/git-cvsserver.txt\n@@ -118,7 +118,7 @@ for example:\n    myuser:$5$.NqmNH1vwfzGpV8B$znZIcumu1tNLATgV2l6e1/mY8RzhUDHMOaVOeL1cxV3\n ------\n You can use the 'htpasswd' facility that comes with Apache to make these\n-files, but only with the -d option (or -B if your system suports it).\n+files, but only with the -d option (or -B if your system supports it).\n \n Preferably use the system specific utility that manages password hash\n creation in your platform (e.g. mkpasswd in Linux, encrypt in OpenBSD or\ndiff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt\nindex c6a79c2a0f2..08ff715709c 100644\n--- a/Documentation/git-describe.txt\n+++ b/Documentation/git-describe.txt\n@@ -140,7 +140,7 @@ at the end.\n \n The number of additional commits is the number\n of commits which would be displayed by \"git log v1.0.4..parent\".\n-The hash suffix is \"-g\" + an unambigous abbreviation for the tip commit\n+The hash suffix is \"-g\" + an unambiguous abbreviation for the tip commit\n of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The\n length of the abbreviation scales as the repository grows, using the\n approximate number of objects in the repository and a bit of math\n@@ -203,7 +203,7 @@ BUGS\n \n Tree objects as well as tag objects not pointing at commits, cannot be described.\n When describing blobs, the lightweight tags pointing at blobs are ignored,\n-but the blob is still described as <committ-ish>:<path> despite the lightweight\n+but the blob is still described as <commit-ish>:<path> despite the lightweight\n tag being favorable.\n \n GIT\ndiff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt\nindex b1c13fb39a0..caaa71d30a8 100644\n--- a/Documentation/git-format-patch.txt\n+++ b/Documentation/git-format-patch.txt\n@@ -245,7 +245,7 @@ populated with placeholder text.\n \tor \"--reroll-count=4rev2\" are allowed), but the downside of\n \tusing such a reroll-count is that the range-diff/interdiff\n \twith the previous version does not state exactly which\n-\tversion the new interation is compared against.\n+\tversion the new interaction is compared against.\n \n --to=<email>::\n \tAdd a `To:` header to the email headers. This is in addition\ndiff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt\nindex 0240adb8eec..fa9a6b9f2cb 100644\n--- a/Documentation/git-ls-tree.txt\n+++ b/Documentation/git-ls-tree.txt\n@@ -145,7 +145,7 @@ FIELD NAMES\n -----------\n \n Various values from structured fields can be used to interpolate\n-into the resulting output. For each outputing line, the following\n+into the resulting output. For each outputting line, the following\n names can be used:\n \n objectmode::\ndiff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt\nindex 466a6975191..b2a2e80d421 100644\n--- a/Documentation/git-mktag.txt\n+++ b/Documentation/git-mktag.txt\n@@ -33,7 +33,7 @@ from warnings to errors (so e.g. a missing \"tagger\" line is an error).\n \n Extra headers in the object are also an error under mktag, but ignored\n by linkgit:git-fsck[1]. This extra check can be turned off by setting\n-the appropriate `fsck.<msg-id>` varible:\n+the appropriate `fsck.<msg-id>` variable:\n \n     git -c fsck.extraHeaderEntry=ignore mktag <my-tag-with-headers\n \ndiff --git a/Documentation/git-sparse-checkout.txt b/Documentation/git-sparse-checkout.txt\nindex 53dc17aa77a..529a8edd9c1 100644\n--- a/Documentation/git-sparse-checkout.txt\n+++ b/Documentation/git-sparse-checkout.txt\n@@ -286,7 +286,7 @@ patterns in non-cone mode has a number of shortcomings:\n     problem above?  Also, if it suggests paths, what if the user has a\n     file or directory that begins with either a '!' or '#' or has a '*',\n     '\\', '?', '[', or ']' in its name?  And if it suggests paths, will\n-    it complete \"/pro\" to \"/proc\" (in the root filesytem) rather than to\n+    it complete \"/pro\" to \"/proc\" (in the root filesystem) rather than to\n     \"/progress.txt\" in the current directory?  (Note that users are\n     likely to want to start paths with a leading '/' in non-cone mode,\n     for the same reason that .gitignore files often have one.)\ndiff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt\nindex f4bb6114d91..06fb7f1d18c 100644\n--- a/Documentation/git-stash.txt\n+++ b/Documentation/git-stash.txt\n@@ -366,7 +366,7 @@ only the commit ends-up being in the stash and not on the current branch.\n # ... hack hack hack ...\n $ git add --patch foo           # add unrelated changes to the index\n $ git stash push --staged       # save these changes to the stash\n-# ... hack hack hack, finish curent changes ...\n+# ... hack hack hack, finish current changes ...\n $ git commit -m 'Massive'       # commit fully tested changes\n $ git switch fixup-branch       # switch to another branch\n $ git stash pop                 # to finish work on the saved changes\ndiff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt\nindex 7cee9d36899..af6bf3c45ec 100644\n--- a/Documentation/gitweb.txt\n+++ b/Documentation/gitweb.txt\n@@ -503,7 +503,7 @@ repositories, you can configure Apache like this:\n \n The above configuration expects your public repositories to live under\n `/pub/git` and will serve them as `http://git.domain.org/dir-under-pub-git`,\n-both as clonable Git URL and as browseable gitweb interface.  If you then\n+both as clonable Git URL and as browsable gitweb interface.  If you then\n start your linkgit:git-daemon[1] with `--base-path=/pub/git --export-all`\n then you can even use the `git://` URL with exactly the same path.\n \ndiff --git a/Documentation/technical/remembering-renames.txt b/Documentation/technical/remembering-renames.txt\nindex 1e34d913901..73f41761e20 100644\n--- a/Documentation/technical/remembering-renames.txt\n+++ b/Documentation/technical/remembering-renames.txt\n@@ -664,7 +664,7 @@ skip-irrelevant-renames optimization means we sometimes don't detect\n renames for any files within a directory that was renamed, in which\n case we will not have been able to detect any rename for the directory\n itself.  In such a case, we do not know whether the directory was\n-renamed; we want to be careful to avoid cacheing some kind of \"this\n+renamed; we want to be careful to avoid caching some kind of \"this\n directory was not renamed\" statement.  If we did, then a subsequent\n commit being rebased could add a file to the old directory, and the\n user would expect it to end up in the correct directory -- something\ndiff --git a/Documentation/urls-remotes.txt b/Documentation/urls-remotes.txt\nindex e410912fe52..ae8c2db427b 100644\n--- a/Documentation/urls-remotes.txt\n+++ b/Documentation/urls-remotes.txt\n@@ -35,7 +35,7 @@ config file would appear like this:\n The `<pushurl>` is used for pushes only. It is optional and defaults\n to `<URL>`. Pushing to a remote affects all defined pushurls or to all\n defined urls if no pushurls are defined. Fetch, however, will only\n-fetch from the first defined url if muliple urls are defined.\n+fetch from the first defined url if multiple urls are defined.\n \n Named file in `$GIT_DIR/remotes`\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n\nbase-commit: fe86abd7511a9a6862d5706c6fa1d9b57a63ba09\n-- \ngitgitgadget\n"},{"id":"478121","messageId":"CAPig+cRE8=_WW_1_ER6=ObGaFzMdmQmESe5Gsb=dwo4DEx4u=A@mail.gmail.com","threadId":"59842","inReplyTo":"pull.1542.git.1686099081989.gitgitgadget@gmail.com","subject":"Re: [PATCH] docs: typofixes","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2023-06-07T02:36:32Z","receivedAt":"2023-06-07T02:36:48Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Tue, Jun 6, 2023 at 8:56 PM Linus Arver via GitGitGadget\n<gitgitgadget@gmail.com> wrote:\n> These were found with an automated CLI tool [1]. Only the\n> \"Documentation\" subfolder (and not source code files) was considered\n> because the docs are user-facing.\n>\n> [1]: https://crates.io/crates/typos-cli\n>\n> Signed-off-by: Linus Arver <linusa@google.com>\n> ---\n>  Documentation/CodingGuidelines                  | 2 +-\n>  Documentation/config.txt                        | 2 +-\n>  Documentation/git-cvsserver.txt                 | 2 +-\n>  Documentation/git-describe.txt                  | 4 ++--\n>  Documentation/git-format-patch.txt              | 2 +-\n>  Documentation/git-ls-tree.txt                   | 2 +-\n>  Documentation/git-mktag.txt                     | 2 +-\n>  Documentation/git-sparse-checkout.txt           | 2 +-\n>  Documentation/git-stash.txt                     | 2 +-\n>  Documentation/gitweb.txt                        | 2 +-\n>  Documentation/technical/remembering-renames.txt | 2 +-\n>  Documentation/urls-remotes.txt                  | 2 +-\n\nThese changes all look sensible. Thanks.\n"},{"id":"478122","messageId":"5b796f88-949c-4bba-b4a7-19ad61171812@app.fastmail.com","threadId":"59842","inReplyTo":"pull.1542.git.1686099081989.gitgitgadget@gmail.com","subject":"Re: [PATCH] docs: typofixes","fromName":"Kristoffer Haugsbakk","fromEmail":"code@khaugsbakk.name","sentAt":"2023-06-07T09:41:10Z","receivedAt":"2023-06-07T09:42:19Z","isPatch":true,"sender":{"key":"code@khaugsbakk.name","avatar":"https://avatars.githubusercontent.com/u/2229597?v=4"},"body":"Hi\n\nOn Wed, Jun 7, 2023, at 02:51, Linus Arver via GitGitGadget wrote:\n> From: Linus Arver <linusa@google.com>\n>\n> These were found with an automated CLI tool [1]. [1]: https://crates.io/crates/typos-cli\n\nDid you run a command or a script without any manual afterwork? If so,\ndo you know what that command invocation/script was?\n\nThanks\n\n-- \nKristoffer Haugsbakk\n"},{"id":"478148","messageId":"owlyttvjnqqq.fsf@fine.c.googlers.com","threadId":"59842","inReplyTo":"5b796f88-949c-4bba-b4a7-19ad61171812@app.fastmail.com","subject":"Re: [PATCH] docs: typofixes","fromName":"Linus Arver","fromEmail":"linusa@google.com","sentAt":"2023-06-07T17:09:49Z","receivedAt":"2023-06-07T17:09:57Z","isPatch":true,"sender":{"key":"linus@ucla.edu","avatar":null},"body":"\"Kristoffer Haugsbakk\" <code@khaugsbakk.name> writes:\n\n> Hi\n\nHello, nice to meet you.\n\n\n> On Wed, Jun 7, 2023, at 02:51, Linus Arver via GitGitGadget wrote:\n>> From: Linus Arver <linusa@google.com>\n\n>> These were found with an automated CLI tool [1]. [1]:  \n>> https://crates.io/crates/typos-cli\n\n> Did you run a command or a script without any manual afterwork?\n\nI simply ran the tool without any configuration, which just outputs a\nlist of suggested fixes. There were many false positives, but not enough\nto make the manual examination of it too difficult.\n\n> If so,\n> do you know what that command invocation/script was?\n\nFWIW the tool appears to be heavily customizable [1]. I considered\nexploring options to automate this some way (either as a script or maybe\ninto the CI that runs as part of GitGitGadget submissions), but have not\ndone so yet. I am currently more interested in reading the C sources in\nthis project, so any immediate automation effort in this area will\nprobably have to come from someone else on the list.\n\n[1]: https://github.com/crate-ci/typos#false-positives\n"},{"id":"478151","messageId":"owlyr0qnnnql.fsf@fine.c.googlers.com","threadId":"59842","inReplyTo":"CAPig+cRE8=_WW_1_ER6=ObGaFzMdmQmESe5Gsb=dwo4DEx4u=A@mail.gmail.com","subject":"Re: [PATCH] docs: typofixes","fromName":"Linus Arver","fromEmail":"linusa@google.com","sentAt":"2023-06-07T18:14:42Z","receivedAt":"2023-06-07T18:16:07Z","isPatch":true,"sender":{"key":"linus@ucla.edu","avatar":null},"body":"Eric Sunshine <sunshine@sunshineco.com> writes:\n\n> On Tue, Jun 6, 2023 at 8:56 PM Linus Arver via GitGitGadget\n> <gitgitgadget@gmail.com> wrote:\n>> These were found with an automated CLI tool [1]. Only the\n>> \"Documentation\" subfolder (and not source code files) was considered\n>> because the docs are user-facing.\n\n>> [1]: https://crates.io/crates/typos-cli\n\n>> Signed-off-by: Linus Arver <linusa@google.com>\n>> ---\n>>   Documentation/CodingGuidelines                  | 2 +-\n>>   Documentation/config.txt                        | 2 +-\n>>   Documentation/git-cvsserver.txt                 | 2 +-\n>>   Documentation/git-describe.txt                  | 4 ++--\n>>   Documentation/git-format-patch.txt              | 2 +-\n>>   Documentation/git-ls-tree.txt                   | 2 +-\n>>   Documentation/git-mktag.txt                     | 2 +-\n>>   Documentation/git-sparse-checkout.txt           | 2 +-\n>>   Documentation/git-stash.txt                     | 2 +-\n>>   Documentation/gitweb.txt                        | 2 +-\n>>   Documentation/technical/remembering-renames.txt | 2 +-\n>>   Documentation/urls-remotes.txt                  | 2 +-\n\n> These changes all look sensible. Thanks.\n\nThanks for the review --- but on second inspection I messed up the fix\nto git-format-patch.txt. The tool suggested \"interaction\" which I\nfollowed mechanically, but I noticed just now that the real fix should\nhave been \"iteration\". I have a v2 of this ready to got but GitGitGadget\nis delayed due to GitHub experiencing an issue at the moment, so expect\nsome delay before the v2 gets pushed to the list.\n"},{"id":"478152","messageId":"pull.1542.v2.git.1686166007816.gitgitgadget@gmail.com","threadId":"59842","inReplyTo":"pull.1542.git.1686099081989.gitgitgadget@gmail.com","subject":"[PATCH v2] docs: typofixes","fromName":"Linus Arver via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-07T19:26:47Z","receivedAt":"2023-06-07T19:27:56Z","isPatch":true,"sender":{"key":"linus@ucla.edu","avatar":null},"body":"From: Linus Arver <linusa@google.com>\n\nThese were found with an automated CLI tool [1]. Only the\n\"Documentation\" subfolder (and not source code files) was considered\nbecause the docs are user-facing.\n\n[1]: https://crates.io/crates/typos-cli\n\nSigned-off-by: Linus Arver <linusa@google.com>\n---\n    docs: typofixes\n    \n    \n    Changes from v1 to v2\n    =====================\n    \n    The typo fix \"interation\" was wrongly corrected to \"interaction\" (as\n    suggested by the tool). Instead this has been fixed to be \"iteration\" to\n    match the surrounding context.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1542%2Flistx%2Ftypofixes-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1542/listx/typofixes-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/1542\n\nRange-diff vs v1:\n\n 1:  99d9e137f09 ! 1:  037fac6a10e docs: typofixes\n     @@ Documentation/git-format-patch.txt: populated with placeholder text.\n       \tusing such a reroll-count is that the range-diff/interdiff\n       \twith the previous version does not state exactly which\n      -\tversion the new interation is compared against.\n     -+\tversion the new interaction is compared against.\n     ++\tversion the new iteration is compared against.\n       \n       --to=<email>::\n       \tAdd a `To:` header to the email headers. This is in addition\n\n\n Documentation/CodingGuidelines                  | 2 +-\n Documentation/config.txt                        | 2 +-\n Documentation/git-cvsserver.txt                 | 2 +-\n Documentation/git-describe.txt                  | 4 ++--\n Documentation/git-format-patch.txt              | 2 +-\n Documentation/git-ls-tree.txt                   | 2 +-\n Documentation/git-mktag.txt                     | 2 +-\n Documentation/git-sparse-checkout.txt           | 2 +-\n Documentation/git-stash.txt                     | 2 +-\n Documentation/gitweb.txt                        | 2 +-\n Documentation/technical/remembering-renames.txt | 2 +-\n Documentation/urls-remotes.txt                  | 2 +-\n 12 files changed, 13 insertions(+), 13 deletions(-)\n\ndiff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines\nindex 003393ed161..1f3290f1736 100644\n--- a/Documentation/CodingGuidelines\n+++ b/Documentation/CodingGuidelines\n@@ -687,7 +687,7 @@ Writing Documentation:\n    Do: [-q | --quiet]\n    Don't: [-q|--quiet]\n \n- Don't use spacing around \"|\" tokens when they're used to seperate the\n+ Don't use spacing around \"|\" tokens when they're used to separate the\n  alternate arguments of an option:\n     Do: --track[=(direct|inherit)]\n     Don't: --track[=(direct | inherit)]\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 0e93aef8626..229b63a454c 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -182,7 +182,7 @@ included, Git breaks the cycle by prohibiting these files from affecting\n the resolution of these conditions (thus, prohibiting them from\n declaring remote URLs).\n +\n-As for the naming of this keyword, it is for forwards compatibiliy with\n+As for the naming of this keyword, it is for forwards compatibility with\n a naming scheme that supports more variable-based include conditions,\n but currently Git only supports the exact keyword described above.\n \ndiff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt\nindex 53f111bc0ac..cf4a5a283ec 100644\n--- a/Documentation/git-cvsserver.txt\n+++ b/Documentation/git-cvsserver.txt\n@@ -118,7 +118,7 @@ for example:\n    myuser:$5$.NqmNH1vwfzGpV8B$znZIcumu1tNLATgV2l6e1/mY8RzhUDHMOaVOeL1cxV3\n ------\n You can use the 'htpasswd' facility that comes with Apache to make these\n-files, but only with the -d option (or -B if your system suports it).\n+files, but only with the -d option (or -B if your system supports it).\n \n Preferably use the system specific utility that manages password hash\n creation in your platform (e.g. mkpasswd in Linux, encrypt in OpenBSD or\ndiff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt\nindex c6a79c2a0f2..08ff715709c 100644\n--- a/Documentation/git-describe.txt\n+++ b/Documentation/git-describe.txt\n@@ -140,7 +140,7 @@ at the end.\n \n The number of additional commits is the number\n of commits which would be displayed by \"git log v1.0.4..parent\".\n-The hash suffix is \"-g\" + an unambigous abbreviation for the tip commit\n+The hash suffix is \"-g\" + an unambiguous abbreviation for the tip commit\n of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The\n length of the abbreviation scales as the repository grows, using the\n approximate number of objects in the repository and a bit of math\n@@ -203,7 +203,7 @@ BUGS\n \n Tree objects as well as tag objects not pointing at commits, cannot be described.\n When describing blobs, the lightweight tags pointing at blobs are ignored,\n-but the blob is still described as <committ-ish>:<path> despite the lightweight\n+but the blob is still described as <commit-ish>:<path> despite the lightweight\n tag being favorable.\n \n GIT\ndiff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt\nindex b1c13fb39a0..373b46fc0de 100644\n--- a/Documentation/git-format-patch.txt\n+++ b/Documentation/git-format-patch.txt\n@@ -245,7 +245,7 @@ populated with placeholder text.\n \tor \"--reroll-count=4rev2\" are allowed), but the downside of\n \tusing such a reroll-count is that the range-diff/interdiff\n \twith the previous version does not state exactly which\n-\tversion the new interation is compared against.\n+\tversion the new iteration is compared against.\n \n --to=<email>::\n \tAdd a `To:` header to the email headers. This is in addition\ndiff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt\nindex 0240adb8eec..fa9a6b9f2cb 100644\n--- a/Documentation/git-ls-tree.txt\n+++ b/Documentation/git-ls-tree.txt\n@@ -145,7 +145,7 @@ FIELD NAMES\n -----------\n \n Various values from structured fields can be used to interpolate\n-into the resulting output. For each outputing line, the following\n+into the resulting output. For each outputting line, the following\n names can be used:\n \n objectmode::\ndiff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt\nindex 466a6975191..b2a2e80d421 100644\n--- a/Documentation/git-mktag.txt\n+++ b/Documentation/git-mktag.txt\n@@ -33,7 +33,7 @@ from warnings to errors (so e.g. a missing \"tagger\" line is an error).\n \n Extra headers in the object are also an error under mktag, but ignored\n by linkgit:git-fsck[1]. This extra check can be turned off by setting\n-the appropriate `fsck.<msg-id>` varible:\n+the appropriate `fsck.<msg-id>` variable:\n \n     git -c fsck.extraHeaderEntry=ignore mktag <my-tag-with-headers\n \ndiff --git a/Documentation/git-sparse-checkout.txt b/Documentation/git-sparse-checkout.txt\nindex 53dc17aa77a..529a8edd9c1 100644\n--- a/Documentation/git-sparse-checkout.txt\n+++ b/Documentation/git-sparse-checkout.txt\n@@ -286,7 +286,7 @@ patterns in non-cone mode has a number of shortcomings:\n     problem above?  Also, if it suggests paths, what if the user has a\n     file or directory that begins with either a '!' or '#' or has a '*',\n     '\\', '?', '[', or ']' in its name?  And if it suggests paths, will\n-    it complete \"/pro\" to \"/proc\" (in the root filesytem) rather than to\n+    it complete \"/pro\" to \"/proc\" (in the root filesystem) rather than to\n     \"/progress.txt\" in the current directory?  (Note that users are\n     likely to want to start paths with a leading '/' in non-cone mode,\n     for the same reason that .gitignore files often have one.)\ndiff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt\nindex f4bb6114d91..06fb7f1d18c 100644\n--- a/Documentation/git-stash.txt\n+++ b/Documentation/git-stash.txt\n@@ -366,7 +366,7 @@ only the commit ends-up being in the stash and not on the current branch.\n # ... hack hack hack ...\n $ git add --patch foo           # add unrelated changes to the index\n $ git stash push --staged       # save these changes to the stash\n-# ... hack hack hack, finish curent changes ...\n+# ... hack hack hack, finish current changes ...\n $ git commit -m 'Massive'       # commit fully tested changes\n $ git switch fixup-branch       # switch to another branch\n $ git stash pop                 # to finish work on the saved changes\ndiff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt\nindex 7cee9d36899..af6bf3c45ec 100644\n--- a/Documentation/gitweb.txt\n+++ b/Documentation/gitweb.txt\n@@ -503,7 +503,7 @@ repositories, you can configure Apache like this:\n \n The above configuration expects your public repositories to live under\n `/pub/git` and will serve them as `http://git.domain.org/dir-under-pub-git`,\n-both as clonable Git URL and as browseable gitweb interface.  If you then\n+both as clonable Git URL and as browsable gitweb interface.  If you then\n start your linkgit:git-daemon[1] with `--base-path=/pub/git --export-all`\n then you can even use the `git://` URL with exactly the same path.\n \ndiff --git a/Documentation/technical/remembering-renames.txt b/Documentation/technical/remembering-renames.txt\nindex 1e34d913901..73f41761e20 100644\n--- a/Documentation/technical/remembering-renames.txt\n+++ b/Documentation/technical/remembering-renames.txt\n@@ -664,7 +664,7 @@ skip-irrelevant-renames optimization means we sometimes don't detect\n renames for any files within a directory that was renamed, in which\n case we will not have been able to detect any rename for the directory\n itself.  In such a case, we do not know whether the directory was\n-renamed; we want to be careful to avoid cacheing some kind of \"this\n+renamed; we want to be careful to avoid caching some kind of \"this\n directory was not renamed\" statement.  If we did, then a subsequent\n commit being rebased could add a file to the old directory, and the\n user would expect it to end up in the correct directory -- something\ndiff --git a/Documentation/urls-remotes.txt b/Documentation/urls-remotes.txt\nindex e410912fe52..ae8c2db427b 100644\n--- a/Documentation/urls-remotes.txt\n+++ b/Documentation/urls-remotes.txt\n@@ -35,7 +35,7 @@ config file would appear like this:\n The `<pushurl>` is used for pushes only. It is optional and defaults\n to `<URL>`. Pushing to a remote affects all defined pushurls or to all\n defined urls if no pushurls are defined. Fetch, however, will only\n-fetch from the first defined url if muliple urls are defined.\n+fetch from the first defined url if multiple urls are defined.\n \n Named file in `$GIT_DIR/remotes`\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n\nbase-commit: fe86abd7511a9a6862d5706c6fa1d9b57a63ba09\n-- \ngitgitgadget\n"}]}