Skip to content

Commit e1c3bf4

Browse files
slattarinigitster
authored andcommitted
doc: various spelling fixes
Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <[email protected]> Signed-off-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7f20008 commit e1c3bf4

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

Documentation/git-credential.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ For example, if we want a password for
5656
`https://example.com/foo.git`, we might generate the following
5757
credential description (don't forget the blank line at the end; it
5858
tells `git credential` that the application finished feeding all the
59-
infomation it has):
59+
information it has):
6060

6161
protocol=https
6262
host=example.com

Documentation/git-remote-ext.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ begins with `ext::`. Examples:
8686
edit .ssh/config.
8787

8888
"ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo"::
89-
Represents repository with path /somerepo accessable over
89+
Represents repository with path /somerepo accessible over
9090
git protocol at abstract namespace address /git-server.
9191

9292
"ext::git-server-alias foo %G/repo"::

Documentation/git-svn.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ first have already been pushed into SVN.
245245
patch), "all" (accept all patches), or "quit".
246246
+
247247
'git svn dcommit' returns immediately if answer if "no" or "quit", without
248-
commiting anything to SVN.
248+
committing anything to SVN.
249249

250250
'branch'::
251251
Create a branch in the SVN repository.
@@ -856,7 +856,7 @@ HANDLING OF SVN BRANCHES
856856
------------------------
857857
If 'git svn' is configured to fetch branches (and --follow-branches
858858
is in effect), it sometimes creates multiple Git branches for one
859-
SVN branch, where the addtional branches have names of the form
859+
SVN branch, where the additional branches have names of the form
860860
'branchname@nnn' (with nnn an SVN revision number). These additional
861861
branches are created if 'git svn' cannot find a parent commit for the
862862
first commit in an SVN branch, to connect the branch to the history of

Documentation/git-tools.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Others
109109

110110
- *git.el* (contrib/)
111111

112-
This is an Emacs interface for Git. The user interface is modeled on
112+
This is an Emacs interface for Git. The user interface is modelled on
113113
pcl-cvs. It has been developed on Emacs 21 and will probably need some
114114
tweaking to work on XEmacs.
115115

Documentation/revisions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ when you run `git cherry-pick`.
5555
+
5656
Note that any of the 'refs/*' cases above may come either from
5757
the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.
58-
While the ref name encoding is unspecified, UTF-8 is prefered as
58+
While the ref name encoding is unspecified, UTF-8 is preferred as
5959
some output processing may assume ref names in UTF-8.
6060

6161
'<refname>@\{<date>\}', e.g. 'master@\{yesterday\}', 'HEAD@\{5 minutes ago\}'::

Documentation/technical/api-argv-array.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Functions
5555
initial, empty state.
5656

5757
`argv_array_detach`::
58-
Detach the argv array from the `struct argv_array`, transfering
58+
Detach the argv array from the `struct argv_array`, transferring
5959
ownership of the allocated array and strings.
6060

6161
`argv_array_free_detached`::

Documentation/technical/api-credentials.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ int foo_login(struct foo_connection *f)
160160
break;
161161
default:
162162
/*
163-
* Some other error occured. We don't know if the
163+
* Some other error occurred. We don't know if the
164164
* credential is good or bad, so report nothing to the
165165
* credential subsystem.
166166
*/

Documentation/technical/api-ref-iteration.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Iteration functions
3535
* `head_ref_submodule()`, `for_each_ref_submodule()`,
3636
`for_each_ref_in_submodule()`, `for_each_tag_ref_submodule()`,
3737
`for_each_branch_ref_submodule()`, `for_each_remote_ref_submodule()`
38-
do the same as the functions descibed above but for a specified
38+
do the same as the functions described above but for a specified
3939
submodule.
4040

4141
* `for_each_rawref()` can be used to learn about broken ref and symref.

gitweb/INSTALL

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage.
244244
through the GITWEB_CONFIG_SYSTEM environment variable.
245245

246246
Note that if per-instance configuration file exists, then system-wide
247-
configuration is _not used at all_. This is quite untypical and suprising
247+
configuration is _not used at all_. This is quite untypical and surprising
248248
behavior. On the other hand changing current behavior would break backwards
249249
compatibility and can lead to unexpected changes in gitweb behavior.
250250
Therefore gitweb also looks for common system-wide configuration file,

po/README

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ Shell:
232232

233233
# To interpolate variables:
234234
details="oh noes"
235-
eval_gettext "An error occured: \$details"; echo
235+
eval_gettext "An error occurred: \$details"; echo
236236

237237
In addition we have wrappers for messages that end with a trailing
238238
newline. I.e. you could write the above as:
@@ -242,7 +242,7 @@ Shell:
242242

243243
# To interpolate variables:
244244
details="oh noes"
245-
eval_gettextln "An error occured: \$details"
245+
eval_gettextln "An error occurred: \$details"
246246

247247
More documentation about the interface is available in the GNU info
248248
page: `info '(gettext)sh'`. Looking at git-am.sh (the first shell
@@ -257,7 +257,7 @@ Perl:
257257

258258
use Git::I18N;
259259
print __("Welcome to Git!\n");
260-
printf __("The following error occured: %s\n"), $error;
260+
printf __("The following error occurred: %s\n"), $error;
261261

262262
Run `perldoc perl/Git/I18N.pm` for more info.
263263

0 commit comments

Comments
 (0)