Merge branch 'maint'

* maint:
  Typos in code comments, an error message, documentation
This commit is contained in:
Junio C Hamano
2010-08-22 20:18:37 -07:00
17 changed files with 26 additions and 26 deletions

View File

@ -268,7 +268,7 @@ our %feature = (
# return value of feature-sub indicates if to enable specified feature
#
# if there is no 'sub' key (no feature-sub), then feature cannot be
# overriden
# overridden
#
# use gitweb_get_feature(<feature>) to retrieve the <feature> value
# (an array) or gitweb_check_feature(<feature>) to check if <feature>
@ -1346,7 +1346,7 @@ sub esc_param {
return $str;
}
# quote unsafe chars in whole URL, so some charactrs cannot be quoted
# quote unsafe chars in whole URL, so some characters cannot be quoted
sub esc_url {
my $str = shift;
return undef unless defined $str;
@ -3781,9 +3781,9 @@ sub git_print_authorship {
}
# Outputs table rows containing the full author or committer information,
# in the format expected for 'commit' view (& similia).
# in the format expected for 'commit' view (& similar).
# Parameters are a commit hash reference, followed by the list of people
# to output information for. If the list is empty it defalts to both
# to output information for. If the list is empty it defaults to both
# author and committer.
sub git_print_authorship_rows {
my $co = shift;
@ -4512,8 +4512,8 @@ sub git_patchset_body {
print "</div>\n"; # class="patch"
}
# for compact combined (--cc) format, with chunk and patch simpliciaction
# patchset might be empty, but there might be unprocessed raw lines
# for compact combined (--cc) format, with chunk and patch simplification
# the patchset might be empty, but there might be unprocessed raw lines
for (++$patch_idx if $patch_number > 0;
$patch_idx < @$difftree;
++$patch_idx) {