Upstream updates from the bionic upgrade(?)

diff --git a/awstats.conf.distrib b/awstats.conf.distrib
index 3e5cba4aab2e216b381719b7c38d23445d6d81b8..dab8de199a2eb6c2a64fad47db56e52ab1c37155 100644 (file)
--- a/awstats.conf.distrib
+++ b/awstats.conf.distrib
@@ -82,7 +82,7 @@ LogType=W
 #   %time2            Date and time with format: yyyy-mm-dd hh:mm:ss
 #   %time3            Date and time with format: Mon dd hh:mm:ss or Mon dd hh:mm:ss yyyy
 #   %time4            Date and time with unix timestamp format: dddddddddd
 #   %time2            Date and time with format: yyyy-mm-dd hh:mm:ss
 #   %time3            Date and time with format: Mon dd hh:mm:ss or Mon dd hh:mm:ss yyyy
 #   %time4            Date and time with unix timestamp format: dddddddddd

-#   %time5            Date and time with format iso: yyyy-mm-ddThh:mm:ss
+#   %time5            Date and time with format iso: yyyy-mm-ddThh:mm:ss, with optional timezone specification (ignored)

 #   %methodurl        Method and URL with format: "GET /index.html HTTP/x.x"
 #   %methodurlnoprot  Method and URL with format: "GET /index.html"
 #   %method           Method with format: GET
 #   %methodurl        Method and URL with format: "GET /index.html HTTP/x.x"
 #   %methodurlnoprot  Method and URL with format: "GET /index.html"
 #   %method           Method with format: GET


@@ -111,6 +111,9 @@ LogType=W
 #   If your log format has some fields not included in this list, use:
 #   %other            Means another not used field
 #   %otherquot        Means another not used double quoted field
 #   If your log format has some fields not included in this list, use:
 #   %other            Means another not used field
 #   %otherquot        Means another not used double quoted field

+#   If your log format has some literal strings, which precede data fields, use
+#   status=%code      Means your log files have HTTP status logged as "status=200"
+#   Literal strings that follow data field must be separated from said data fields by space.

 #
 # Examples for Apache combined logs (following two examples are equivalent):
 # LogFormat = 1
 #
 # Examples for Apache combined logs (following two examples are equivalent):
 # LogFormat = 1


@@ -184,11 +187,25 @@ HostAliases="localhost 127.0.0.1"
 # 1 - DNS Lookup is fully enabled
 # 2 - DNS Lookup is made only from static DNS cache file (if it exists)
 # Default: 2
 # 1 - DNS Lookup is fully enabled
 # 2 - DNS Lookup is made only from static DNS cache file (if it exists)
 # Default: 2

-# 
+#

 DNSLookup=1
 
 
 DNSLookup=1
 
 

-# When AWStats updates its statistics, it stores results of its analysis in 
+# For very large sites, setting DNSLookup to 0 (or 2) might be the only
+# reasonable choice. DynamicDNSLookup allows to resolve host names for
+# items shown in html tables only, when data is output on reports instead
+# of resolving once during log analysis step.
+# Possible values:
+# 0 - No dynamic DNS lookup
+# 1 - Dynamic DNS lookup enabled
+# 2 - Dynamic DNS lookup enabled (including static DNS cache file as a second
+#     source)
+# Default: 0
+#
+DynamicDNSLookup=0
+
+
+# When AWStats updates its statistics, it stores results of its analysis in

 # files (AWStats database). All those files are written in the directory
 # defined by the "DirData" parameter. Set this value to the directory where
 # you want AWStats to save its database and working files into.
 # files (AWStats database). All those files are written in the directory
 # defined by the "DirData" parameter. Set this value to the directory where
 # you want AWStats to save its database and working files into.


@@ -240,7 +257,7 @@ AllowToUpdateStatsFromBrowser=0
 
 
 # AWStats saves and sorts its database on a month basis (except if using
 
 
 # AWStats saves and sorts its database on a month basis (except if using

