зеркало из https://github.com/microsoft/git.git
doc: various spelling fixes
Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
7f20008d14
Коммит
e1c3bf496f
|
@ -56,7 +56,7 @@ For example, if we want a password for
|
||||||
`https://example.com/foo.git`, we might generate the following
|
`https://example.com/foo.git`, we might generate the following
|
||||||
credential description (don't forget the blank line at the end; it
|
credential description (don't forget the blank line at the end; it
|
||||||
tells `git credential` that the application finished feeding all the
|
tells `git credential` that the application finished feeding all the
|
||||||
infomation it has):
|
information it has):
|
||||||
|
|
||||||
protocol=https
|
protocol=https
|
||||||
host=example.com
|
host=example.com
|
||||||
|
|
|
@ -86,7 +86,7 @@ begins with `ext::`. Examples:
|
||||||
edit .ssh/config.
|
edit .ssh/config.
|
||||||
|
|
||||||
"ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo"::
|
"ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo"::
|
||||||
Represents repository with path /somerepo accessable over
|
Represents repository with path /somerepo accessible over
|
||||||
git protocol at abstract namespace address /git-server.
|
git protocol at abstract namespace address /git-server.
|
||||||
|
|
||||||
"ext::git-server-alias foo %G/repo"::
|
"ext::git-server-alias foo %G/repo"::
|
||||||
|
|
|
@ -245,7 +245,7 @@ first have already been pushed into SVN.
|
||||||
patch), "all" (accept all patches), or "quit".
|
patch), "all" (accept all patches), or "quit".
|
||||||
+
|
+
|
||||||
'git svn dcommit' returns immediately if answer if "no" or "quit", without
|
'git svn dcommit' returns immediately if answer if "no" or "quit", without
|
||||||
commiting anything to SVN.
|
committing anything to SVN.
|
||||||
|
|
||||||
'branch'::
|
'branch'::
|
||||||
Create a branch in the SVN repository.
|
Create a branch in the SVN repository.
|
||||||
|
@ -856,7 +856,7 @@ HANDLING OF SVN BRANCHES
|
||||||
------------------------
|
------------------------
|
||||||
If 'git svn' is configured to fetch branches (and --follow-branches
|
If 'git svn' is configured to fetch branches (and --follow-branches
|
||||||
is in effect), it sometimes creates multiple Git branches for one
|
is in effect), it sometimes creates multiple Git branches for one
|
||||||
SVN branch, where the addtional branches have names of the form
|
SVN branch, where the additional branches have names of the form
|
||||||
'branchname@nnn' (with nnn an SVN revision number). These additional
|
'branchname@nnn' (with nnn an SVN revision number). These additional
|
||||||
branches are created if 'git svn' cannot find a parent commit for the
|
branches are created if 'git svn' cannot find a parent commit for the
|
||||||
first commit in an SVN branch, to connect the branch to the history of
|
first commit in an SVN branch, to connect the branch to the history of
|
||||||
|
|
|
@ -109,7 +109,7 @@ Others
|
||||||
|
|
||||||
- *git.el* (contrib/)
|
- *git.el* (contrib/)
|
||||||
|
|
||||||
This is an Emacs interface for Git. The user interface is modeled on
|
This is an Emacs interface for Git. The user interface is modelled on
|
||||||
pcl-cvs. It has been developed on Emacs 21 and will probably need some
|
pcl-cvs. It has been developed on Emacs 21 and will probably need some
|
||||||
tweaking to work on XEmacs.
|
tweaking to work on XEmacs.
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,7 @@ when you run `git cherry-pick`.
|
||||||
+
|
+
|
||||||
Note that any of the 'refs/*' cases above may come either from
|
Note that any of the 'refs/*' cases above may come either from
|
||||||
the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.
|
the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.
|
||||||
While the ref name encoding is unspecified, UTF-8 is prefered as
|
While the ref name encoding is unspecified, UTF-8 is preferred as
|
||||||
some output processing may assume ref names in UTF-8.
|
some output processing may assume ref names in UTF-8.
|
||||||
|
|
||||||
'<refname>@\{<date>\}', e.g. 'master@\{yesterday\}', 'HEAD@\{5 minutes ago\}'::
|
'<refname>@\{<date>\}', e.g. 'master@\{yesterday\}', 'HEAD@\{5 minutes ago\}'::
|
||||||
|
|
|
@ -55,7 +55,7 @@ Functions
|
||||||
initial, empty state.
|
initial, empty state.
|
||||||
|
|
||||||
`argv_array_detach`::
|
`argv_array_detach`::
|
||||||
Detach the argv array from the `struct argv_array`, transfering
|
Detach the argv array from the `struct argv_array`, transferring
|
||||||
ownership of the allocated array and strings.
|
ownership of the allocated array and strings.
|
||||||
|
|
||||||
`argv_array_free_detached`::
|
`argv_array_free_detached`::
|
||||||
|
|
|
@ -160,7 +160,7 @@ int foo_login(struct foo_connection *f)
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
/*
|
/*
|
||||||
* Some other error occured. We don't know if the
|
* Some other error occurred. We don't know if the
|
||||||
* credential is good or bad, so report nothing to the
|
* credential is good or bad, so report nothing to the
|
||||||
* credential subsystem.
|
* credential subsystem.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -35,7 +35,7 @@ Iteration functions
|
||||||
* `head_ref_submodule()`, `for_each_ref_submodule()`,
|
* `head_ref_submodule()`, `for_each_ref_submodule()`,
|
||||||
`for_each_ref_in_submodule()`, `for_each_tag_ref_submodule()`,
|
`for_each_ref_in_submodule()`, `for_each_tag_ref_submodule()`,
|
||||||
`for_each_branch_ref_submodule()`, `for_each_remote_ref_submodule()`
|
`for_each_branch_ref_submodule()`, `for_each_remote_ref_submodule()`
|
||||||
do the same as the functions descibed above but for a specified
|
do the same as the functions described above but for a specified
|
||||||
submodule.
|
submodule.
|
||||||
|
|
||||||
* `for_each_rawref()` can be used to learn about broken ref and symref.
|
* `for_each_rawref()` can be used to learn about broken ref and symref.
|
||||||
|
|
|
@ -244,7 +244,7 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage.
|
||||||
through the GITWEB_CONFIG_SYSTEM environment variable.
|
through the GITWEB_CONFIG_SYSTEM environment variable.
|
||||||
|
|
||||||
Note that if per-instance configuration file exists, then system-wide
|
Note that if per-instance configuration file exists, then system-wide
|
||||||
configuration is _not used at all_. This is quite untypical and suprising
|
configuration is _not used at all_. This is quite untypical and surprising
|
||||||
behavior. On the other hand changing current behavior would break backwards
|
behavior. On the other hand changing current behavior would break backwards
|
||||||
compatibility and can lead to unexpected changes in gitweb behavior.
|
compatibility and can lead to unexpected changes in gitweb behavior.
|
||||||
Therefore gitweb also looks for common system-wide configuration file,
|
Therefore gitweb also looks for common system-wide configuration file,
|
||||||
|
|
|
@ -232,7 +232,7 @@ Shell:
|
||||||
|
|
||||||
# To interpolate variables:
|
# To interpolate variables:
|
||||||
details="oh noes"
|
details="oh noes"
|
||||||
eval_gettext "An error occured: \$details"; echo
|
eval_gettext "An error occurred: \$details"; echo
|
||||||
|
|
||||||
In addition we have wrappers for messages that end with a trailing
|
In addition we have wrappers for messages that end with a trailing
|
||||||
newline. I.e. you could write the above as:
|
newline. I.e. you could write the above as:
|
||||||
|
@ -242,7 +242,7 @@ Shell:
|
||||||
|
|
||||||
# To interpolate variables:
|
# To interpolate variables:
|
||||||
details="oh noes"
|
details="oh noes"
|
||||||
eval_gettextln "An error occured: \$details"
|
eval_gettextln "An error occurred: \$details"
|
||||||
|
|
||||||
More documentation about the interface is available in the GNU info
|
More documentation about the interface is available in the GNU info
|
||||||
page: `info '(gettext)sh'`. Looking at git-am.sh (the first shell
|
page: `info '(gettext)sh'`. Looking at git-am.sh (the first shell
|
||||||
|
@ -257,7 +257,7 @@ Perl:
|
||||||
|
|
||||||
use Git::I18N;
|
use Git::I18N;
|
||||||
print __("Welcome to Git!\n");
|
print __("Welcome to Git!\n");
|
||||||
printf __("The following error occured: %s\n"), $error;
|
printf __("The following error occurred: %s\n"), $error;
|
||||||
|
|
||||||
Run `perldoc perl/Git/I18N.pm` for more info.
|
Run `perldoc perl/Git/I18N.pm` for more info.
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче