Fix typos in the documentation

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ralf Wildenhues 2011-01-03 20:03:34 +01:00 committed by Junio C Hamano
parent 01b97a4cb6
commit 469bfc962d
12 changed files with 26 additions and 27 deletions

View file

@ -157,7 +157,7 @@ Writing Documentation:
--sort=<key> --sort=<key>
--abbrev[=<n>] --abbrev[=<n>]
Possibility of multiple occurences is indicated by three dots: Possibility of multiple occurrences is indicated by three dots:
<file>... <file>...
(One or more of <file>.) (One or more of <file>.)

View file

@ -8,12 +8,11 @@ Updates since v1.7.3
docbook-xsl >= 1.73. If you have older versions, you can set docbook-xsl >= 1.73. If you have older versions, you can set
ASCIIDOC7 and ASCIIDOC_ROFF, respectively. ASCIIDOC7 and ASCIIDOC_ROFF, respectively.
* The option parsers of various commands that create new branch (or * The option parsers of various commands that create new branches (or
rename existing ones to a new name) were too loose and users were rename existing ones to a new name) were too loose and users were
allowed to call a branch with a name that begins with a dash by allowed to give a branch a name that begins with a dash by creative
creative abuse of their command line options, which only lead to abuse of their command line options, which only led to burning
burn themselves. The name of a branch cannot begin with a dash themselves. The name of a branch cannot begin with a dash now.
now.
* System-wide fallback default attributes can be stored in * System-wide fallback default attributes can be stored in
/etc/gitattributes; core.attributesfile configuration variable can /etc/gitattributes; core.attributesfile configuration variable can

View file

@ -892,7 +892,7 @@ diff.wordRegex::
fetch.recurseSubmodules:: fetch.recurseSubmodules::
A boolean value which changes the behavior for fetch and pull, the A boolean value which changes the behavior for fetch and pull, the
default is to not recursively fetch populated sumodules unless default is to not recursively fetch populated submodules unless
configured otherwise. configured otherwise.
fetch.unpackLimit:: fetch.unpackLimit::
@ -1811,7 +1811,7 @@ submodule.<name>.update::
submodule.<name>.fetchRecurseSubmodules:: submodule.<name>.fetchRecurseSubmodules::
This option can be used to enable/disable recursive fetching of this This option can be used to enable/disable recursive fetching of this
submodule. It can be overriden by using the --[no-]recurse-submodules submodule. It can be overridden by using the --[no-]recurse-submodules
command line option to "git fetch" and "git pull". command line option to "git fetch" and "git pull".
This setting will override that from in the linkgit:gitmodules[5] This setting will override that from in the linkgit:gitmodules[5]
file. file.

View file

@ -333,7 +333,7 @@ likely to introduce confusing changes to the index.
There are also more complex operations that can be performed. But beware There are also more complex operations that can be performed. But beware
that because the patch is applied only to the index and not the working that because the patch is applied only to the index and not the working
tree, the working tree will appear to "undo" the change in the index. tree, the working tree will appear to "undo" the change in the index.
For example, introducing a a new line into the index that is in neither For example, introducing a new line into the index that is in neither
the HEAD nor the working tree will stage the new line for commit, but the HEAD nor the working tree will stage the new line for commit, but
the line will appear to be reverted in the working tree. the line will appear to be reverted in the working tree.

View file

@ -59,7 +59,7 @@ unbundle <file>::
<git-rev-list-args>:: <git-rev-list-args>::
A list of arguments, acceptable to 'git rev-parse' and A list of arguments, acceptable to 'git rev-parse' and
'git rev-list' (and containg a named ref, see SPECIFYING REFERENCES 'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES
below), that specifies the specific objects and references below), that specifies the specific objects and references
to transport. For example, `master{tilde}10..master` causes the to transport. For example, `master{tilde}10..master` causes the
current master reference to be packaged along with all objects current master reference to be packaged along with all objects

View file

@ -57,7 +57,7 @@ merge.log::
In addition to branch names, populate the log message with at In addition to branch names, populate the log message with at
most the specified number of one-line descriptions from the most the specified number of one-line descriptions from the
actual commits that are being merged. Defaults to false, and actual commits that are being merged. Defaults to false, and
true is a synoym for 20. true is a synonym for 20.
merge.summary:: merge.summary::
Synonym to `merge.log`; this is deprecated and will be removed in Synonym to `merge.log`; this is deprecated and will be removed in

View file