-# databasebreak option from command line). 
+# databasebreak option from command line).

 # However, if you choose the -month=all from command line or
 # value '-Year-' from CGI combo form to have a report for all year, AWStats
 # needs to reload all data for full year (each month), and sort them,
 # However, if you choose the -month=all from command line or
 # value '-Year-' from CGI combo form to have a report for all year, AWStats
 # needs to reload all data for full year (each month), and sort them,


@@ -261,7 +278,7 @@ AllowFullYearView=2
 
 
 #-----------------------------------------------------------------------------
 
 
 #-----------------------------------------------------------------------------

-# OPTIONAL SETUP SECTION (Not required but increase AWStats features)
+# OPTIONAL SETUP SECTION (Not required but enhances AWStats's functionality)

 #-----------------------------------------------------------------------------
 
 # When the update process runs, AWStats can set a lock file in TEMP or TMP
 #-----------------------------------------------------------------------------
 
 # When the update process runs, AWStats can set a lock file in TEMP or TMP


@@ -272,7 +289,7 @@ AllowFullYearView=2
 # lock file not correctly removed (killed process for example requires that
 # you remove the file manualy), this option is not enabled by default (Do
 # not enable this option with no console server access).
 # lock file not correctly removed (killed process for example requires that
 # you remove the file manualy), this option is not enabled by default (Do
 # not enable this option with no console server access).

-# Change : Effective immediatly
+# Change : Effective immediately

 # Possible values: 0 or 1
 # Default: 0
 #
 # Possible values: 0 or 1
 # Default: 0
 #


@@ -318,11 +335,11 @@ SkipDNSLookupFor=""
 
 
 # The following two parameters allow you to protect a config file from being
 
 
 # The following two parameters allow you to protect a config file from being

-# read by AWStats when called from a browser if web user has not been
+# read by AWStats when called from a browser if the web user has not been

 # authenticated. Your AWStats program must be in a web protected "realm" (With
 # Apache, you can use .htaccess files to do so. With other web servers, see
 # your server setup manual).
 # authenticated. Your AWStats program must be in a web protected "realm" (With
 # Apache, you can use .htaccess files to do so. With other web servers, see
 # your server setup manual).

-# Change : Effective immediatly
+# Change : Effective immediately

 # Possible values: 0 or 1
 # Default: 0
 #
 # Possible values: 0 or 1
 # Default: 0
 #


@@ -332,7 +349,7 @@ AllowAccessFromWebToAuthenticatedUsersOnly=0
 # This parameter gives the list of all authorized authenticated users to view
 # statistics for this domain/config file. This parameter is used only if
 # AllowAccessFromWebToAuthenticatedUsersOnly is set to 1.
 # This parameter gives the list of all authorized authenticated users to view
 # statistics for this domain/config file. This parameter is used only if
 # AllowAccessFromWebToAuthenticatedUsersOnly is set to 1.

-# Change : Effective immediatly
+# Change : Effective immediately

 # Example: "user1 user2"
 # Example: "__REMOTE_USER__"
 # Default: ""
 # Example: "user1 user2"
 # Example: "__REMOTE_USER__"
 # Default: ""


@@ -343,7 +360,7 @@ AllowAccessFromWebToFollowingAuthenticatedUsers=""
 # When this parameter is defined to something, the IP address of the user that
 # reads its statistics from a browser (when AWStats is used as a CGI) is
 # checked and must match one of the IP address values or ranges.
 # When this parameter is defined to something, the IP address of the user that
 # reads its statistics from a browser (when AWStats is used as a CGI) is
 # checked and must match one of the IP address values or ranges.

-# Change : Effective immediatly
+# Change : Effective immediately

 # Example: "127.0.0.1 123.123.123.1-123.123.123.255"
 # Default: ""
 #
 # Example: "127.0.0.1 123.123.123.1-123.123.123.255"
 # Default: ""
 #


