doc: typo: s/can not/cannot/ and s/is does/does/

"Can not" suggests one has the option to not do something, whereas
"cannot" more strongly suggests something is disallowed or impossible.

Noticed "can not", mistakenly used instead of "cannot" in git help
glossary, then ran git grep 'can not' and found many other instances.
Only files in the Documentation folder were modified.

'Can not' also occurs in some source code comments and some test
assertion messages, and there is an error message and translation "can
not move directory into itself" which I may fix and submit separately
from the documentation change.

Also noticed and fixed "is does" in git help fetch, but there are no
other occurrences of that typo according to git grep.

Signed-off-by: Mark Rushakoff <mark.rushakoff@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config/transfer.txt b/Documentation/config/transfer.txt
index 4a5dfe2fc1670346485838522ad42a6cc22fabc8..f5b6245270e0e8ddd029eb1f520b3e27210792f4 100644 (file)
--- a/Documentation/config/transfer.txt
+++ b/Documentation/config/transfer.txt
@@ -17,7 +17,7 @@ linkgit:git-receive-pack[1]. On the fetch side, malformed objects will
 instead be left unreferenced in the repository.
 +
 Due to the non-quarantine nature of the `fetch.fsckObjects`
 instead be left unreferenced in the repository.
 +
 Due to the non-quarantine nature of the `fetch.fsckObjects`

-implementation it can not be relied upon to leave the object store
+implementation it cannot be relied upon to leave the object store

 clean like `receive.fsckObjects` can.
 +
 As objects are unpacked they're written to the object store, so there
 clean like `receive.fsckObjects` can.
 +
 As objects are unpacked they're written to the object store, so there

diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index f98b7c6ed7c0fe4df8a0e3211eaa53ea7c95d5d9..79e22b1f3a131ea5301a1c11fb558ec16e6c16e6 100644 (file)
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -232,7 +232,7 @@ write so it might not be enough to grant the users using
 'git-cvsserver' write access to the database file without granting
 them write access to the directory, too.
 
 'git-cvsserver' write access to the database file without granting
 them write access to the directory, too.
 

-The database can not be reliably regenerated in a
+The database cannot be reliably regenerated in a

 consistent form after the branch it is tracking has changed.
 Example: For merged branches, 'git-cvsserver' only tracks
 one branch of development, and after a 'git merge' an
 consistent form after the branch it is tracking has changed.
 Example: For merged branches, 'git-cvsserver' only tracks
 one branch of development, and after a 'git merge' an

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 266d63cf111c8a73420c5fa945543384e9825b55..5b1909fdf4ffcf00d52997eb1a1c2b42385689a7 100644 (file)
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -262,7 +262,7 @@ This updates (or creates, as necessary) branches `pu` and `tmp` in
 the local repository by fetching from the branches (respectively)
 `pu` and `maint` from the remote repository.
 +
 the local repository by fetching from the branches (respectively)
 `pu` and `maint` from the remote repository.
 +

-The `pu` branch will be updated even if it is does not fast-forward,
+The `pu` branch will be updated even if it does not fast-forward,

 because it is prefixed with a plus sign; `tmp` will not be.
 
 * Peek at a remote's branch, without configuring the remote in your local
 because it is prefixed with a plus sign; `tmp` will not be.
 
 * Peek at a remote's branch, without configuring the remote in your local


@@ -285,7 +285,7 @@ BUGS
 ----
 Using --recurse-submodules can only fetch new commits in already checked
 out submodules right now. When e.g. upstream added a new submodule in the
 ----
 Using --recurse-submodules can only fetch new commits in already checked
 out submodules right now. When e.g. upstream added a new submodule in the

-just fetched commits of the superproject the submodule itself can not be
+just fetched commits of the superproject the submodule itself cannot be

 fetched, making it impossible to check out that submodule later without
 having to do a fetch again. This is expected to be fixed in a future Git
 version.
 fetched, making it impossible to check out that submodule later without
 having to do a fetch again. This is expected to be fixed in a future Git
 version.

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index a5e9501a0aa6503eaab62190253afa750dd76eef..dfb901f8b8358ea309e6403079e3c87fb82fee6f 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -249,7 +249,7 @@ BUGS
 ----
 Using --recurse-submodules can only fetch new commits in already checked
 out submodules right now. When e.g. upstream added a new submodule in the
 ----
 Using --recurse-submodules can only fetch new commits in already checked
 out submodules right now. When e.g. upstream added a new submodule in the

-just fetched commits of the superproject the submodule itself can not be
+just fetched commits of the superproject the submodule itself cannot be

 fetched, making it impossible to check out that submodule later without
 having to do a fetch again. This is expected to be fixed in a future Git
 version.
 fetched, making it impossible to check out that submodule later without
 having to do a fetch again. This is expected to be fixed in a future Git
 version.

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 8d38ae6010866a157dfdb7d52b58605d1cd2f3b6..090c888335d3292331d012a5e9074f970035d83e 100644 (file)
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -255,7 +255,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 [[def_object]]object::
        The unit of storage in Git. It is uniquely identified by the
        <<def_SHA1,SHA-1>> of its contents. Consequently, an
 [[def_object]]object::
        The unit of storage in Git. It is uniquely identified by the
        <<def_SHA1,SHA-1>> of its contents. Consequently, an

-       object can not be changed.
+       object cannot be changed.

 
 [[def_object_database]]object database::
        Stores a set of "objects", and an individual <<def_object,object>> is
 
 [[def_object_database]]object database::
        Stores a set of "objects", and an individual <<def_object,object>> is

diff --git a/Documentation/technical/api-ref-iteration.txt b/Documentation/technical/api-ref-iteration.txt
index 46c3d5c3550a1ba7c83b6937fe68538c3c12074e..ad9d019ff9b4602a72f9542dd15b17a324f95758 100644 (file)
--- a/Documentation/technical/api-ref-iteration.txt
+++ b/Documentation/technical/api-ref-iteration.txt
@@ -54,7 +54,7 @@ this:
 do not do this you will get an error for each ref that it does not point
 to a valid object.
 
 do not do this you will get an error for each ref that it does not point
 to a valid object.
 

-Note: As a side-effect of this you can not safely assume that all
+Note: As a side-effect of this you cannot safely assume that all

 objects you lookup are available in superproject. All submodule objects
 will be available the same way as the superprojects objects.
 
 objects you lookup are available in superproject. All submodule objects
 will be available the same way as the superprojects objects.