From c30d4f1b84458f61a3d02d396aae8409bf4a9be0 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Thu, 5 Apr 2018 10:20:26 -0700 Subject: Documentation: fix several one-character-off spelling errors Signed-off-by: Elijah Newren Reviewed-by: Stefan Beller Signed-off-by: Junio C Hamano diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 743af97..ee4046e 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -550,7 +550,7 @@ the normal order. -- + Patterns have the same syntax and semantics as patterns used for -fnmantch(3) without the FNM_PATHNAME flag, except a pathname also +fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern "`foo*bar`" matches "`fooasdfbar`" and "`foo/bar/baz/asdf`" but not "`foobarx`". @@ -574,7 +574,7 @@ endif::git-format-patch[] Treat all files as text. --ignore-cr-at-eol:: - Ignore carrige-return at the end of line when doing a comparison. + Ignore carriage-return at the end of line when doing a comparison. --ignore-space-at-eol:: Ignore changes in whitespace at EOL. diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt index f7ebe36..c975884 100644 --- a/Documentation/git-fetch-pack.txt +++ b/Documentation/git-fetch-pack.txt @@ -88,7 +88,7 @@ be in a separate packet, and the list must end with a flush packet. infinite even if there is an ancestor-chain that long. --shallow-since=:: - Deepen or shorten the history of a shallow'repository to + Deepen or shorten the history of a shallow repository to include all reachable commits after . --shallow-exclude=:: diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index dffa14a..085d177 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -121,7 +121,7 @@ refname:: stripping with positive , or it becomes the full refname if stripping with negative . Neither is an error. + -`strip` can be used as a synomym to `lstrip`. +`strip` can be used as a synonym to `lstrip`. objecttype:: The type of the object (`blob`, `tree`, `commit`, `tag`). diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 8060ea3..861ac13 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -250,7 +250,7 @@ must be used for each option. --batch-size=:: Some email servers (e.g. smtp.163.com) limit the number emails to be - sent per session (connection) and this will lead to a faliure when + sent per session (connection) and this will lead to a failure when sending many messages. With this option, send-email will disconnect after sending $ messages and wait for a few seconds (see --relogin-delay) and reconnect, to work around such a limit. You may want to diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index f9c91c7..84b140d 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -113,7 +113,7 @@ The possible options are: - 'matching' - Shows ignored files and directories matching an ignore pattern. + -When 'matching' mode is specified, paths that explicity match an +When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are diff --git a/Documentation/technical/api-directory-listing.txt b/Documentation/technical/api-directory-listing.txt index 7fae00f..4f44ca2 100644 --- a/Documentation/technical/api-directory-listing.txt +++ b/Documentation/technical/api-directory-listing.txt @@ -53,7 +53,7 @@ The notable options are: not be returned even if all of its contents are ignored. In this case, the contents are returned as individual entries. + -If this is set, files and directories that explicity match an ignore +If this is set, files and directories that explicitly match an ignore pattern are reported. Implicity ignored directories (directories that do not match an ignore pattern, but whose contents are all ignored) are not reported, instead all of the contents are reported. -- cgit v0.10.2-6-g49f6 From 8523b1e355900e929ef1d362e6e4b4cffbbd9ffc Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Thu, 5 Apr 2018 10:20:27 -0700 Subject: Documentation: normalize spelling of 'normalised' This could be a localization issue, but we had about four dozen "normalize"s (or variants, e.g. normalized, renormalize, etc.), and only one "normalised" (no other variants), so normalize normalised into normalized. Signed-off-by: Elijah Newren Reviewed-by: Stefan Beller Signed-off-by: Junio C Hamano diff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.txt index c3616e7..27fe2b3 100644 --- a/Documentation/git-mktree.txt +++ b/Documentation/git-mktree.txt @@ -14,7 +14,7 @@ SYNOPSIS DESCRIPTION ----------- Reads standard input in non-recursive `ls-tree` output format, and creates -a tree object. The order of the tree entries is normalised by mktree so +a tree object. The order of the tree entries is normalized by mktree so pre-sorting the input is not required. The object name of the tree object built is written to the standard output. -- cgit v0.10.2-6-g49f6