Fix some documentation typos.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ralf Wildenhues committed
Dec 18, 2007 at 07:07 UTC
02ff62504e12cb1925a59b6956508dc70984c5b4
6 files changed
+10
-10
Documentation/config.txt
+1
-1
@@ -476,7 +476,7 @@ fetch.unpackLimit::
476
477
format.numbered::
478
A boolean which can enable sequence numbers in patch subjects.
479
- Seting this option to "auto" will enable it only if there is
479
+ Setting this option to "auto" will enable it only if there is
480
more than one patch. See --numbered option in
481
gitlink:git-format-patch[1].
482
Documentation/git-help.txt
+4
-4
@@ -21,7 +21,7 @@ printed on the standard output.
21
22
If a git command is named, a manual page for that command is brought
23
up. The 'man' program is used by default for this purpose, but this
24
-can be overriden by other options or configuration variables.
24
+can be overridden by other options or configuration variables.
25
26
Note that 'git --help ...' is identical as 'git help ...' because the
27
former is internally converted into the latter.
@@ -30,7 +30,7 @@ OPTIONS
30
-------
31
-a|--all::
32
Prints all the available commands on the standard output. This
33
- option superseeds any other option.
33
+ option supersedes any other option.
34
35
-i|--info::
36
Use the 'info' program to display the manual page, instead of
@@ -50,7 +50,7 @@ The web browser can be specified using the configuration variable
50
these config variables is set, the 'git-help--browse' helper script
51
(called by 'git-help') will pick a suitable default.
52
+
53
-You can explicitly provide a full path to your prefered browser by
53
+You can explicitly provide a full path to your preferred browser by
54
setting the configuration variable 'browser.<tool>.path'. For example,
55
you can configure the absolute path to firefox by setting
56
'browser.firefox.path'. Otherwise, 'git-help--browse' assumes the tool
@@ -72,7 +72,7 @@ line option:
72
* "web" or "html" correspond to '-w|--web',
73
74
The 'help.browser', 'web.browser' and 'browser.<tool>.path' will also
75
-be checked if the 'web' format is choosen (either by command line
75
+be checked if the 'web' format is chosen (either by command line
76
option or configuration variable). See '-w|--web' in the OPTIONS
77
section above.
78
Documentation/git-init.txt
+1
-1
@@ -52,7 +52,7 @@ is given:
52
- 'all' (or 'world' or 'everybody'): Same as 'group', but make the repository
53
readable by all users.
54
55
-By default, the configuration flag receive.denyNonFastforward is enabled
55
+By default, the configuration flag receive.denyNonFastForwards is enabled
56
in shared repositories, so that you cannot force a non fast-forwarding push
57
into it.
58
Documentation/git-rev-list.txt
+1
-1
@@ -274,7 +274,7 @@ limiting may be applied.
274
--quiet::
275
276
Don't print anything to standard output. This form of
277
- git-rev-list is primarly meant to allow the caller to
277
+ git-rev-list is primarily meant to allow the caller to
278
test the exit status to see if a range of objects is fully
279
connected (or not). It is faster than redirecting stdout
280
to /dev/null as the output does not have to be formatted.
Documentation/git-send-email.txt
+1
-1
@@ -148,7 +148,7 @@ sendemail.identity::
148
'sendemail.<identity>.<item>' will have higher precedence than
149
'sendemail.<item>'. This is useful to declare multiple SMTP
150
identities and to hoist sensitive authentication information
151
- out of the repository and into the global configuation file.
151
+ out of the repository and into the global configuration file.
152
153
sendemail.aliasesfile::
154
To avoid typing long email addresses, point this to one or more
Documentation/git.txt
+2
-2
@@ -502,7 +502,7 @@ as tags and branch heads.
502
503
The object database contains objects of three main types: blobs, which
504
hold file data; trees, which point to blobs and other trees to build up
505
-directory heirarchies; and commits, which each reference a single tree
505
+directory hierarchies; and commits, which each reference a single tree
506
and some number of parent commits.
507
508
The commit, equivalent to what other systems call a "changeset" or
@@ -522,7 +522,7 @@ efficiency may later be compressed together into "pack files".
522
Named pointers called refs mark interesting points in history. A ref
523
may contain the SHA1 name of an object or the name of another ref. Refs
524
with names beginning `ref/head/` contain the SHA1 name of the most
525
-recent commit (or "head") of a branch under developement. SHA1 names of
525
+recent commit (or "head") of a branch under development. SHA1 names of
526
tags of interest are stored under `ref/tags/`. A special ref named
527
`HEAD` contains the name of the currently checked-out branch.
528