summaryrefslogtreecommitdiff
path: root/perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-12 13:54:01 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-12 13:54:01 -0700
commitcaa7d79f1f7c9940acfaf161b9b84bbf81980d95 (patch)
treebbfbe6ac84575766b4752e48960d12288a8b6c42 /perl
parente2af9e361b1d7452492baa073790b19292f9c038 (diff)
parenta46221e9adcf3deb88c4fc904859205bf87f784c (diff)
downloadgit-caa7d79f1f7c9940acfaf161b9b84bbf81980d95.tar.gz
Sync with 'maint'
* maint: Correct common spelling mistakes in comments and tests kwset: fix spelling in comments precompose-utf8: fix spelling of "want" in error message compat/nedmalloc: fix spelling in comments compat/regex: fix spelling and grammar in comments obstack: fix spelling of similar contrib/subtree: fix spelling of accidentally git-remote-mediawiki: spelling fixes doc: various spelling fixes fast-export: fix argument name in error messages Documentation: distinguish between ref and offset deltas in pack-format i18n: make the translation of -u advice in one go
Diffstat (limited to 'perl')
-rw-r--r--perl/Git.pm2
-rw-r--r--perl/Git/I18N.pm2
-rw-r--r--perl/private-Error.pm2
3 files changed, 3 insertions, 3 deletions
diff --git a/perl/Git.pm b/perl/Git.pm
index 96cac39a4c..650db90853 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -1180,7 +1180,7 @@ my (%TEMP_FILEMAP, %TEMP_FILES);
=item temp_acquire ( NAME )
-Attempts to retreive the temporary file mapped to the string C<NAME>. If an
+Attempts to retrieve the temporary file mapped to the string C<NAME>. If an
associated temp file has not been created this session or was closed, it is
created, cached, and set for autoflush and binmode.
diff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm
index 40dd897191..f889fd6da9 100644
--- a/perl/Git/I18N.pm
+++ b/perl/Git/I18N.pm
@@ -68,7 +68,7 @@ Git::I18N - Perl interface to Git's Gettext localizations
print __("Welcome to Git!\n");
- printf __("The following error occured: %s\n"), $error;
+ printf __("The following error occurred: %s\n"), $error;
=head1 DESCRIPTION
diff --git a/perl/private-Error.pm b/perl/private-Error.pm
index ea14ab270a..6098135ae2 100644
--- a/perl/private-Error.pm
+++ b/perl/private-Error.pm
@@ -769,7 +769,7 @@ is a numeric value. These values are what will be returned by the
overload methods.
If the text value ends with C<at file line 1> as $@ strings do, then
-this infomation will be used to set the C<-file> and C<-line> arguments
+this information will be used to set the C<-file> and C<-line> arguments
of the error object.
This class is used internally if an eval'd block die's with an error