@@ -352,10 +369,10 @@ AllowAccessFromWebToFollowingIPAddresses=""
 
 # If the "DirData" directory (see above) does not exist, AWStats return an
 # error. However, you can ask AWStats to create it.
 
 # If the "DirData" directory (see above) does not exist, AWStats return an
 # error. However, you can ask AWStats to create it.

-# This option can be used by some Web Hosting Providers that has defined a 
+# This option can be used by some Web Hosting Providers that has defined a

 # dynamic value for DirData (for example DirData="/home/__REMOTE_USER__") and
 # don't want to have to create a new directory each time they add a new user.
 # dynamic value for DirData (for example DirData="/home/__REMOTE_USER__") and
 # don't want to have to create a new directory each time they add a new user.

-# Change : Effective immediatly
+# Change : Effective immediately

 # Possible values: 0 or 1
 # Default: 0
 #
 # Possible values: 0 or 1
 # Default: 0
 #


@@ -375,7 +392,7 @@ BuildHistoryFormat=text
 # If you prefer having the report output pages be built as XML compliant pages
 # instead of simple HTML pages, you can set this to 'xhtml' (May not work
 # properly with old browsers).
 # If you prefer having the report output pages be built as XML compliant pages
 # instead of simple HTML pages, you can set this to 'xhtml' (May not work
 # properly with old browsers).

-# Change : Effective immediatly
+# Change : Effective immediately

 # Possible values: html or xhtml
 # Default: html
 #
 # Possible values: html or xhtml
 # Default: html
 #


@@ -387,9 +404,9 @@ BuildReportFormat=html
 # for both command line user and default web server user (nobody for Unix,
 # IUSR_xxx for IIS/Windows,...).
 # To avoid permission problems between update process (run by an admin user)
 # for both command line user and default web server user (nobody for Unix,
 # IUSR_xxx for IIS/Windows,...).
 # To avoid permission problems between update process (run by an admin user)

-# and CGI process (ran by a low level user), AWStats can save its database 
+# and CGI process (ran by a low level user), AWStats can save its database

 # files with read and write permissions for everyone.
 # files with read and write permissions for everyone.

-# By default, AWStats keeps default user permissions on updated files. If you 
+# By default, AWStats keeps default user permissions on updated files. If you

 # set AllowToUpdateStatsFromBrowser to 1, you can change this parameter to 1.
 # Change : Effective for new updates only
 # Possible values: 0 or 1
 # set AllowToUpdateStatsFromBrowser to 1, you can change this parameter to 1.
 # Change : Effective for new updates only
 # Possible values: 0 or 1


@@ -579,9 +596,9 @@ OnlyFiles=""
 # Change : Effective for new updates only
 # Example: "css js class gif jpg jpeg png bmp ico rss xml swf zip arj rar gz z bz2 wav mp3 wma mpg avi"
 # Example: ""
 # Change : Effective for new updates only
 # Example: "css js class gif jpg jpeg png bmp ico rss xml swf zip arj rar gz z bz2 wav mp3 wma mpg avi"
 # Example: ""

-# Default: "css js class gif jpg jpeg png bmp ico rss xml swf"
+# Default: "css js class gif jpg jpeg png bmp ico rss xml swf eot woff woff2"

 #
 #

-NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf"
+NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf eot woff woff2"

 
 
 # By default, AWStats considers that records found in web log file are
 
 
 # By default, AWStats considers that records found in web log file are


@@ -590,7 +607,7 @@ NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf"
 # Note that HTTP 'control codes', like redirection (302, 305) are not added by
 # default in this list as they are not pages seen by a visitor but are
 # protocol exchange codes to tell the browser to ask another page. Because
 # Note that HTTP 'control codes', like redirection (302, 305) are not added by
 # default in this list as they are not pages seen by a visitor but are
 # protocol exchange codes to tell the browser to ask another page. Because

