From e865a2d55b0f11b74d2c97ccbaa7daf6ee24570e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 10 Feb 2014 16:39:18 +0100 Subject: [PATCH] Fix: #921 Failure in the help text for geoip_generator.pl --- docs/awstats_changelog.txt | 7 ++++--- make/pdf/htmldoc.book | 2 +- tools/geoip_generator.pl | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt index ba2f740b..ec7e34e4 100644 --- a/docs/awstats_changelog.txt +++ b/docs/awstats_changelog.txt @@ -10,11 +10,12 @@ New features: Fixes: - Fixes permission on some .pl scripts. -- #205 GetResolvedIP_ipv6 does not strip trailing dot -- #496 tools scripts should print warnings and errors to STDERR -- #919 Referrals not getting tracked due to improperly getting flagged as a search +- #205 GetResolvedIP_ipv6 does not strip trailing dot. +- #496 tools scripts should print warnings and errors to STDERR. +- #919 Referrals not getting tracked due to improperly getting flagged as a search. - Add debian patch 0007_russian_lang.patch. - Add debian patch 2001_awstatsprog_path.patch. +- #921 Failure in the help text for geoip_generator.pl ***** 7.3 ***** diff --git a/make/pdf/htmldoc.book b/make/pdf/htmldoc.book index 4aa6828a..16eda748 100644 --- a/make/pdf/htmldoc.book +++ b/make/pdf/htmldoc.book @@ -1,5 +1,5 @@ #HTMLDOC 1.8.27 --t pdf14 -f "../../docs/awstats.pdf" --webpage --no-title --logoimage "../../docs/images/awstats_logo7.png" --linkcolor #2200c0 --linkstyle plain --size Universal --left 0.30in --right 0.30in --top 0.40in --bottom 0.30in --header ... --header1 ... --footer c/d --nup 1 --tocheader ... --tocfooter ... --portrait --color --no-pscommands --no-xrxcomments --compression=9 --jpeg=50 --fontsize 10.0 --fontspacing 1.0 --headingfont Helvetica --bodyfont Helvetica --headfootsize 9.0 --headfootfont Helvetica --charset iso-8859-1 --links --no-embedfonts --pagemode document --pagelayout single --firstpage p1 --pageeffect none --pageduration 10 --effectduration 1.0 --no-encryption --permissions all --owner-password "" --user-password "" --browserwidth 680 --no-strict --no-overflow +--cookies 'htmldoc=yes;' -t pdf14 -f "../../docs/awstats.pdf" --webpage --no-title --logoimage "../../docs/images/awstats_logo7.png" --linkcolor #2200c0 --linkstyle plain --size Universal --left 0.30in --right 0.30in --top 0.40in --bottom 0.30in --header ... --header1 ... --footer c/d --nup 1 --tocheader ... --tocfooter ... --portrait --color --no-pscommands --no-xrxcomments --compression=9 --jpeg=50 --fontsize 10.0 --fontspacing 1.0 --headingfont Helvetica --bodyfont Helvetica --headfootsize 9.0 --headfootfont Helvetica --charset iso-8859-1 --links --no-embedfonts --pagemode document --pagelayout single --firstpage p1 --pageeffect none --pageduration 10 --effectduration 1.0 --no-encryption --permissions all --owner-password "" --user-password "" --browserwidth 680 --no-strict --no-overflow ../../docs/index.html ../../docs/awstats_what.html ../../docs/awstats_setup.html diff --git a/tools/geoip_generator.pl b/tools/geoip_generator.pl index 2961cc8e..4f53b50b 100755 --- a/tools/geoip_generator.pl +++ b/tools/geoip_generator.pl @@ -399,7 +399,7 @@ if ((!$SiteConfig && !$Output) || !$DBType || !$IPStart) { print " -debug=level Debug level to print\n"; print " -overwrite Deletes any entries in the file. Otherwise appends.\n"; print "\n"; - print "Allowable Type Values: GeoIP | GeoIPFree | GeoCity | GeoCityLite\n"; + print "Allowable Type Values: GeoIP | GeoIPFree | GeoIPCity | GeoIPCityLite\n"; print " GeoIPRegion | GeoIPOrg | GeoIPASN \n"; exit 0; } -- 2.47.2