Documentation: Spelling fixes
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <junkio@cox.net>
Horst H. von Brand committed
Jun 3, 2006 at 16:27 UTC
abda1ef590d94a5e15e7ce3b685b5c092a790cfa
28 files changed
+47
-47
Documentation/config.txt
+8
-8
@@ -2,7 +2,7 @@ CONFIGURATION FILE
2
------------------
3
4
The git configuration file contains a number of variables that affect
5
-the git commands behaviour. They can be used by both the git plumbing
5
+the git commands behavior. They can be used by both the git plumbing
6
and the porcelains. The variables are divided to sections, where
7
in the fully qualified variable name the variable itself is the last
8
dot-separated segment and the section name is everything before the last
@@ -53,7 +53,7 @@ core.gitProxy::
53
may be set multiple times and is matched in the given order;
54
the first match wins.
55
56
- Can be overriden by the 'GIT_PROXY_COMMAND' environment variable
56
+ Can be overridden by the 'GIT_PROXY_COMMAND' environment variable
57
(which always applies universally, without the special "for"
58
handling).
59
@@ -115,12 +115,12 @@ http.sslCert::
115
116
http.sslKey::
117
File containing the SSL private key when fetching or pushing
118
- over HTTPS. Can be overriden by the 'GIT_SSL_KEY' environment
118
+ over HTTPS. Can be overridden by the 'GIT_SSL_KEY' environment
119
variable.
120
121
http.sslCAInfo::
122
File containing the certificates to verify the peer with when
123
- fetching or pushing over HTTPS. Can be overriden by the
123
+ fetching or pushing over HTTPS. Can be overridden by the
124
'GIT_SSL_CAINFO' environment variable.
125
126
http.sslCAPath::
@@ -129,13 +129,13 @@ http.sslCAPath::
129
by the 'GIT_SSL_CAPATH' environment variable.
130
131
http.maxRequests::
132
- How many HTTP requests to launch in parallel. Can be overriden
132
+ How many HTTP requests to launch in parallel. Can be overridden
133
by the 'GIT_HTTP_MAX_REQUESTS' environment variable. Default is 5.
134
135
http.lowSpeedLimit, http.lowSpeedTime::
136
If the HTTP transfer speed is less than 'http.lowSpeedLimit'
137
for longer than 'http.lowSpeedTime' seconds, the transfer is aborted.
138
- Can be overriden by the 'GIT_HTTP_LOW_SPEED_LIMIT' and
138
+ Can be overridden by the 'GIT_HTTP_LOW_SPEED_LIMIT' and
139
'GIT_HTTP_LOW_SPEED_TIME' environment variables.
140
141
i18n.commitEncoding::
@@ -166,12 +166,12 @@ showbranch.default::
166
167
user.email::
168
Your email address to be recorded in any newly created commits.
169
- Can be overriden by the 'GIT_AUTHOR_EMAIL' and 'GIT_COMMITTER_EMAIL'
169
+ Can be overridden by the 'GIT_AUTHOR_EMAIL' and 'GIT_COMMITTER_EMAIL'
170
environment variables. See gitlink:git-commit-tree[1].
171
172
user.name::
173
Your full name to be recorded in any newly created commits.
174
- Can be overriden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME'
174
+ Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME'
175
environment variables. See gitlink:git-commit-tree[1].
176
177
whatchanged.difftree::
Documentation/core-tutorial.txt
+3
-3
@@ -184,7 +184,7 @@ $ git-cat-file -t 557db03de997c86a4a028e1ebd3a1ceb225be238
184
----------------
185
186
where the `-t` tells `git-cat-file` to tell you what the "type" of the
187
-object is. git will tell you that you have a "blob" object (ie just a
187
+object is. git will tell you that you have a "blob" object (i.e., just a
188
regular file), and you can see the contents with
189
190
----------------
@@ -619,7 +619,7 @@ $ git tag -s <tagname>
619
----------------
620
621
which will sign the current `HEAD` (but you can also give it another
622
-argument that specifies the thing to tag, ie you could have tagged the
622
+argument that specifies the thing to tag, i.e., you could have tagged the
623
current `mybranch` point by using `git tag <tagname> mybranch`).
624
625
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\...`
1097
using the object name of that commit object. Then it reads the
1098
commit object to find out its parent commits and the associate
1099
tree object; it repeats this process until it gets all the
1100
-necessary objects. Because of this behaviour, they are
1100
+necessary objects. Because of this behavior, they are
1101
sometimes also called 'commit walkers'.
1102
+
1103
The 'commit walkers' are sometimes also called 'dumb
Documentation/cvs-migration.txt
+2
-2
@@ -1,7 +1,7 @@
1
git for CVS users
2
=================
3
4
-So you're a CVS user. That's ok, it's a treatable condition. The job of
4
+So you're a CVS user. That's OK, it's a treatable condition. The job of
5
this document is to put you on the road to recovery, by helping you
6
convert an existing cvs repository to git, and by showing you how to use a
7
git repository in a cvs-like fashion.
@@ -159,7 +159,7 @@ other than `master`.
159
160
[NOTE]
161
============
162
-Because of this behaviour, if the shared repository and the developer's
162
+Because of this behavior, if the shared repository and the developer's
163
repository both have branches named `origin`, then a push like the above
164
attempts to update the `origin` branch in the shared repository from the
165
developer's `origin` branch. The results may be unexpected, so it's
Documentation/git-apply.txt
+1
-1
@@ -113,7 +113,7 @@ OPTIONS
113
When `git-apply` is used for statistics and not applying a
114
patch, it defaults to `nowarn`.
115
You can use different `<option>` to control this
116
- behaviour:
116
+ behavior:
117
+
118
* `nowarn` turns off the trailing whitespace warning.
119
* `warn` outputs warnings for a few such errors, but applies the
Documentation/git-blame.txt
+1
-1
@@ -16,7 +16,7 @@ which introduced the line. Start annotation from the given revision.
16
17
OPTIONS
18
-------
19
--c, --compability::
19
+-c, --compatibility::
20
Use the same output mode as git-annotate (Default: off).
21
22
-l, --long::
Documentation/git-commit.txt
+1
-1
@@ -98,7 +98,7 @@ but can be used to amend a merge commit.
98
Instead of committing only the files specified on the
99
command line, update them in the index file and then
100
commit the whole index. This is the traditional
101
- behaviour.
101
+ behavior.
102
103
-o|--only::
104
Commit only the files specified on the command line.
Documentation/git-cvsserver.txt
+1
-1
@@ -94,7 +94,7 @@ To get a checkout with the Eclipse CVS client:
94
4. Pick 'HEAD' when it asks what branch/tag to check out. Untick the
95
"launch commit wizard" to avoid committing the .project file.
96
97
-Protocol notes: If you are using anonymous acces via pserver, just select that.
97
+Protocol notes: If you are using anonymous access via pserver, just select that.
98
Those using SSH access should choose the 'ext' protocol, and configure 'ext'
99
access on the Preferences->Team->CVS->ExtConnection pane. Set CVS_SERVER to
100
'git-cvsserver'. Not that password support is not good when using 'ext',
Documentation/git-daemon.txt
+2
-2
@@ -20,7 +20,7 @@ aka 9418. It waits for a connection, and will just execute "git-upload-pack"
20
when it gets one.
21
22
It's careful in that there's a magic request-line that gives the command and
23
-what directory to upload, and it verifies that the directory is ok.
23
+what directory to upload, and it verifies that the directory is OK.
24
25
It verifies that the directory has the magic file "git-daemon-export-ok", and
26
it will refuse to export any git directory that hasn't explicitly been marked
@@ -28,7 +28,7 @@ for export this way (unless the '--export-all' parameter is specified). If you
28
pass some directory paths as 'git-daemon' arguments, you can further restrict
29
the offers to a whitelist comprising of those.
30
31
-This is ideally suited for read-only updates, ie pulling from git repositories.
31
+This is ideally suited for read-only updates, i.e., pulling from git repositories.
32
33
OPTIONS
34
-------
Documentation/git-diff-index.txt
+1
-1
@@ -101,7 +101,7 @@ have not actually done a "git-update-index" on it yet - there is no
101
torvalds@ppc970:~/v2.6/linux> git-diff-index HEAD
102
*100644->100664 blob 7476bb......->000000...... kernel/sched.c
103
104
-ie it shows that the tree has changed, and that `kernel/sched.c` has is
104
+i.e., it shows that the tree has changed, and that `kernel/sched.c` has is
105
not up-to-date and may contain new stuff. The all-zero sha1 means that to
106
get the real diff, you need to look at the object in the working directory
107
directly rather than do an object-to-object diff.
Documentation/git-diff-tree.txt
+2
-2
@@ -32,7 +32,7 @@ include::diff-options.txt[]
32
<path>...::
33
If provided, the results are limited to a subset of files
34
matching one of these prefix strings.
35
- ie file matches `/^<pattern1>|<pattern2>|.../`
35
+ i.e., file matches `/^<pattern1>|<pattern2>|.../`
36
Note that this parameter does not provide any wildcard or regexp
37
features.
38
@@ -54,7 +54,7 @@ include::diff-options.txt[]
54
+
55
When a single commit is given on one line of such input, it compares
56
the commit with its parents. The following flags further affects its
57
-behaviour. This does not apply to the case where two <tree-ish>
57
+behavior. This does not apply to the case where two <tree-ish>
58
separated with a single space are given.
59
60
-m::
Documentation/git-diff.txt
+1
-1
@@ -85,7 +85,7 @@ $ git diff arch/i386 include/asm-i386 <3>
85
nor deletion.
86
<2> show only names and the nature of change, but not actual
87
diff output. --name-status disables usual patch generation
88
-which in turn also disables recursive behaviour, so without -r
88
+which in turn also disables recursive behavior, so without -r
89
you would only see the directory name if there is a change in a
90
file in a subdirectory.
91
<3> limit diff output to named subtrees.
Documentation/git-fsck-objects.txt
+1
-1
@@ -71,7 +71,7 @@ sorted properly etc), but on the whole if "git-fsck-objects" is happy, you
71
do have a valid tree.
72
73
Any corrupt objects you will have to find in backups or other archives
74
-(ie you can just remove them and do an "rsync" with some other site in
74
+(i.e., you can just remove them and do an "rsync" with some other site in
75
the hopes that somebody else has the object you have corrupted).
76
77
Of course, "valid tree" doesn't mean that it wasn't generated by some
Documentation/git-grep.txt
+2
-2
@@ -30,7 +30,7 @@ OPTIONS
30
-------
31
--cached::
32
Instead of searching in the working tree files, check
33
- the blobs registerd in the index file.
33
+ the blobs registered in the index file.
34
35
-a | --text::
36
Process binary files as if they were text.
@@ -65,7 +65,7 @@ OPTIONS
65
-[ABC] <context>::
66
Show `context` trailing (`A` -- after), or leading (`B`
67
-- before), or both (`C` -- context) lines, and place a
68
- line containing `--` between continguous groups of
68
+ line containing `--` between contiguous groups of
69
matches.
70
71
-f <file>::
Documentation/git-merge-index.txt
+1
-1
@@ -69,7 +69,7 @@ or
69
fatal: merge program failed
70
71
where the latter example shows how "git-merge-index" will stop trying to
72
-merge once anything has returned an error (ie "cat" returned an error
72
+merge once anything has returned an error (i.e., "cat" returned an error
73
for the AA file, because it didn't exist in the original, and thus
74
"git-merge-index" didn't even try to merge the MM thing).
75
Documentation/git-patch-id.txt
+1
-1
@@ -13,7 +13,7 @@ DESCRIPTION
13
-----------
14
A "patch ID" is nothing but a SHA1 of the diff associated with a patch, with
15
whitespace and line numbers ignored. As such, it's "reasonably stable", but at
16
-the same time also reasonably unique, ie two patches that have the same "patch
16
+the same time also reasonably unique, i.e., two patches that have the same "patch
17
ID" are almost guaranteed to be the same thing.
18
19
IOW, you can use this thing to look for likely duplicate commits.
Documentation/git-read-tree.txt
+2
-2
@@ -205,7 +205,7 @@ The `git-write-tree` command refuses to write a nonsensical tree, and it
205
will complain about unmerged entries if it sees a single entry that is not
206
stage 0.
207
208
-Ok, this all sounds like a collection of totally nonsensical rules,
208
+OK, this all sounds like a collection of totally nonsensical rules,
209
but it's actually exactly what you want in order to do a fast
210
merge. The different stages represent the "result tree" (stage 0, aka
211
"merged"), the original tree (stage 1, aka "orig"), and the two trees
@@ -226,7 +226,7 @@ populated. Here is an outline of how the algorithm works:
226
227
- the index file saves and restores with all this information, so you
228
can merge things incrementally, but as long as it has entries in
229
- stages 1/2/3 (ie "unmerged entries") you can't write the result. So
229
+ stages 1/2/3 (i.e., "unmerged entries") you can't write the result. So
230
now the merge algorithm ends up being really simple:
231
232
* you walk the index in order, and ignore all entries of stage 0,
Documentation/git-repo-config.txt
+1
-1
@@ -49,7 +49,7 @@ OPTIONS
49
-------
50
51
--replace-all::
52
- Default behaviour is to replace at most one line. This replaces
52
+ Default behavior is to replace at most one line. This replaces
53
all lines matching the key (and optionally the value_regex).
54
55
--get::
Documentation/git-reset.txt
+1
-1
@@ -24,7 +24,7 @@ gitlink:git-revert[1] is your friend.
24
OPTIONS
25
-------
26
--mixed::
27
- Resets the index but not the working tree (ie, the changed files
27
+ Resets the index but not the working tree (i.e., the changed files
28
are preserved but not marked for commit) and reports what has not
29
been updated. This is the default action.
30
Documentation/git-rev-parse.txt
+2
-2
@@ -13,7 +13,7 @@ SYNOPSIS
13
DESCRIPTION
14
-----------
15
16
-Many git Porcelainish commands take mixture of flags
16
+Many git porcelainish commands take mixture of flags
17
(i.e. parameters that begin with a dash '-') and parameters
18
meant for underlying `git-rev-list` command they use internally
19
and flags and parameters for other commands they use as the
@@ -91,7 +91,7 @@ OPTIONS
91
92
--short, --short=number::
93
Instead of outputting the full SHA1 values of object names try to
94
- abbriviate them to a shorter unique name. When no length is specified
94
+ abbreviate them to a shorter unique name. When no length is specified
95
7 is used. The minimum length is 4.
96
97
--since=datestring, --after=datestring::
Documentation/git-send-email.txt
+1
-1
@@ -52,7 +52,7 @@ The options available are:
52
is not set, this will be prompted for.
53
54
--no-signed-off-by-cc::
55
- Do not add emails foudn in Signed-off-by: lines to the cc list.
55
+ Do not add emails found in Signed-off-by: lines to the cc list.
56
57
--quiet::
58
Make git-send-email less verbose. One line per email should be
Documentation/git-send-pack.txt
+1
-1
@@ -53,7 +53,7 @@ Specifying the Refs
53
There are three ways to specify which refs to update on the
54
remote end.
55
56
-With '--all' flag, all refs that exist locally are transfered to
56
+With '--all' flag, all refs that exist locally are transferred to
57
the remote side. You cannot specify any '<ref>' if you use
58
this flag.
59
Documentation/git-sh-setup.txt
+1
-1
@@ -13,7 +13,7 @@ DESCRIPTION
13
-----------
14
15
Sets up the normal git environment variables and a few helper functions
16
-(currently just "die()"), and returns ok if it all looks like a git archive.
16
+(currently just "die()"), and returns OK if it all looks like a git archive.
17
So, to make the rest of the git scripts more careful and readable,
18
use it as follows:
19
Documentation/git-tools.txt
+1
-1
@@ -12,7 +12,7 @@ This document presents a brief summary of each tool and the corresponding
12
link.
13
14
15
-Alternative/Augmentative Procelains
15
+Alternative/Augmentative Porcelains
16
-----------------------------------
17
18
- *Cogito* (http://www.kernel.org/pub/software/scm/cogito/)
Documentation/git-update-index.txt
+1
-1
@@ -40,7 +40,7 @@ OPTIONS
40
--remove::
41
If a specified file is in the index but is missing then it's
42
removed.
43
- Default behaviour is to ignore removed file.
43
+ Default behavior is to ignore removed file.
44
45
--refresh::
46
Looks at the current index and checks to see if merges or
Documentation/hooks.txt
+2
-2
@@ -100,7 +100,7 @@ update
100
This hook is invoked by `git-receive-pack` on the remote repository,
101
which is happens when a `git push` is done on a local repository.
102
Just before updating the ref on the remote repository, the update hook
103
-is invoked. It's exit status determins the success or failure of
103
+is invoked. It's exit status determines the success or failure of
104
the ref update.
105
106
The hook executes once for each ref to be updated, and takes
@@ -151,7 +151,7 @@ so it is a poor place to do log old..new.
151
152
The default post-update hook, when enabled, runs
153
`git-update-server-info` to keep the information used by dumb
154
-transports (eg, http) up-to-date. If you are publishing
154
+transports (e.g., http) up-to-date. If you are publishing
155
a git repository that is accessible via http, you should
156
probably enable this hook.
157
Documentation/technical/pack-heuristics.txt
+1
-1
@@ -288,7 +288,7 @@ And of course there is the "Other Shoe" Factor too.
288
- we actively try to generate deltas from a larger object to a
289
smaller one
290
- this means that the top-of-tree very seldom has deltas
291
- (ie deltas in _practice_ are "backwards deltas")
291
+ (i.e. deltas in _practice_ are "backwards deltas")
292
293
Again, we should reread that whole paragraph. Not just because
294
Linus has slipped Linus's Law in there on us, but because it is
Documentation/tutorial-2.txt
+1
-1
@@ -49,7 +49,7 @@ tree
49
50
A tree can refer to one or more "blob" objects, each corresponding to
51
a file. In addition, a tree can also refer to other tree objects,
52
-thus creating a directory heirarchy. You can examine the contents of
52
+thus creating a directory hierarchy. You can examine the contents of
53
any tree using ls-tree (remember that a long enough initial portion
54
of the SHA1 will also work):
55
Documentation/tutorial.txt
+4
-4
@@ -194,7 +194,7 @@ $ git clone /home/alice/project myrepo
194
195
This creates a new directory "myrepo" containing a clone of Alice's
196
repository. The clone is on an equal footing with the original
197
-project, posessing its own copy of the original project's history.
197
+project, possessing its own copy of the original project's history.
198
199
Bob then makes some changes and commits them:
200
@@ -240,7 +240,7 @@ $ git log -p master..bob-incoming
240
shows a list of all the changes that Bob made since he branched from
241
Alice's master branch.
242
243
-After examing those changes, and possibly fixing things, Alice can
243
+After examining those changes, and possibly fixing things, Alice can
244
pull the changes into her master branch:
245
246
-------------------------------------
@@ -374,7 +374,7 @@ project, so
374
$ git grep "hello" v2.5
375
-------------------------------------
376
377
-searches for all occurences of "hello" in v2.5.
377
+searches for all occurrences of "hello" in v2.5.
378
379
If you leave out the commit name, git grep will search any of the
380
files it manages in your current directory. So
@@ -482,6 +482,6 @@ digressions that may be interesting at this point are:
482
smart enough to perform a close-to-optimal search even in the
483
case of complex non-linear history with lots of merged branches.
484
485
- * link:everyday.html[Everday GIT with 20 Commands Or So]
485
+ * link:everyday.html[Everyday GIT with 20 Commands Or So]
486
487
* link:cvs-migration.html[git for CVS users].