-# this other page will be counted and seen with a 200 or 304 code, if you 
+# this other page will be counted and seen with a 200 or 304 code, if you

 # add such codes, you will have 2 pages viewed reported for only one in facts.
 # Change : Effective for new updates only
 # Example: "200 304 302 305"
 # add such codes, you will have 2 pages viewed reported for only one in facts.
 # Change : Effective for new updates only
 # Example: "200 304 302 305"


@@ -625,7 +642,7 @@ TrapInfosForHTTPErrorCodes = "400 403 404"
 # Change : Effective for new updates only
 # Possible values: 0 or 1
 # Default: 0
 # Change : Effective for new updates only
 # Possible values: 0 or 1
 # Default: 0

-# 
+#

 AuthenticatedUsersNotCaseSensitive=0
 
 
 AuthenticatedUsersNotCaseSensitive=0
 
 


@@ -635,7 +652,7 @@ AuthenticatedUsersNotCaseSensitive=0
 # Change : Effective for new updates only
 # Possible values: 0 or 1
 # Default: 0
 # Change : Effective for new updates only
 # Possible values: 0 or 1
 # Default: 0

-# 
+#

 URLNotCaseSensitive=0
 
 
 URLNotCaseSensitive=0
 
 


@@ -665,14 +682,14 @@ URLQuerySeparators="?;"
 # Warning, when set to 1, memory required to run AWStats is dramatically
 # increased if you have a lot of changing URLs (for example URLs with a random
 # id inside). Such web sites should not set this option to 1 or use seriously
 # Warning, when set to 1, memory required to run AWStats is dramatically
 # increased if you have a lot of changing URLs (for example URLs with a random
 # id inside). Such web sites should not set this option to 1 or use seriously

-# the next parameter URLWithQueryWithOnlyFollowingParameters (or eventually 
+# the next parameter URLWithQueryWithOnlyFollowingParameters (or eventually

 # URLWithQueryWithoutFollowingParameters).
 # Change : Effective for new updates only
 # Possible values:
 # 0 - URLs are cleaned from the query string (ie: "/mypage.html")
 # 1 - Full URL with query string is used     (ie: "/mypage.html?p=x&q=y")
 # Default: 0
 # URLWithQueryWithoutFollowingParameters).
 # Change : Effective for new updates only
 # Possible values:
 # 0 - URLs are cleaned from the query string (ie: "/mypage.html")
 # 1 - Full URL with query string is used     (ie: "/mypage.html?p=x&q=y")
 # Default: 0

-# 
+#

 URLWithQuery=0
 
 
 URLWithQuery=0
 
 


@@ -690,7 +707,7 @@ URLWithQuery=0
 # Change : Effective for new updates only
 # Example: "param"
 # Default: ""
 # Change : Effective for new updates only
 # Example: "param"
 # Default: ""

-# 
+#

 URLWithQueryWithOnlyFollowingParameters=""
 
 
 URLWithQueryWithOnlyFollowingParameters=""
 
 


@@ -708,7 +725,7 @@ URLWithQueryWithOnlyFollowingParameters=""
 # Change : Effective for new updates only
 # Example: "PHPSESSID jsessionid"
 # Default: ""
 # Change : Effective for new updates only
 # Example: "PHPSESSID jsessionid"
 # Default: ""

-# 
+#

 URLWithQueryWithoutFollowingParameters=""
 
 
 URLWithQueryWithoutFollowingParameters=""
 
 


@@ -721,13 +738,13 @@ URLWithQueryWithoutFollowingParameters=""
 # 0 - Referrer URLs are cleaned from the query string (ie: "/mypage.html")
 # 1 - Full URL with query string is used      (ie: "/mypage.html?p=x&q=y")
 # Default: 0
 # 0 - Referrer URLs are cleaned from the query string (ie: "/mypage.html")
 # 1 - Full URL with query string is used      (ie: "/mypage.html?p=x&q=y")
 # Default: 0

