Skip to content

Commit

Permalink
Fix some documentation typos.
Browse files Browse the repository at this point in the history
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Ralf Wildenhues authored and gitster committed Dec 18, 2007
1 parent 4808ab8 commit 02ff625
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Documentation/config.txt
Expand Up @@ -476,7 +476,7 @@ fetch.unpackLimit::

format.numbered::
A boolean which can enable sequence numbers in patch subjects.
Seting this option to "auto" will enable it only if there is
Setting this option to "auto" will enable it only if there is
more than one patch. See --numbered option in
gitlink:git-format-patch[1].

Expand Down
8 changes: 4 additions & 4 deletions Documentation/git-help.txt
Expand Up @@ -21,7 +21,7 @@ printed on the standard output.

If a git command is named, a manual page for that command is brought
up. The 'man' program is used by default for this purpose, but this
can be overriden by other options or configuration variables.
can be overridden by other options or configuration variables.

Note that 'git --help ...' is identical as 'git help ...' because the
former is internally converted into the latter.
Expand All @@ -30,7 +30,7 @@ OPTIONS
-------
-a|--all::
Prints all the available commands on the standard output. This
option superseeds any other option.
option supersedes any other option.

-i|--info::
Use the 'info' program to display the manual page, instead of
Expand All @@ -50,7 +50,7 @@ The web browser can be specified using the configuration variable
these config variables is set, the 'git-help--browse' helper script
(called by 'git-help') will pick a suitable default.
+
You can explicitly provide a full path to your prefered browser by
You can explicitly provide a full path to your preferred browser by
setting the configuration variable 'browser.<tool>.path'. For example,
you can configure the absolute path to firefox by setting
'browser.firefox.path'. Otherwise, 'git-help--browse' assumes the tool
Expand All @@ -72,7 +72,7 @@ line option:
* "web" or "html" correspond to '-w|--web',

The 'help.browser', 'web.browser' and 'browser.<tool>.path' will also
be checked if the 'web' format is choosen (either by command line
be checked if the 'web' format is chosen (either by command line
option or configuration variable). See '-w|--web' in the OPTIONS
section above.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-init.txt
Expand Up @@ -52,7 +52,7 @@ is given:
- 'all' (or 'world' or 'everybody'): Same as 'group', but make the repository
readable by all users.

By default, the configuration flag receive.denyNonFastforward is enabled
By default, the configuration flag receive.denyNonFastForwards is enabled
in shared repositories, so that you cannot force a non fast-forwarding push
into it.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-rev-list.txt
Expand Up @@ -274,7 +274,7 @@ limiting may be applied.
--quiet::

Don't print anything to standard output. This form of
git-rev-list is primarly meant to allow the caller to
git-rev-list is primarily meant to allow the caller to
test the exit status to see if a range of objects is fully
connected (or not). It is faster than redirecting stdout
to /dev/null as the output does not have to be formatted.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-send-email.txt
Expand Up @@ -148,7 +148,7 @@ sendemail.identity::
'sendemail.<identity>.<item>' will have higher precedence than
'sendemail.<item>'. This is useful to declare multiple SMTP
identities and to hoist sensitive authentication information
out of the repository and into the global configuation file.
out of the repository and into the global configuration file.

sendemail.aliasesfile::
To avoid typing long email addresses, point this to one or more
Expand Down
4 changes: 2 additions & 2 deletions Documentation/git.txt
Expand Up @@ -502,7 +502,7 @@ as tags and branch heads.

The object database contains objects of three main types: blobs, which
hold file data; trees, which point to blobs and other trees to build up
directory heirarchies; and commits, which each reference a single tree
directory hierarchies; and commits, which each reference a single tree
and some number of parent commits.

The commit, equivalent to what other systems call a "changeset" or
Expand All @@ -522,7 +522,7 @@ efficiency may later be compressed together into "pack files".
Named pointers called refs mark interesting points in history. A ref
may contain the SHA1 name of an object or the name of another ref. Refs
with names beginning `ref/head/` contain the SHA1 name of the most
recent commit (or "head") of a branch under developement. SHA1 names of
recent commit (or "head") of a branch under development. SHA1 names of
tags of interest are stored under `ref/tags/`. A special ref named
`HEAD` contains the name of the currently checked-out branch.

Expand Down

0 comments on commit 02ff625

Please sign in to comment.