Merge branch 'cb/merge-recursive-fix'

diff --git a/Documentation/install-webdoc.sh b/Documentation/install-webdoc.sh
index cd3a18eb7fa73b01e9d3a9489711292148f088e6..2135a8ee1f4f56a8c799437949ba76d7526164c0 100755 (executable)
--- a/Documentation/install-webdoc.sh
+++ b/Documentation/install-webdoc.sh
@@ -2,9 +2,16 @@
 
 T="$1"
 
-for h in *.html *.txt howto/*.txt howto/*.html RelNotes-*.txt *.css
+for h in \
+       *.txt *.html \
+       howto/*.txt howto/*.html \
+       technical/*.txt technical/*.html \
+       RelNotes-*.txt *.css
 do
-       if test -f "$T/$h" &&
+       if test ! -f "$h"
+       then
+               : did not match
+       elif test -f "$T/$h" &&
           diff -u -I'Last updated [0-9][0-9]-[A-Z][a-z][a-z]-' "$T/$h" "$h"
        then
                :; # up to date
@@ -16,7 +23,10 @@ do
        fi
 done
 strip_leading=`echo "$T/" | sed -e 's|.|.|g'`
-for th in "$T"/*.html "$T"/*.txt "$T"/howto/*.txt "$T"/howto/*.html
+for th in \
+       "$T"/*.html "$T"/*.txt \
+       "$T"/howto/*.txt "$T"/howto/*.html \
+       "$T"/technical/*.txt "$T"/technical/*.html
 do
        h=`expr "$th" : "$strip_leading"'\(.*\)'`
        case "$h" in