-# 
+#

 URLReferrerWithQuery=0
 
 
 # AWStats can detect setup problems or show you important informations to have
 # a better use. Keep this to 1, except if AWStats says you can change it.
 URLReferrerWithQuery=0
 
 
 # AWStats can detect setup problems or show you important informations to have
 # a better use. Keep this to 1, except if AWStats says you can change it.

-# Change : Effective immediatly
+# Change : Effective immediately

 # Possible values: 0 or 1
 # Default: 1
 #
 # Possible values: 0 or 1
 # Default: 1
 #


@@ -737,7 +754,7 @@ WarningMessages=1
 # When an error occurs, AWStats outputs a message related to errors. If you
 # want (in most cases for security reasons) to have no error messages, you
 # can set this parameter to your personalized generic message.
 # When an error occurs, AWStats outputs a message related to errors. If you
 # want (in most cases for security reasons) to have no error messages, you
 # can set this parameter to your personalized generic message.

-# Change : Effective immediatly
+# Change : Effective immediately

 # Example: "An error occurred. Contact your Administrator"
 # Default: ""
 #
 # Example: "An error occurred. Contact your Administrator"
 # Default: ""
 #


@@ -747,7 +764,7 @@ ErrorMessages=""
 # AWStat can be run with debug=x parameter to output various informations
 # to help in debugging or solving troubles. If you want to allow this (not
 # enabled by default for security reasons), set this parameter to 0.
 # AWStat can be run with debug=x parameter to output various informations
 # to help in debugging or solving troubles. If you want to allow this (not
 # enabled by default for security reasons), set this parameter to 0.

-# Change : Effective immediatly
+# Change : Effective immediately

 # Possible values: 0 or 1
 # Default: 0
 #
 # Possible values: 0 or 1
 # Default: 0
 #


@@ -770,7 +787,7 @@ NbOfLinesForCorruptedLog=50
 # For some particular integration needs, you may want to have CGI links to
 # point to another script than awstats.pl.
 # Use the name of this script in WrapperScript parameter.
 # For some particular integration needs, you may want to have CGI links to
 # point to another script than awstats.pl.
 # Use the name of this script in WrapperScript parameter.

-# Change : Effective immediatly
+# Change : Effective immediately

 # Example: "awstatslauncher.pl"
 # Example: "awstatswrapper.cgi?key=123"
 # Default: ""
 # Example: "awstatslauncher.pl"
 # Example: "awstatswrapper.cgi?key=123"
 # Default: ""


@@ -900,9 +917,9 @@ Expires=0
 
 # To avoid too large web pages, you can ask AWStats to limit number of rows of
 # all reported charts to this number when no other limits apply.
 
 # To avoid too large web pages, you can ask AWStats to limit number of rows of
 # all reported charts to this number when no other limits apply.

-# Default: 1000
+# Default: 10000

 #
 #

-MaxRowsInHTMLOutput=1000
+MaxRowsInHTMLOutput=10000

 
 
 # Set your primary language (ISO-639-1 language codes).
 
 
 # Set your primary language (ISO-639-1 language codes).


@@ -933,7 +950,7 @@ DirLang="/usr/share/awstats/lang"
 # Possible values: 0 or 1
 # Default: 1
 #
 # Possible values: 0 or 1
 # Default: 1
 #

-ShowMenu=1                                     
+ShowMenu=1

 
 
 # You choose here which reports you want to see in the main page and what you
 
 
 # You choose here which reports you want to see in the main page and what you


@@ -947,7 +964,7 @@ ShowMenu=1
 #        V = Visits
 #        P = Number of pages
 #        H = Number of hits (or mails)
 #        V = Visits
 #        P = Number of pages
 #        H = Number of hits (or mails)

-#        B = Bandwith (or total mail size for mail logs)
+#        B = Bandwidth (or total mail size for mail logs)

 #        L = Last access date
 #        E = Entry pages
 #        X = Exit pages
 #        L = Last access date
 #        E = Entry pages
 #        X = Exit pages


