revert back to using a "links" downloaded version of our FAQ with an

up-to-date URL.  The FAQ included in httpd-2_0_28 isn't very pretty
because it wasn't parsed by mod_include as part of the roll script.
Add a comment explaining why this is necessary.

with this change, there's no reason to run expand.pl twice.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92428 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/httpd_roll_release b/build/httpd_roll_release
index 8fb8fd0ec51f08c89a6459d64d6b6a596e2486a3..b721f3fd86e56c5a735068c0d91f7e8159f08c1c 100755 (executable)
--- a/build/httpd_roll_release
+++ b/build/httpd_roll_release
@@ -37,9 +37,11 @@ cd $START_DIR/$WORKING_DIR
 echo "Updating the site's FAQ"
 (cd /www/httpd.apache.org/docs-2.0/faq/; cvs update)
 
-# Now update the FAQ in the tarball
+# Now update the FAQ in the tarball via a download from the master site.
+# The FAQ contains SSI tags too complex for the expand.pl script to handle.
 rm -f docs/manual/faq/*.html
-cp /www/httpd.apache.org/docs-2.0/faq/*.html docs/manual/faq/
+links -source http://httpd.apache.org/docs-2.0/faq/index.html?ONEPAGE \
+              > docs/manual/faq/index.html
 
 # Create the configure scripts
 echo "Creating the configure script"
@@ -62,8 +64,7 @@ echo "Making sure people can read the manual (expanding SSI's)"
 
 echo >> $LOG_NAME
 echo "Making sure people can read the manual (expanding SSI's)" >> $LOG_NAME
-# run expand.pl twice to handle the two levels of includes in docs/manual/
-( cd docs/manual ; chmod +x expand.pl ; ./expand.pl ; ./expand.pl ; rm ./expand.pl ) >> $LOG_NAME
+( cd docs/manual ; chmod +x expand.pl ; ./expand.pl ; rm ./expand.pl ) >> $LOG_NAME
 
 # Time to roll the tarball
 echo "Rolling the tarballs"