Documentation: Correct various misspellings and typos.
Fix minor typos throughout the documentation. Signed-off-by: Brian Hetro <whee@smaertness.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brian Hetro committed
Aug 23, 2007 at 20:44 UTC
027830755d2972ab2201c53922ce402862a2bd80
19 files changed
+40
-40
Documentation/config.txt
+6
-6
@@ -283,7 +283,7 @@ core.excludesfile::
283
284
core.editor::
285
Commands such as `commit` and `tag` that lets you edit
286
- messages by lauching an editor uses the value of this
286
+ messages by launching an editor uses the value of this
287
variable when it is set, and the environment variable
288
`GIT_EDITOR` is not set. The order of preference is
289
`GIT_EDITOR` environment, `core.editor`, `VISUAL` and
@@ -500,10 +500,10 @@ gitcvs.dbuser, gitcvs.dbpass::
500
'gitcvs.dbuser' supports variable substitution (see
501
gitlink:git-cvsserver[1] for details).
502
503
-All gitcvs variables except for 'gitcvs.allbinary' can also specifed
504
-as 'gitcvs.<access_method>.<varname>' (where 'access_method' is one
505
-of "ext" and "pserver") to make them apply only for the given access
506
-method.
503
+All gitcvs variables except for 'gitcvs.allbinary' can also be
504
+specified as 'gitcvs.<access_method>.<varname>' (where 'access_method'
505
+is one of "ext" and "pserver") to make them apply only for the given
506
+access method.
507
508
http.sslVerify::
509
Whether to verify the SSL certificate when fetching or pushing
@@ -615,7 +615,7 @@ pack.compression::
615
not set, defaults to -1.
616
617
pack.deltaCacheSize::
618
- The maxium memory in bytes used for caching deltas in
618
+ The maximum memory in bytes used for caching deltas in
619
gitlink:git-pack-objects[1].
620
A value of 0 means no limit. Defaults to 0.
621
Documentation/git-commit-tree.txt
+1
-1
@@ -52,7 +52,7 @@ A commit encapsulates:
52
- committer name and email and the commit time.
53
54
While parent object ids are provided on the command line, author and
55
-commiter information is taken from the following environment variables,
55
+committer information is taken from the following environment variables,
56
if set:
57
58
GIT_AUTHOR_NAME
Documentation/git-config.txt
+1
-1
@@ -139,7 +139,7 @@ See also <<FILES>>.
139
FILES
140
-----
141
142
-If not set explicitely with '--file', there are three files where
142
+If not set explicitly with '--file', there are three files where
143
git-config will search for configuration options:
144
145
.git/config::
Documentation/git-fast-import.txt
+9
-9
@@ -241,7 +241,7 @@ been well tested in the wild.
241
+
242
Frontends should prefer the `raw` format if the source material
243
already uses UNIX-epoch format, can be coaxed to give dates in that
244
-format, or its format is easiliy convertible to it, as there is no
244
+format, or its format is easily convertible to it, as there is no
245
ambiguity in parsing.
246
247
`now`::
@@ -343,7 +343,7 @@ Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`
343
and `filedeleteall` commands
344
may be included to update the contents of the branch prior to
345
creating the commit. These commands may be supplied in any order.
346
-However it is recommended that a `filedeleteall` command preceed
346
+However it is recommended that a `filedeleteall` command precede
347
all `filemodify`, `filecopy` and `filerename` commands in the same
348
commit, as `filedeleteall`
349
wipes the branch clean (see below).
@@ -402,7 +402,7 @@ Here `<committish>` is any of the following:
402
+
403
The reason fast-import uses `:` to denote a mark reference is this character
404
is not legal in a Git branch name. The leading `:` makes it easy
405
-to distingush between the mark 42 (`:42`) and the branch 42 (`42`
405
+to distinguish between the mark 42 (`:42`) and the branch 42 (`42`
406
or `refs/heads/42`), or an abbreviated SHA-1 which happened to
407
consist only of base-10 digits.
408
+
@@ -487,7 +487,7 @@ start with double quote (`"`).
487
If an `LF` or double quote must be encoded into `<path>` shell-style
488
quoting should be used, e.g. `"path/with\n and \" in it"`.
489
490
-The value of `<path>` must be in canoncial form. That is it must not:
490
+The value of `<path>` must be in canonical form. That is it must not:
491
492
* contain an empty directory component (e.g. `foo//bar` is invalid),
493
* end with a directory separator (e.g. `foo/` is invalid),
@@ -733,7 +733,7 @@ of the next line, even if `<raw>` did not end with an `LF`.
733
Delimited format::
734
A delimiter string is used to mark the end of the data.
735
fast-import will compute the length by searching for the delimiter.
736
- This format is primarly useful for testing and is not
736
+ This format is primarily useful for testing and is not
737
recommended for real data.
738
+
739
....
@@ -873,7 +873,7 @@ to remove the dummy branch.
873
Import Now, Repack Later
874
~~~~~~~~~~~~~~~~~~~~~~~~
875
As soon as fast-import completes the Git repository is completely valid
876
-and ready for use. Typicallly this takes only a very short time,
876
+and ready for use. Typically this takes only a very short time,
877
even for considerably large projects (100,000+ commits).
878
879
However repacking the repository is necessary to improve data
@@ -942,8 +942,8 @@ Memory Utilization
942
------------------
943
There are a number of factors which affect how much memory fast-import
944
requires to perform an import. Like critical sections of core
945
-Git, fast-import uses its own memory allocators to ammortize any overheads
946
-associated with malloc. In practice fast-import tends to ammoritize any
945
+Git, fast-import uses its own memory allocators to amortize any overheads
946
+associated with malloc. In practice fast-import tends to amortize any
947
malloc overheads to 0, due to its use of large block allocations.
948
949
per object
@@ -1000,7 +1000,7 @@ per active tree
1000
~~~~~~~~~~~~~~~
1001
Trees (aka directories) use just 12 bytes of memory on top of the
1002
memory required for their entries (see ``per active file'' below).
1003
-The cost of a tree is virtually 0, as its overhead ammortizes out
1003
+The cost of a tree is virtually 0, as its overhead amortizes out
1004
over the individual file entries.
1005
1006
per active file entry
Documentation/git-fmt-merge-msg.txt
+1
-1
@@ -10,7 +10,7 @@ SYNOPSIS
10
--------
11
[verse]
12
git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD
13
-git-fmt-merge-msg [--summary | --no-summray] -F <file>
13
+git-fmt-merge-msg [--summary | --no-summary] -F <file>
14
15
DESCRIPTION
16
-----------
Documentation/git-format-patch.txt
+1
-1
@@ -118,7 +118,7 @@ include::diff-options.txt[]
118
119
--suffix=.<sfx>::
120
Instead of using `.patch` as the suffix for generated
121
- filenames, use specifed suffix. A common alternative is
121
+ filenames, use specified suffix. A common alternative is
122
`--suffix=.txt`.
123
+
124
Note that you would need to include the leading dot `.` if you
Documentation/git-gui.txt
+1
-1
@@ -89,7 +89,7 @@ See Also
89
Other
90
-----
91
git-gui is actually maintained as an independent project, but stable
92
-versions are distributed as part of the Git suite for the convience
92
+versions are distributed as part of the Git suite for the convenience
93
of end users.
94
95
A git-gui development repository can be obtained from:
Documentation/git-http-fetch.txt
+1
-1
@@ -34,7 +34,7 @@ commit-id::
34
the local end after the transfer is complete.
35
36
--stdin::
37
- Instead of a commit id on the commandline (which is not expected in this
37
+ Instead of a commit id on the command line (which is not expected in this
38
case), 'git-http-fetch' expects lines on stdin in the format
39
40
<commit-id>['\t'<filename-as-in--w>]
Documentation/git-local-fetch.txt
+1
-1
@@ -44,7 +44,7 @@ OPTIONS
44
the local end after the transfer is complete.
45
46
--stdin::
47
- Instead of a commit id on the commandline (which is not expected in this
47
+ Instead of a commit id on the command line (which is not expected in this
48
case), 'git-local-fetch' expects lines on stdin in the format
49
50
<commit-id>['\t'<filename-as-in--w>]
Documentation/git-name-rev.txt
+1
-1
@@ -37,7 +37,7 @@ OPTIONS
37
--name-only::
38
Instead of printing both the SHA-1 and the name, print only
39
the name. If given with --tags the usual tag prefix of
40
- "tags/" is also ommitted from the name, matching the output
40
+ "tags/" is also omitted from the name, matching the output
41
of gitlink::git-describe[1] more closely. This option
42
cannot be combined with --stdin.
43
Documentation/git-receive-pack.txt
+1
-1
@@ -78,7 +78,7 @@ The hook should exit with non-zero status if it wants to disallow
78
updating the named ref. Otherwise it should exit with zero.
79
80
Successful execution (a zero exit status) of this hook does not
81
-ensure the ref will actully be updated, it is only a prerequisite.
81
+ensure the ref will actually be updated, it is only a prerequisite.
82
As such it is not a good idea to send notices (e.g. email) from
83
this hook. Consider using the post-receive hook instead.
84
Documentation/git-reflog.txt
+1
-1
@@ -30,7 +30,7 @@ Entries older than `expire` time, or entries older than
30
tip, are removed from the reflog. This is typically not used
31
directly by the end users -- instead, see gitlink:git-gc[1].
32
33
-The subcommand "show" (which is also the default, in the absense of any
33
+The subcommand "show" (which is also the default, in the absence of any
34
subcommands) will take all the normal log options, and show the log of
35
`HEAD`, which will cover all recent actions, including branch switches.
36
It is basically an alias for 'git log -g --abbrev-commit
Documentation/git-repack.txt
+1
-1
@@ -14,7 +14,7 @@ DESCRIPTION
14
-----------
15
16
This script is used to combine all objects that do not currently
17
-reside in a "pack", into a pack. It can also be used to re-organise
17
+reside in a "pack", into a pack. It can also be used to re-organize
18
existing packs into a single, more efficient pack.
19
20
A pack is a collection of objects, individually compressed, with
Documentation/git-rev-list.txt
+1
-1
@@ -113,7 +113,7 @@ e.g. "2 hours ago".
113
`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
114
format, often found in E-mail messages.
115
+
116
-`--date=short` shows only date but not time, in `YYYY-MM-DD` fomat.
116
+`--date=short` shows only date but not time, in `YYYY-MM-DD` format.
117
+
118
`--date=default` shows timestamps in the original timezone
119
(either committer's or author's).
Documentation/git-svn.txt
+2
-2
@@ -99,7 +99,7 @@ COMMANDS
99
100
This works similarly to 'svn update' or 'git-pull' except that
101
it preserves linear history with 'git-rebase' instead of
102
-'git-merge' for ease of dcommit-ing with git-svn.
102
+'git-merge' for ease of dcommiting with git-svn.
103
104
This accepts all options that 'git-svn fetch' and 'git-rebase'
105
accepts. However '--fetch-all' only fetches from the current
@@ -551,7 +551,7 @@ listed below are allowed:
551
Keep in mind that the '*' (asterisk) wildcard of the local ref
552
(left of the ':') *must* be the farthest right path component;
553
however the remote wildcard may be anywhere as long as it's own
554
-independent path componet (surrounded by '/' or EOL). This
554
+independent path component (surrounded by '/' or EOL). This
555
type of configuration is not automatically created by 'init' and
556
should be manually entered with a text-editor or using
557
gitlink:git-config[1]
Documentation/gitattributes.txt
+3
-3
@@ -285,7 +285,7 @@ want to appear as the hunk header, like this:
285
Note. A single level of backslashes are eaten by the
286
configuration file parser, so you would need to double the
287
backslashes; the pattern above picks a line that begins with a
288
-backslash, and zero or more occurences of `sub` followed by
288
+backslash, and zero or more occurrences of `sub` followed by
289
`section` followed by open brace, to the end of line.
290
291
There are a few built-in patterns to make this easier, and `tex`
@@ -394,7 +394,7 @@ abc -foo -bar
394
the attributes given to path `t/abc` are computed as follows:
395
396
1. By examining `t/.gitattributes` (which is in the same
397
- diretory as the path in question), git finds that the first
397
+ directory as the path in question), git finds that the first
398
line matches. `merge` attribute is set. It also finds that
399
the second line matches, and attributes `foo` and `bar`
400
are unset.
@@ -410,7 +410,7 @@ the attributes given to path `t/abc` are computed as follows:
410
a match, and `foo` is set, `bar` is reverted to unspecified
411
state, and `baz` is unset.
412
413
-As the result, the attributes assignement to `t/abc` becomes:
413
+As the result, the attributes assignment to `t/abc` becomes:
414
415
----------------------------------------------------------------
416
foo set to true
Documentation/hooks.txt
+1
-1
@@ -176,7 +176,7 @@ hook does on its standard input.
176
This hook does not affect the outcome of `git-receive-pack`, as it
177
is called after the real work is done.
178
179
-This supersedes the <<post-update,'post-update'>> hook in that it get's
179
+This supersedes the <<post-update,'post-update'>> hook in that it gets
180
both old and new values of all the refs in addition to their
181
names.
182
Documentation/tutorial.txt
+1
-1
@@ -339,7 +339,7 @@ $ git pull . remotes/bob/master
339
-------------------------------------
340
341
Note that git pull always merges into the current branch,
342
-regardless of what else is given on the commandline.
342
+regardless of what else is given on the command line.
343
344
Later, Bob can update his repo with Alice's latest changes using
345
Documentation/user-manual.txt
+6
-6
@@ -4,7 +4,7 @@ ______________________________________________
4
5
Git is a fast distributed revision control system.
6
7
-This manual is designed to be readable by someone with basic unix
7
+This manual is designed to be readable by someone with basic UNIX
8
command-line skills, but no previous knowledge of git.
9
10
<<repositories-and-branches>> and <<exploring-git-history>> explain how
@@ -217,7 +217,7 @@ commits will help understand how the git organizes history.
217
218
In the following, we say that commit X is "reachable" from commit Y
219
if commit X is an ancestor of commit Y. Equivalently, you could say
220
-that Y is a descendent of X, or that there is a chain of parents
220
+that Y is a descendant of X, or that there is a chain of parents
221
leading from commit Y to commit X.
222
223
[[history-diagrams]]
@@ -1911,7 +1911,7 @@ gitlink:git-update-server-info[1], and the documentation
1911
link:hooks.html[Hooks used by git].)
1912
1913
Advertise the url of proj.git. Anybody else should then be able to
1914
-clone or pull from that url, for example with a commandline like:
1914
+clone or pull from that url, for example with a command line like:
1915
1916
-------------------------------------------------
1917
$ git clone http://yourserver.com/~you/proj.git
@@ -2531,7 +2531,7 @@ them again with gitlink:git-am[1].
2531
Other tools
2532
-----------
2533
2534
-There are numerous other tools, such as stgit, which exist for the
2534
+There are numerous other tools, such as StGIT, which exist for the
2535
purpose of maintaining a patch series. These are outside of the scope of
2536
this manual.
2537
@@ -3961,8 +3961,8 @@ This is a work in progress.
3961
3962
The basic requirements:
3963
- It must be readable in order, from beginning to end, by
3964
- someone intelligent with a basic grasp of the unix
3965
- commandline, but without any special knowledge of git. If
3964
+ someone intelligent with a basic grasp of the UNIX
3965
+ command line, but without any special knowledge of git. If
3966
necessary, any other prerequisites should be specifically
3967
mentioned as they arise.
3968
- Whenever possible, section headings should clearly describe