From c3dac7ca6ca0c3bbee9bd37cda2f68eba624532b Mon Sep 17 00:00:00 2001 From: Greg Ames Date: Tue, 11 Dec 2001 19:28:38 +0000 Subject: [PATCH] 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 --- build/httpd_roll_release | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/httpd_roll_release b/build/httpd_roll_release index 8fb8fd0ec5..b721f3fd86 100755 --- 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" -- 2.40.0