@@ -1033,12 +1050,12 @@ ShowFileTypesStats=HB
 # Show file size chart (Not yet available)
 # Context: Web, Streaming, Mail, Ftp
 # Default: 1, Possible column codes: None
 # Show file size chart (Not yet available)
 # Context: Web, Streaming, Mail, Ftp
 # Default: 1, Possible column codes: None

-ShowFileSizesStats=0   
+ShowFileSizesStats=0

 
 # Show downloads chart.
 # Context: Web, Streaming, Ftp
 # Default: HB, Possible column codes: HB
 
 # Show downloads chart.
 # Context: Web, Streaming, Ftp
 # Default: HB, Possible column codes: HB

-ShowDownloadsStats=HB  
+ShowDownloadsStats=HB

 
 # Show operating systems chart
 # Context: Web, Streaming, Ftp
 
 # Show operating systems chart
 # Context: Web, Streaming, Ftp


@@ -1227,7 +1244,7 @@ HTMLEndSection=""
 
 
 # By default AWStats page contains meta tag robots=noindex,nofollow
 
 
 # By default AWStats page contains meta tag robots=noindex,nofollow

-# If you want to have your statistics to be indexed, set this option to 1. 
+# If you want to have your statistics to be indexed, set this option to 1.

 # Default: 0
 #
 MetaRobot=0
 # Default: 0
 #
 MetaRobot=0


@@ -1275,7 +1292,7 @@ color_textpercent="606060"                # Color of text for percent values (Default = "60606
 color_titletext="000000"               # Color of text title within colored Title Rows (Default = "000000")
 color_weekend="EAEAEA"                 # Color for week-end days (Default = "EAEAEA")
 color_link="0011BB"                            # Color of HTML links (Default = "0011BB")
 color_titletext="000000"               # Color of text title within colored Title Rows (Default = "000000")
 color_weekend="EAEAEA"                 # Color for week-end days (Default = "EAEAEA")
 color_link="0011BB"                            # Color of HTML links (Default = "0011BB")

-color_hover="605040"                   # Color of HTML on-mouseover links (Default = "605040") 
+color_hover="605040"                   # Color of HTML on-mouseover links (Default = "605040")

 color_u="FFAA66"                               # Background color for number of unique visitors (Default = "FFAA66")
 color_v="F4F090"                               # Background color for number of visites (Default = "F4F090")
 color_p="4477DD"                               # Background color for number of pages (Default = "4477DD")
 color_u="FFAA66"                               # Background color for number of unique visitors (Default = "FFAA66")
 color_v="F4F090"                               # Background color for number of visites (Default = "F4F090")
 color_p="4477DD"                               # Background color for number of pages (Default = "4477DD")


@@ -1299,7 +1316,7 @@ color_x="C1B2E2"                          # Background color for number of exit pages (Default = "C1B2
 # PLUGIN: Tooltips
 # REQUIRED MODULES: None
 # PARAMETERS: None
 # PLUGIN: Tooltips
 # REQUIRED MODULES: None
 # PARAMETERS: None

-# DESCRIPTION: Add tooltips pop-up help boxes to HTML report pages.  
+# DESCRIPTION: Add tooltips pop-up help boxes to HTML report pages.

 # NOTE: This will increased HTML report pages size, thus server load and bandwidth.
 #
 #LoadPlugin="tooltips"
 # NOTE: This will increased HTML report pages size, thus server load and bandwidth.
 #
 #LoadPlugin="tooltips"


@@ -1307,8 +1324,8 @@ color_x="C1B2E2"                          # Background color for number of exit pages (Default = "C1B2
 # PLUGIN: DecodeUTFKeys
 # REQUIRED MODULES: Encode and URI::Escape
 # PARAMETERS: None
 # PLUGIN: DecodeUTFKeys
 # REQUIRED MODULES: Encode and URI::Escape
 # PARAMETERS: None

