Merge branch 'maint-1.6.2' into maint-1.6.3

* maint-1.6.2:
Fix overridable written with an extra 'e'
Documentation: git-archive: mark --format as optional in summary
Round-down years in "years+months" relative date view

Conflicts:
Documentation/git-archive.txt

diff --combined Documentation/git-archive.txt
index bc132c87e1a5b9f42ea1f2bbd4e3c46f67fc3852,105a31a088c7846c0844d8f844eaba46061a3172..92444ddf10081ee5faccd28491b47ef1cb45deee
--- 1/Documentation/git-archive.txt
--- 2/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@@ -9,8 -9,7 +9,8 @@@ git-archive - Create an archive of file
  SYNOPSIS
  --------
  [verse]
- 'git archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
+ 'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
 +            [--output=<file>] [--worktree-attributes]
              [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
              [path...]
  
@@@ -48,12 -47,6 +48,12 @@@ OPTION
  --prefix=<prefix>/::
        Prepend <prefix>/ to each filename in the archive.
  
 +--output=<file>::
 +      Write the archive to <file> instead of stdout.
 +
 +--worktree-attributes::
 +      Look for attributes in .gitattributes in working directory too.
 +
  <extra>::
        This can be any options that the archiver backend understands.
        See next section.

diff --combined gitweb/gitweb.perl
index 3f99361ed03b8d5202cb17e894c65678364fc1ed,43fa791de0691e7800e1471a6f0dfc81ce32a9dd..6f355d80699dabc315cec5a6eaea133ca55c3e6f
--- 1/gitweb/gitweb.perl
--- 2/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@@ -376,7 -376,7 +376,7 @@@ sub gitweb_get_feature 
                @{$feature{$name}{'default'}});
        if (!$override) { return @defaults; }
        if (!defined $sub) {
-               warn "feature $name is not overrideable";
+               warn "feature $name is not overridable";
                return @defaults;
        }
        return $sub->(@defaults);
@@@ -688,10 -688,10 +688,10 @@@ sub evaluate_path_info 
                # extensions. Allowed extensions are both the defined suffix
                # (which includes the initial dot already) and the snapshot
                # format key itself, with a prepended dot
 -              while (my ($fmt, %opt) = each %known_snapshot_formats) {
 +              while (my ($fmt, $opt) = each %known_snapshot_formats) {
                        my $hash = $refname;
                        my $sfx;
 -                      $hash =~ s/(\Q$opt{'suffix'}\E|\Q.$fmt\E)$//;
 +                      $hash =~ s/(\Q$opt->{'suffix'}\E|\Q.$fmt\E)$//;
                        next unless $sfx = $1;
                        # a valid suffix was found, so set the snapshot format
                        # and reset the hash parameter