---------------------
PatchSet 11681 
Date: 2007/09/19 21:29:57
Author: hno
Branch: HEAD
Tag: (none) 
Log:
Fix version number in configuration manual proper (forgot one of the copies)

also brings over the mksnapshot cleanups from squid-3

Members: 
	mksnapshot.sh:1.16->1.17 

Index: squid/mksnapshot.sh
===================================================================
RCS file: /cvsroot/squid/squid/mksnapshot.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- squid/mksnapshot.sh	19 Sep 2007 21:23:15 -0000	1.16
+++ squid/mksnapshot.sh	19 Sep 2007 21:29:57 -0000	1.17
@@ -37,7 +37,7 @@
 ./configure --silent
 make -s dist-all
 
-basetarball=/server/httpd/htdocs/squid-cache.org/Versions/v2/`echo $VERSION | cut -d. -f-2`/${PACKAGE}-${VERSION}.tar.bz2
+basetarball=/server/httpd/htdocs/squid-cache.org/Versions/v`echo $VERSION | cut -d. -f1`/`echo $VERSION | cut -d. -f-2|cut -d- -f1`/${PACKAGE}-${VERSION}.tar.bz2
 if (echo $VERSION | grep PRE) || (echo $VERSION | grep STABLE); then
 	echo "Differences from ${PACKAGE}-${VERSION} to ${PACKAGE}-${VERSION}-${date}" >${PACKAGE}-${VERSION}-${date}.diff
 	if [ -f $basetarball ]; then
@@ -45,7 +45,7 @@
 		tar jxf $basetarball
 		diff -ruN ${PACKAGE}-${VERSION} ${PACKAGE}-${VERSION}-${date} >>${PACKAGE}-${VERSION}-${date}.diff || true
 	else
-		cvs -q rdiff -u -r SQUID_`echo $VERSION | tr .- __` -r $tag $module >>${PACKAGE}-${VERSION}-${date}.diff
+		cvs -q rdiff -u -r SQUID_`echo $VERSION | tr .- __` -r $tag $module >>${PACKAGE}-${VERSION}-${date}.diff || true
 	fi
 elif [ -f STABLE_BRANCH ]; then
 	stable=`cat STABLE_BRANCH`
@@ -78,7 +78,7 @@
 if [ -x $tmpdir/scripts/www/build-cfg-help.pl ]; then
 	make -C $tmpdir/src cf.data
 	mkdir -p $tmpdir/doc/cfgman
-	$tmpdir/scripts/www/build-cfg-help.pl -o $tmpdir/doc/cfgman $tmpdir/src/cf.data
+	$tmpdir/scripts/www/build-cfg-help.pl --version ${VERSION} -o $tmpdir/doc/cfgman $tmpdir/src/cf.data
 	sh -c "cd $tmpdir/doc/cfgman && tar -zcf $PWD/${PACKAGE}-${VERSION}-${date}-cfgman.tar.gz *"
 	echo ${PACKAGE}-${VERSION}-${date}-cfgman.tar.gz >>${tag}.out
 	$tmpdir/scripts/www/build-cfg-help.pl --version ${VERSION} -o ${PACKAGE}-${VERSION}-${date}-cfgman.html -f singlehtml $tmpdir/src/cf.data