Sync with v2.2.1

diff --git a/Documentation/build-docdep.perl b/Documentation/build-docdep.perl
index 6ff35e02faf386f103fd691d8ccca346e181614c..ba4205e0302a267a5da6bef504f3e69eb0c4aa6d 100755 (executable)
--- a/Documentation/build-docdep.perl
+++ b/Documentation/build-docdep.perl
@@ -22,15 +22,11 @@
 while ($changed) {
     $changed = 0;
     while (my ($text, $included) = each %include) {
-       print STDERR "Looking at $text...\n";
        for my $i (keys %$included) {
-           print STDERR "$text includes $i.\n";
            # $text has include::$i; if $i includes $j
            # $text indirectly includes $j.
            if (exists $include{$i}) {
-               print STDERR "$i includes something.\n";
                for my $j (keys %{$include{$i}}) {
-                   print STDERR "$text includes $i include $j\n";
                    if (!exists $include{$text}{$j}) {
                        $include{$text}{$j} = 1;
                        $included{$j} = 1;
@@ -45,10 +41,6 @@
 while (my ($text, $included) = each %include) {
     if (! exists $included{$text} &&
        (my $base = $text) =~ s/\.txt$//) {
-       my ($suffix) = '1';
-       if ($base eq 'git') {
-           $suffix = '7'; # yuck...
-       }
-       print "$base.html $base.$suffix : ", join(" ", keys %$included), "\n";
+       print "$base.html $base.xml : ", join(" ", keys %$included), "\n";
     }
 }