From: Horst H. von Brand Date: Sat, 3 Jun 2006 20:27:26 +0000 (-0400) Subject: Documentation: Spelling fixes X-Git-Tag: v1.4.0-rc1~15 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=abda1ef590d94a5e15e7ce3b685b5c092a790cfa;p=git.git Documentation: Spelling fixes Signed-off-by: Horst H. von Brand Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index d1a4bec0d..cd56afd02 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2,7 +2,7 @@ CONFIGURATION FILE ------------------ The git configuration file contains a number of variables that affect -the git commands behaviour. They can be used by both the git plumbing +the git commands behavior. They can be used by both the git plumbing and the porcelains. The variables are divided to sections, where in the fully qualified variable name the variable itself is the last dot-separated segment and the section name is everything before the last @@ -53,7 +53,7 @@ core.gitProxy:: may be set multiple times and is matched in the given order; the first match wins. - Can be overriden by the 'GIT_PROXY_COMMAND' environment variable + Can be overridden by the 'GIT_PROXY_COMMAND' environment variable (which always applies universally, without the special "for" handling). @@ -115,12 +115,12 @@ http.sslCert:: http.sslKey:: File containing the SSL private key when fetching or pushing - over HTTPS. Can be overriden by the 'GIT_SSL_KEY' environment + over HTTPS. Can be overridden by the 'GIT_SSL_KEY' environment variable. http.sslCAInfo:: File containing the certificates to verify the peer with when - fetching or pushing over HTTPS. Can be overriden by the + fetching or pushing over HTTPS. Can be overridden by the 'GIT_SSL_CAINFO' environment variable. http.sslCAPath:: @@ -129,13 +129,13 @@ http.sslCAPath:: by the 'GIT_SSL_CAPATH' environment variable. http.maxRequests:: - How many HTTP requests to launch in parallel. Can be overriden + How many HTTP requests to launch in parallel. Can be overridden by the 'GIT_HTTP_MAX_REQUESTS' environment variable. Default is 5. http.lowSpeedLimit, http.lowSpeedTime:: If the HTTP transfer speed is less than 'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds, the transfer is aborted. - Can be overriden by the 'GIT_HTTP_LOW_SPEED_LIMIT' and + Can be overridden by the 'GIT_HTTP_LOW_SPEED_LIMIT' and 'GIT_HTTP_LOW_SPEED_TIME' environment variables. i18n.commitEncoding:: @@ -166,12 +166,12 @@ showbranch.default:: user.email:: Your email address to be recorded in any newly created commits. - Can be overriden by the 'GIT_AUTHOR_EMAIL' and 'GIT_COMMITTER_EMAIL' + Can be overridden by the 'GIT_AUTHOR_EMAIL' and 'GIT_COMMITTER_EMAIL' environment variables. See gitlink:git-commit-tree[1]. user.name:: Your full name to be recorded in any newly created commits. - Can be overriden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME' + Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME' environment variables. See gitlink:git-commit-tree[1]. whatchanged.difftree:: diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt index 5a831adf4..1185897f7 100644 --- a/Documentation/core-tutorial.txt +++ b/Documentation/core-tutorial.txt @@ -184,7 +184,7 @@ $ git-cat-file -t 557db03de997c86a4a028e1ebd3a1ceb225be238 ---------------- where the `-t` tells `git-cat-file` to tell you what the "type" of the -object is. git will tell you that you have a "blob" object (ie just a +object is. git will tell you that you have a "blob" object (i.e., just a regular file), and you can see the contents with ---------------- @@ -619,7 +619,7 @@ $ git tag -s ---------------- which will sign the current `HEAD` (but you can also give it another -argument that specifies the thing to tag, ie you could have tagged the +argument that specifies the thing to tag, i.e., you could have tagged the current `mybranch` point by using `git tag mybranch`). You normally only do signed tags for major releases or things @@ -1097,7 +1097,7 @@ commit object by downloading from `repo.git/objects/xx/xxx\...` using the object name of that commit object. Then it reads the commit object to find out its parent commits and the associate tree object; it repeats this process until it gets all the -necessary objects. Because of this behaviour, they are +necessary objects. Because of this behavior, they are sometimes also called 'commit walkers'. + The 'commit walkers' are sometimes also called 'dumb diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt index fa94efde8..826d0897e 100644 --- a/Documentation/cvs-migration.txt +++ b/Documentation/cvs-migration.txt @@ -1,7 +1,7 @@ git for CVS users ================= -So you're a CVS user. That's ok, it's a treatable condition. The job of +So you're a CVS user. That's OK, it's a treatable condition. The job of this document is to put you on the road to recovery, by helping you convert an existing cvs repository to git, and by showing you how to use a git repository in a cvs-like fashion. @@ -159,7 +159,7 @@ other than `master`. [NOTE] ============ -Because of this behaviour, if the shared repository and the developer's +Because of this behavior, if the shared repository and the developer's repository both have branches named `origin`, then a push like the above attempts to update the `origin` branch in the shared repository from the developer's `origin` branch. The results may be unexpected, so it's diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index e93ea1f26..9cc7c74de 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -113,7 +113,7 @@ OPTIONS When `git-apply` is used for statistics and not applying a patch, it defaults to `nowarn`. You can use different `