@ -15,12 +15,12 @@ This remote helper uses the specified 'program' to connect
to a remote git server. to a remote git server.
Data written to stdin of this specified 'program' is assumed Data written to stdin of this specified 'program' is assumed
to be sent to git:// server, git-upload-pack, git-receive-pack to be sent to a git:// server, git-upload-pack, git-receive-pack
or git-upload-archive (depending on situation), and data read or git-upload-archive (depending on situation), and data read
from stdout of this program is assumed to be received from from stdout of this program is assumed to be received from
the same service. the same service.
Command and arguments are separated by unescaped space. Command and arguments are separated by an unescaped space.
The following sequences have a special meaning: The following sequences have a special meaning:
@ -39,19 +39,19 @@ The following sequences have a special meaning:
git-upload-pack, or git-upload-archive) of the service git-upload-pack, or git-upload-archive) of the service
git wants to invoke. git wants to invoke.
'%G' (must be first characters in argument):: '%G' (must be the first characters in an argument)::
This argument will not be passed to 'program'. Instead, it This argument will not be passed to 'program'. Instead, it
will cause helper to start by sending git:// service request to will cause the helper to start by sending git:// service requests to
remote side with service field set to approiate value and the remote side with the service field set to an appropriate value and
repository field set to rest of the argument. Default is not to send the repository field set to rest of the argument. Default is not to send
such request. such a request.
+ +
This is useful if remote side is git:// server accessed over This is useful if remote side is git:// server accessed over
some tunnel. some tunnel.
'%V' (must be first characters in argument):: '%V' (must be first characters in argument)::
This argument will not be passed to 'program'. Instead it sets This argument will not be passed to 'program'. Instead it sets
the vhost field in git:// service request (to rest of the argument). the vhost field in the git:// service request (to rest of the argument).
Default is not to send vhost in such request (if sent). Default is not to send vhost in such request (if sent).
ENVIRONMENT VARIABLES: ENVIRONMENT VARIABLES:

View file

@ -11,20 +11,20 @@ SYNOPSIS
DESCRIPTION DESCRIPTION
----------- -----------
This helper uses specified file descriptors to connect to remote git server. This helper uses specified file descriptors to connect to a remote git server.
This is not meant for end users but for programs and scripts calling git This is not meant for end users but for programs and scripts calling git
fetch, push or archive. fetch, push or archive.
If only <infd> is given, it is assumed to be bidirectional socket connected If only <infd> is given, it is assumed to be a bidirectional socket connected
to remote git server (git-upload-pack, git-receive-pack or to remote git server (git-upload-pack, git-receive-pack or
git-upload-achive). If both <infd> and <outfd> are given, they are assumed git-upload-achive). If both <infd> and <outfd> are given, they are assumed
to be pipes connected to remote git server (<infd> being the inbound pipe to be pipes connected to a remote git server (<infd> being the inbound pipe
and <outfd> being the outbound pipe. and <outfd> being the outbound pipe.
It is assumed that any handshaking procedures have already been completed It is assumed that any handshaking procedures have already been completed
(such as sending service request for git://) before this helper is started. (such as sending service request for git://) before this helper is started.
<anything> can be any string. It is ignored. It is meant for provoding <anything> can be any string. It is ignored. It is meant for providing
information to user in the URL in case that URL is displayed in some information to user in the URL in case that URL is displayed in some
context. context.

View file

@ -613,7 +613,7 @@ old references to SVN revision numbers in existing documentation, bug
reports and archives. If you plan to eventually migrate from SVN to git reports and archives. If you plan to eventually migrate from SVN to git
and are certain about dropping SVN history, consider and are certain about dropping SVN history, consider
linkgit:git-filter-branch[1] instead. filter-branch also allows linkgit:git-filter-branch[1] instead. filter-branch also allows
reformating of metadata for ease-of-reading and rewriting authorship reformatting of metadata for ease-of-reading and rewriting authorship
info for non-"svn.authorsFile" users. info for non-"svn.authorsFile" users.
svn.useSvmProps:: svn.useSvmProps::

View file

@ -49,7 +49,7 @@ submodule.<name>.fetchRecurseSubmodules::
submodule. If this option is also present in the submodules entry in submodule. If this option is also present in the submodules entry in
.git/config of the superproject, the setting there will override the .git/config of the superproject, the setting there will override the
one found in .gitmodules. one found in .gitmodules.
Both settings can be overriden on the command line by using the Both settings can be overridden on the command line by using the
"--[no-]recurse-submodules" option to "git fetch" and "git pull".. "--[no-]recurse-submodules" option to "git fetch" and "git pull"..
submodule.<name>.ignore:: submodule.<name>.ignore::

View file

@ -10,7 +10,7 @@ merge.log::
In addition to branch names, populate the log message with at In addition to branch names, populate the log message with at
most the specified number of one-line descriptions from the most the specified number of one-line descriptions from the
actual commits that are being merged. Defaults to false, and actual commits that are being merged. Defaults to false, and
true is a synoym for 20. true is a synonym for 20.
merge.renameLimit:: merge.renameLimit::
The number of files to consider when performing rename detection The number of files to consider when performing rename detection

View file

@ -32,7 +32,7 @@ and installation code should look something like:
} }
------------------------------------------ ------------------------------------------
Handlers are given the typdef of sigchain_fun. This is the same type Handlers are given the typedef of sigchain_fun. This is the same type
that is given to signal() or sigaction(). It is perfectly reasonable to that is given to signal() or sigaction(). It is perfectly reasonable to
push SIG_DFL or SIG_IGN onto the stack. push SIG_DFL or SIG_IGN onto the stack.