Fix: #921 Failure in the help text for geoip_generator.pl

diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index ba2f740ba8dace2f4630713be9e64e7193e67476..ec7e34e4c205e891700e4cb5d422915f8d043765 100644 (file)
--- 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 4aa6828aa48515807a6ea999aead62a42b8853a3..16eda748a7d2bb6f4915d7e5b6d0d34e920cf186 100644 (file)
--- 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 2961cc8ea79c6869ca98b042c39c193ac5bcd9a7..4f53b50bd02cab83cd97c2301ca3d6601d21ca83 100755 (executable)
--- 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;
 }