-# DESCRIPTION: Allow AWStats to show correctly (in language charset) 
-# keywords/keyphrases strings even if they were UTF8 coded by the 
+# DESCRIPTION: Allow AWStats to show correctly (in language charset)
+# keywords/keyphrases strings even if they were UTF8 coded by the

 # referer search engine.
 #
 #LoadPlugin="decodeutfkeys"
 # referer search engine.
 #
 #LoadPlugin="decodeutfkeys"


@@ -1324,7 +1341,7 @@ color_x="C1B2E2"                          # Background color for number of exit pages (Default = "C1B2
 # PLUGIN: HashFiles
 # REQUIRED MODULES: Storable
 # PARAMETERS: None
 # PLUGIN: HashFiles
 # REQUIRED MODULES: Storable
 # PARAMETERS: None

-# DESCRIPTION: AWStats DNS cache files are read/saved as native hash files. 
+# DESCRIPTION: AWStats DNS cache files are read/saved as native hash files.

 # This increases DNS cache files loading speed, above all for very large web sites.
 #
 LoadPlugin="hashfiles"
 # This increases DNS cache files loading speed, above all for very large web sites.
 #
 LoadPlugin="hashfiles"


@@ -1333,7 +1350,7 @@ LoadPlugin="hashfiles"
 # PLUGIN: UserInfo
 # REQUIRED MODULES: None
 # PARAMETERS: None
 # PLUGIN: UserInfo
 # REQUIRED MODULES: None
 # PARAMETERS: None

-# DESCRIPTION: Add a text (Firtname, Lastname, Office Department, ...) in 
+# DESCRIPTION: Add a text (Firtname, Lastname, Office Department, ...) in

 # authenticated user reports for each login value.
 # A text file called userinfo.myconfig.txt, with two fields (first is login,
 # second is text to show, separated by a tab char) must be created in DirData
 # authenticated user reports for each login value.
 # A text file called userinfo.myconfig.txt, with two fields (first is login,
 # second is text to show, separated by a tab char) must be created in DirData


@@ -1376,7 +1393,7 @@ LoadPlugin="hashfiles"
 # PARAMETERS: None
 # DESCRIPTION: Time reported by -showsteps option is in millisecond. For debug purpose.
 #
 # PARAMETERS: None
 # DESCRIPTION: Time reported by -showsteps option is in millisecond. For debug purpose.
 #

-#LoadPlugin="timehires"                
+#LoadPlugin="timehires"

 
 # PLUGIN: TimeZone
 # REQUIRED MODULES: Time::Local
 
 # PLUGIN: TimeZone
 # REQUIRED MODULES: Time::Local


@@ -1407,13 +1424,13 @@ LoadPlugin="hashfiles"
 # PLUGIN: GraphGoogleChartAPI
 # REQUIRED MODULES: None
 # PARAMETERS: None
 # PLUGIN: GraphGoogleChartAPI
 # REQUIRED MODULES: None
 # PARAMETERS: None

-# DESCRIPTION: Replaces the standard charts with free Google API generated images 
-# in HTML reports. If country data is available and more than one country has hits, 
+# DESCRIPTION: Replaces the standard charts with free Google API generated images
+# in HTML reports. If country data is available and more than one country has hits,

 # a map will be generated using Google Visualizations.
 # a map will be generated using Google Visualizations.

-# Note: The machine where reports are displayed must have Internet access for the 
-# charts to be generated. The only data sent to Google includes the statistic numbers, 
+# Note: The machine where reports are displayed must have Internet access for the
+# charts to be generated. The only data sent to Google includes the statistic numbers,

 # legend names and country names.
 # legend names and country names.

-# Warning: This plugin is not compatible with option BuildReportFormat=xhtml. 
+# Warning: This plugin is not compatible with option BuildReportFormat=xhtml.

 #
 #LoadPlugin="graphgooglechartapi"
 
 #
 #LoadPlugin="graphgooglechartapi"
 


@@ -1436,7 +1453,7 @@ LoadPlugin="hashfiles"
 # PLUGIN: GeoIP
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
 # PARAMETERS: [GEOIP_STANDARD | GEOIP_MEMORY_CACHE] [/pathto/geoip.dat[+/pathto/override.txt]]
 # PLUGIN: GeoIP
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
 # PARAMETERS: [GEOIP_STANDARD | GEOIP_MEMORY_CACHE] [/pathto/geoip.dat[+/pathto/override.txt]]

-# DESCRIPTION: Builds a country chart and adds an entry to the hosts 
+# DESCRIPTION: Builds a country chart and adds an entry to the hosts

 # table with country name
 # Replace spaces in the path of geoip data file with string "%20".
 #
 # table with country name
 # Replace spaces in the path of geoip data file with string "%20".
 #


@@ -1445,7 +1462,7 @@ LoadPlugin="hashfiles"
 # PLUGIN: GeoIP6
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind, version >= 1.40)
 # PARAMETERS: [GEOIP_STANDARD | GEOIP_MEMORY_CACHE] [/pathto/geoipv6.dat[+/pathto/override.txt]]
 # PLUGIN: GeoIP6
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind, version >= 1.40)
 # PARAMETERS: [GEOIP_STANDARD | GEOIP_MEMORY_CACHE] [/pathto/geoipv6.dat[+/pathto/override.txt]]

-# DESCRIPTION: Builds a country chart and adds an entry to the hosts 
+# DESCRIPTION: Builds a country chart and adds an entry to the hosts

 # table with country name
 # works with IPv4 and also IPv6 addresses
 # Replace spaces in the path of geoip data file with string "%20".
 # table with country name
 # works with IPv4 and also IPv6 addresses
 # Replace spaces in the path of geoip data file with string "%20".


@@ -1464,9 +1481,9 @@ LoadPlugin="hashfiles"
 # PLUGIN: GeoIP_ASN_Maxmind
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
 # PARAMETERS: [GEOIP_STANDARD | GEOIP_MEMORY_CACHE] [/pathto/GeoIPASN.dat[+/pathto/override.txt][+http://linktoASlookup]]
 # PLUGIN: GeoIP_ASN_Maxmind
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
 # PARAMETERS: [GEOIP_STANDARD | GEOIP_MEMORY_CACHE] [/pathto/GeoIPASN.dat[+/pathto/override.txt][+http://linktoASlookup]]

-# DESCRIPTION: This plugin adds a chart of AS numbers where the host IP address is registered. 
-# This plugin can display some ISP information if included in the database. You can also provide 
-# a link that will be used to lookup additional registration data. Put the link at the end of 
+# DESCRIPTION: This plugin adds a chart of AS numbers where the host IP address is registered.
+# This plugin can display some ISP information if included in the database. You can also provide
+# a link that will be used to lookup additional registration data. Put the link at the end of

 # the parameter string and the report page will include the link with the full AS number at the end.
 # Replace spaces in the path of geoip data file with string "%20".
 #
 # the parameter string and the report page will include the link with the full AS number at the end.
 # Replace spaces in the path of geoip data file with string "%20".
 #


@@ -1475,7 +1492,7 @@ LoadPlugin="hashfiles"
 # PLUGIN: GeoIP_Region_Maxmind
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
 # PARAMETERS: [GEOIP_STANDARD | GEOIP_MEMORY_CACHE] [/pathto/GeoIPRegion.dat[+/pathto/override.txt]]
 # PLUGIN: GeoIP_Region_Maxmind
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
 # PARAMETERS: [GEOIP_STANDARD | GEOIP_MEMORY_CACHE] [/pathto/GeoIPRegion.dat[+/pathto/override.txt]]

-# DESCRIPTION:This plugin adds a chart of hits by regions. Only regions for US and 
+# DESCRIPTION:This plugin adds a chart of hits by regions. Only regions for US and

 # Canada can be detected.
 # Replace spaces in the path of geoip data file with string "%20".
 #
 # Canada can be detected.
 # Replace spaces in the path of geoip data file with string "%20".
 #