README.TXT is replaced with README.md

Prepare version 7.4

diff --git a/README.TXT b/README.TXT
deleted file mode 100644 (file)
index b16d3bc..0000000
--- a/README.TXT
+++ /dev/null
@@ -1,176 +0,0 @@
-
-------------- AWStats --------------
-        Advanced Web Statistics
-------------------------------------
-
-AWStats (Advanced Web Statistics) is a powerful, full-featured web server
-logfile analyzer which shows you all your Web statistics including: visitors,
-pages, hits, hours, search engines, keywords used to find your site, broken
-links, robots and many more...
-
-It works with IIS 5.0+, Apache and all major web, wap, proxy, streaming
-server log files (and even ftp servers or mail logs) on all Operating Systems.
-
-License: GNU GPL v3+ (GNU General Public License. See LICENSE file),
-         OSI Certified Open Source Software license.
-Version: 7.3
-Release date: January 2014
-Platforms: All (Linux, NT, BSD, Solaris and other *NIX's, BeOS, OS/2...)
-Author: Laurent Destailleur <eldy@users.sourceforge.net>
-AWStats official web site and latest version: http://www.awstats.org
-
-I   - Features and requirements of AWStats
-         I - 1) Features, what AWStats can show you
-         I - 2) Requirements for using AWStats
-         I - 3) Files
-II  - Install, Setup and Use AWStats
-III - Benchmark
-IV  - About the author, license and support
-
-
-
-I - FEATURES AND REQUIREMENTS
-------------------------------------
-
-I - 1) Features
-
-       A full log analysis enables AWStats to show you the following information:
-       * Number of VISITS and UNIQUE VISITORS
-       * Visits duration and last visits
-       * Authenticated users, and last authenticated visits
-       * Days of week and rush hours (pages, hits, KB for each day and hour)
-       * Domains/countries of hosts visitors (pages, hits, KB)
-       * Hosts list, last visits and unresolved IP addresses list
-       * Most viewed, entry and exit pages
-       * File types
-       * Web compression statistics (for mod_gzip or mod_deflate)
-       * Browsers used (pages, hits, kb for each browser)
-       * OS used (pages, hits, KB for each OS)
-       * Robot visits
-       * Worm attacks
-       * Download and continuation detection
-       * Search engines, keyphrases and keywords used to find your site
-       * HTTP errors (Page not found with last referer, etc,)
-       * Screen size report
-       * Number of times your site is "added to favourites bookmarks"
-       * Ratio of Browsers that support: Java, Flash, RealG2 reader,
-         Quicktime reader, WMA reader, PDF reader
-       * Cluster report for load balanced servers ratio
-       * Other personalized reports...
-
-       It supports the following features as well:
-       * Can analyze all log formats
-       * Works from command line and from a browser as a CGI (with dynamic
-         filters capabilities for some charts)
-       * Update of statistics can be made on demand from the web interface and
-         not only from your scheduler
-       * Unlimited log file size, support split log files (load balancing system)
-       * Support 'nearly sorted' log files even for entry and exit pages
-       * Reverse DNS lookup before or during analysis, supports DNS cache files
-       * Country detection from IP location or domain name
-       * WhoIS links
-       * A lot of options/filters and plugins can be used
-       * Multi-named web sites supported (virtual servers)
-       * Cross Site Scripting Attacks protection
-       * Several languages
-       * No need of rare perl libraries
-       * Dynamic reports as CGI output
-       * Static reports in one or framed HTML or XHTML pages
-       * Experimental PDF export
-       * Look and colors can match your site design (CSS)
-       * Help and tooltips on HTML reported pages
-       * Easy to use (Just one configuration file to edit)
-       * Analysis database can be stored in XML format (for XSLT processing, ...)
-       * A Webmin module
-       * Free (GNU GPL) with sources (perl scripts)
-       * Available on all platforms
-
-
-I - 2) Requirements
-
-       To use AWStats CGI script, you need the following requirements:
-       * Your server must log web access in a log file you can read.
-       * To run awstats, from command line, your operating system must be able
-         to run perl scripts (.pl files).
-       * Perl module "Encode" must be available.
-         
-       To run awstats as a CGI (for real-time
-         statistics), your web server must also be able to run such scripts.
-         If not, you can solve this by downloading last Perl version at:
-         http://www.activestate.com/ActivePerl/ (Windows)
-         http://www.perl.com/pub/language/info/software.html (All OS)
-
-
-I - 3) Files
-
-       The distribution of AWStats package includes the following files:
-       README.TXT                          This file
-       docs/LICENSE                        GNU General Public Licence
-       docs/*                              AWStats documentation (setup/usage...)
-       wwwroot/cgi-bin/awstats.pl          THE MAIN AWSTATS PROGRAM (CLI/CGI)
-       wwwroot/cgi-bin/awredir.pl          A tool to track exit clicks
-       wwwroot/cgi-bin/awstats.model.conf  An model configuration file
-       wwwroot/cgi-bin/lang                Directory with languages files
-       wwwroot/cgi-bin/lib                 Directory with awstats reference info
-       wwwroot/cgi-bin/plugins             Directory with optional plugins
-       wwwroot/icon/browser                Directory with browsers icons
-       wwwroot/icon/clock                  Directory with clock icons
-       wwwroot/icon/cpu                    Directory with cpu icons
-       wwwroot/icon/flags                  Directory with country flag icons
-       wwwroot/icon/os                     Directory with OS icons
-       wwwroot/icon/other                  Directory with all others icons
-       wwwroot/classes                     Java applet for graphapplet plugin
-       wwwroot/css                         Samples of CSS files
-       wwwroot/js                          Javascript sources for "Misc" feature
-       tools/*                             Other provided tools
-       tools/webmin/awstats-x.x.wbm        A Webmin module for AWStats
-       tools/xslt/awstats61.xsd            AWStats XML database schema descriptor
-       tools/xslt/*                        Demo to manipulate AWStats XML database
-
-
-
-II - INSTALL, SETUP AND USE AWSTATS
------------------------------------
-
-The documentation available for this release in HTML format is
-in the docs/ directory.
-
-You can find a most up-to-date documentation at:
-http://www.awstats.org
-
-
-
-III - BENCHMARK
------------------------------------
-
-Tests and results are available in AWStats documentation, in docs/ directory.
-
-
-IV - SOCIAL NETWORKS
------------------------------------
-
-Follow AWStats project on
-Facebook: https://www.facebook.com/awstats
-Google+: https://plus.google.com/+AWStatsOrgProject
-Twitter: http://www.twitter.com/awstats_project
-
-
-V - ABOUT THE AUTHOR, LICENSE AND SUPPORT
------------------------------------------
-Copyright (C) 2000-2014 - Laurent Destailleur - eldy@users.sourceforge.net - [NLTechno] (http://www.nltechno.com)
-
-Laurent Destailleur is also the project leader of [Dolibarr ERP CRM Opensource project] (http://www.dolibarr.org),
-and author of AWBot, CVSChangeLogBuilder, DoliDroid and founder of [DoliCloud SaaS] (http://www.dolicloud.com).
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.

diff --git a/README.md b/README.md
index 7af9505dbbe4c07cb2da231fbd26f26ecc0ecfb2..4cfcba8d5283131bb7a4915208f07c6c0e29a0ef 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 
 # AWStats - Advanced Web Statistics
-
+-----------------------------------
 
 AWStats (Advanced Web Statistics) is a powerful, full-featured web server
 logfile analyzer which shows you all your Web statistics including: visitors,
@@ -13,9 +13,9 @@ server log files (and even ftp servers or mail logs) on all Operating Systems.
 License: GNU GPL v3+ (GNU General Public License. See LICENSE file),
          OSI Certified Open Source Software license.
 
-Version: 7.3
+Version: 7.4
 
-Release date: January 2014
+Release date: July 2014
 
 Platforms: All (Linux, NT, BSD, Solaris and other *NIX's, BeOS, OS/2...)
 

diff --git a/docs/awstats_benchmark.html b/docs/awstats_benchmark.html
index e1c566d3e805d5e1c4db7f6068034e492f4e3af1..22eeb949cbf6902dc2a59fe5e9b6167b2e98e1b7 100644 (file)
--- a/docs/awstats_benchmark.html
+++ b/docs/awstats_benchmark.html
@@ -19,7 +19,7 @@
 <td bgcolor=#9999cc align=center><a href="/"><img src="images/awstats_logo6.png" border=0></a></td>
 <td bgcolor=#9999cc align=center>
 <br>
-<font style="font: 16pt arial,helvetica,sans-serif" color=#EEEEFF><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font: 16pt arial,helvetica,sans-serif" color=#EEEEFF><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
 <td bgcolor=#9999cc align=center>

diff --git a/docs/awstats_compare.html b/docs/awstats_compare.html
index f94f46d00177a5f5e114dcf31037820e877d5384..fa6ba99d368a64c15d7b675819eca9a8960063f2 100644 (file)
--- a/docs/awstats_compare.html
+++ b/docs/awstats_compare.html
@@ -22,7 +22,7 @@
 
 <td align="center" bgcolor="#9999cc">
 <br>
-<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
 <td align="center" bgcolor="#9999cc">&nbsp;

diff --git a/docs/awstats_config.html b/docs/awstats_config.html
index 93807e75de2ca4f212dc50b6893af4dad476d74e..ae5df3b9c00e70e32d6fe15c6e260378b4e6be2e 100644 (file)
--- a/docs/awstats_config.html
+++ b/docs/awstats_config.html
@@ -17,7 +17,7 @@
 <td align="center" bgcolor="#9999cc"><a href="/"><img src="images/awstats_logo6.png" border="0"></a></td>
 <td align="center" bgcolor="#9999cc">
 <br>
-<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
 <td align="center" bgcolor="#9999cc">

diff --git a/docs/awstats_contrib.html b/docs/awstats_contrib.html
index 37cd9f87038fd6fc66fe0ff7ce9234b362988ac4..d361149d58e655e72e7fe9a32184c9bc9ef7e93c 100644 (file)
--- a/docs/awstats_contrib.html
+++ b/docs/awstats_contrib.html
@@ -16,7 +16,7 @@
 <td align="center" bgcolor="#9999cc"><a href="/"><img src="images/awstats_logo1.png" border="0"></a></td>
 <td align="center" bgcolor="#9999cc">
 <br>
-<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
 <td align="center" bgcolor="#9999cc">

diff --git a/docs/awstats_dev_plugins.html b/docs/awstats_dev_plugins.html
index 203d204b6c76156aebb042ffff2841e768fa5f6b..e908ad0f4596c8f5b42f085a89685ed1f211e8f1 100644 (file)
--- a/docs/awstats_dev_plugins.html
+++ b/docs/awstats_dev_plugins.html
@@ -18,7 +18,7 @@
 <td align="center" bgcolor="#9999cc"><a href="/"><img src="images/awstats_logo1.png" border="0"></a></td>
 <td align="center" bgcolor="#9999cc">
 <br>
-<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
 <td align="center" bgcolor="#9999cc">

diff --git a/docs/awstats_dev_plugins_graphs.html b/docs/awstats_dev_plugins_graphs.html
index 169842dd355ea3bafa9bb3a0bdbe94a7f177e548..20442c5bf9ccafe614fbc2445c8fe30bdc27c039 100644 (file)
--- a/docs/awstats_dev_plugins_graphs.html
+++ b/docs/awstats_dev_plugins_graphs.html
@@ -18,7 +18,7 @@
 <td align="center" bgcolor="#9999cc"><a href="/"><img src="images/awstats_logo1.png" border="0"></a></td>
 <td align="center" bgcolor="#9999cc">
 <br>
-<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
 <td align="center" bgcolor="#9999cc">

diff --git a/docs/awstats_dev_plugins_hooks.html b/docs/awstats_dev_plugins_hooks.html
index 1ab5165793956cfe82305e6bfb224bdb15f36fa7..303965a6651fc66e41aefda851f1753a1d925118 100644 (file)
--- a/docs/awstats_dev_plugins_hooks.html
+++ b/docs/awstats_dev_plugins_hooks.html
@@ -18,7 +18,7 @@
 <td align="center" bgcolor="#9999cc"><a href="/"><img src="images/awstats_logo1.png" border="0"></a></td>
 <td align="center" bgcolor="#9999cc">
 <br>
-<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
 <td align="center" bgcolor="#9999cc">

diff --git a/docs/awstats_dolibarr.html b/docs/awstats_dolibarr.html
index 2fd11975dd419a9b21ee857010b129cb040ba89a..9f08bdb37406c8d38b73fd986d379b1abfd18162 100644 (file)
--- a/docs/awstats_dolibarr.html
+++ b/docs/awstats_dolibarr.html
@@ -20,7 +20,7 @@
 <td bgcolor=#9999cc align=center><a href="/"><img src="images/awstats_logo6.png" border=0></a></td>
 <td bgcolor=#9999cc align=center>
 <br>
-<font style="font: 16pt arial,helvetica,sans-serif" color=#EEEEFF><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font: 16pt arial,helvetica,sans-serif" color=#EEEEFF><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
 <td bgcolor=#9999cc align=center>

diff --git a/docs/awstats_extra.html b/docs/awstats_extra.html
index 4b17f48a00f072577e18bdeb428320465d5b1f16..2e89af09d37c77aa40ebb7f4ac6d0ac22626ecd1 100644 (file)
--- a/docs/awstats_extra.html
+++ b/docs/awstats_extra.html
@@ -20,7 +20,7 @@
 <td bgcolor=#9999cc align=center><a href="/"><img src="images/awstats_logo6.png" border=0></a></td>
 <td bgcolor=#9999cc align=center>
 <br>
-<font style="font: 16pt arial,helvetica,sans-serif" color=#EEEEFF><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font: 16pt arial,helvetica,sans-serif" color=#EEEEFF><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
 <td bgcolor=#9999cc align=center>

diff --git a/docs/awstats_faq.html b/docs/awstats_faq.html
index 157680d0a0ea409a98a9dd92a743115c8fb40032..0d7932e1d9d347decb8243b5a1f205e679af84ec 100644 (file)
--- a/docs/awstats_faq.html
+++ b/docs/awstats_faq.html
@@ -20,7 +20,7 @@
 <td bgcolor=#9999cc align=center><a href="/"><img src="images/awstats_logo6.png" border=0></a></td>
 <td bgcolor=#9999cc align=center>
 <br>
-<font style="font: 16pt arial,helvetica,sans-serif" color=#EEEEFF><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font: 16pt arial,helvetica,sans-serif" color=#EEEEFF><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
 <td bgcolor=#9999cc align=center>

diff --git a/docs/awstats_glossary.html b/docs/awstats_glossary.html
index b37be6cd4c854d8b45f11b272f4fecca33c3577d..807090bedd2ff54a296e662492c189d428165158 100644 (file)
--- a/docs/awstats_glossary.html
+++ b/docs/awstats_glossary.html
@@ -16,7 +16,7 @@
 <td align="center" bgcolor="#9999cc"><a href="/"><img src="images/awstats_logo6.png" border="0"></a></td>
 <td align="center" bgcolor="#9999cc">
 <br>
-<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
 <td align="center" bgcolor="#9999cc">

diff --git a/docs/awstats_license.html b/docs/awstats_license.html
index 9f36446139f009ec11c49d9a13f3b99012413905..d43580f9b4e39573ab54569d01db9747a48cb6d8 100644 (file)
--- a/docs/awstats_license.html
+++ b/docs/awstats_license.html
@@ -20,7 +20,7 @@
 <td bgcolor=#9999cc align=center><a href="/"><img src="images/awstats_logo6.png" border=0></a></td>
 <td bgcolor=#9999cc align=center>
 <br>
-<font style="font: 16pt arial,helvetica,sans-serif" color=#EEEEFF><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font: 16pt arial,helvetica,sans-serif" color=#EEEEFF><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
 <td bgcolor=#9999cc align=center>

diff --git a/docs/awstats_security.html b/docs/awstats_security.html
index ba32d2edbc7ced768771336032e8e9a7465ecef7..3cae9fa835757de4d8ccbe4596018fa2189ea78c 100644 (file)
--- a/docs/awstats_security.html
+++ b/docs/awstats_security.html
@@ -19,7 +19,7 @@
 <td bgcolor=#9999cc align=center><a href="/"><img src="images/awstats_logo6.png" border=0></a></td>
 <td bgcolor=#9999cc align=center>
 <br>
-<font style="font: 16pt arial,helvetica,sans-serif" color=#EEEEFF><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font: 16pt arial,helvetica,sans-serif" color=#EEEEFF><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
 <td bgcolor=#9999cc align=center>

diff --git a/docs/awstats_setup.html b/docs/awstats_setup.html
index 60d101fa40697b33f505d2847164aca1715a144d..9fa6aa922212bdb9ed7db9610448c07bd0ea0505 100644 (file)
--- a/docs/awstats_setup.html
+++ b/docs/awstats_setup.html
@@ -23,7 +23,7 @@
       <td align="center" bgcolor="#9999cc"> <br>
       <font
  style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;"
- color="#eeeeff"><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+ color="#eeeeff"><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
       <td align="center" bgcolor="#9999cc">&nbsp; </td>

diff --git a/docs/awstats_tools.html b/docs/awstats_tools.html
index cd7a2d304074c98f7253fde30c6c92f83100af2e..f576bf925f8f5decb1adf46b62e23230b6a7da42 100644 (file)
--- a/docs/awstats_tools.html
+++ b/docs/awstats_tools.html
@@ -17,7 +17,7 @@
 <td align="center" bgcolor="#9999cc"><a href="/"><img src="images/awstats_logo6.png" border="0"></a></td>
 <td align="center" bgcolor="#9999cc">
 <br>
-<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
 <td align="center" bgcolor="#9999cc">

diff --git a/docs/awstats_upgrade.html b/docs/awstats_upgrade.html
index d1e7d36e812d51fced2c5d2e2f22c74ce1bfda52..7de7429bf61002171bd1ecbefbabf642e116e6ed 100644 (file)
--- a/docs/awstats_upgrade.html
+++ b/docs/awstats_upgrade.html
@@ -23,7 +23,7 @@
       <td align="center" bgcolor="#9999cc"> <br>
       <font
  style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;"
- color="#eeeeff"><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+ color="#eeeeff"><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
       <td align="center" bgcolor="#9999cc">&nbsp; </td>

diff --git a/docs/awstats_webmin.html b/docs/awstats_webmin.html
index 081726efba95610cb76cfc5ffb85fe0345a2c4ec..aac4d3d22a7c24e13f28c49da80668863a7f3bce 100644 (file)
--- a/docs/awstats_webmin.html
+++ b/docs/awstats_webmin.html
@@ -20,7 +20,7 @@
 <td bgcolor=#9999cc align=center><a href="/"><img src="images/awstats_logo6.png" border=0></a></td>
 <td bgcolor=#9999cc align=center>
 <br>
-<font style="font: 16pt arial,helvetica,sans-serif" color=#EEEEFF><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font: 16pt arial,helvetica,sans-serif" color=#EEEEFF><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
 <td bgcolor=#9999cc align=center>

diff --git a/docs/awstats_what.html b/docs/awstats_what.html
index be686b85a0dd6653cb876bfa420275bc48f0a756..91891e5074fa5f68fdd05dab204615f8915e001d 100644 (file)
--- a/docs/awstats_what.html
+++ b/docs/awstats_what.html
@@ -17,7 +17,7 @@
 <td align="center" bgcolor="#9999cc"><a href="/"><img src="images/awstats_logo6.png" border="0"></a></td>
 <td align="center" bgcolor="#9999cc">
 <br>
-<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
       <td align="center" bgcolor="#9999cc">&nbsp;&nbsp; </td>

diff --git a/docs/index.html b/docs/index.html
index be37337c9a4f7f82d5777f4fbebd8592871188d1..65f20fd937a187f0ca95e053814986b05bed71cd 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -18,7 +18,7 @@
 <td align="center" bgcolor="#9999cc"><a href="/"><img src="images/awstats_logo6.png" border="0"></a></td>
 <td align="center" bgcolor="#9999cc">
 <br>
-<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.3 Documentation</b></font><br>
+<font style="font-family: arial,helvetica,sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 16pt; line-height: normal; font-size-adjust: none; font-stretch: normal;" color="#eeeeff"><b>AWStats logfile analyzer 7.4 Documentation</b></font><br>
 <br>
 </td>
 <td align="center" bgcolor="#9999cc">

diff --git a/make/exe/awstats.nsi b/make/exe/awstats.nsi
index fbdfb3573b36e9e2109e86cde1e467b6dfe7d8ae..fc64894682011460194233046758bd150c109b0d 100644 (file)
--- a/make/exe/awstats.nsi
+++ b/make/exe/awstats.nsi
@@ -6,7 +6,7 @@
 
 
 !define MUI_PROD "AWStats" ;Define your own software name here
-#!define MUI_VERSION_DOT "7.3" ;Define your own software version here
+#!define MUI_VERSION_DOT "7.4" ;Define your own software version here
 !define MUI_PUBLISHER "Laurent Destailleur"
 !define MUI_URL "http://www.awstats.org"
 !define MUI_COMMENTS "copyright 2000/2014 Laurent Destailleur"

diff --git a/make/makepack-awstats.pl b/make/makepack-awstats.pl
index 9477bdec7c0945a0fb4cd452dd56b753d41df87a..bd0a70e48a33e91876d0fb198afd8676a3b368a5 100755 (executable)
--- a/make/makepack-awstats.pl
+++ b/make/makepack-awstats.pl
@@ -9,9 +9,7 @@
 use Cwd;
 
 $PROJECT="awstats";
-$MAJOR="7";
-$MINOR="3";
-$RPMSUBVERSION="1";
+
 
 $WBMVERSION="2.0";
 
@@ -28,26 +26,6 @@ $WBMVERSION="2.0";
 "makensis.exe"=>"NSIS"
 );
 
-$FILENAME="$PROJECT";
-$FILENAMETGZ="$PROJECT-$MAJOR.$MINOR";
-$FILENAMEZIP="$PROJECT-$MAJOR.$MINOR";
-$FILENAMERPM="$PROJECT-$MAJOR.$MINOR-$RPMSUBVERSION";
-$FILENAMEDEB="$PROJECT-$MAJOR.$MINOR";
-$FILENAMEEXE="$PROJECT-$MAJOR.$MINOR";
-# ubuntu
-$RPMDIR="./../../../rpmbuild";
-if (-d "/usr/src/redhat") {
-    # redhat
-    $RPMDIR="/usr/src/redhat";
-}
-if (-d "/usr/src/RPM") {
-    # mandrake
-    $RPMDIR="/usr/src/RPM";
-}
-if (-d "/home/ldestail/rpmbuild") {
-    # debian
-    $RPMDIR="/home/ldestail/rpmbuild";
-}
 use vars qw/ $REVISION $VERSION /;
 $REVISION='20140126';
 $VERSION="1.0 (build $REVISION)";
@@ -100,12 +78,48 @@ if (! $TEMP || ! -d $TEMP) {
 $BUILDROOT="$TEMP/${PROJECT}-buildroot";
 
 
+
+# Get version $MAJOR, $MINOR and $BUILD
+$result = open( IN, "<" . $SOURCE . "/wwwroot/cgi-bin/awstats.pl" );
+if ( !$result ) { die "Error: Can't open descriptor file " . $SOURCE . "/wwwroot/cgi-bin/awstats.pl\n"; }
+while (<IN>) {
+       if ( $_ =~ /VERSION\s*=\s*\"([\d\.a-z\-]+)/ ) { $PROJVERSION = $1; break; }
+}
+close IN;
+($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
+if ($MINOR eq '') { die "Error can't detect version into ".$SOURCE . "/wwwroot/cgi-bin/awstats.pl"; }
+
+$RPMSUBVERSION="1";
+
+
+$FILENAME="$PROJECT";
+$FILENAMETGZ="$PROJECT-$MAJOR.$MINOR";
+$FILENAMEZIP="$PROJECT-$MAJOR.$MINOR";
+$FILENAMERPM="$PROJECT-$MAJOR.$MINOR-$RPMSUBVERSION";
+$FILENAMEDEB="$PROJECT-$MAJOR.$MINOR";
+$FILENAMEEXE="$PROJECT-$MAJOR.$MINOR";
+# ubuntu
+$RPMDIR="./../../../rpmbuild";
+if (-d "/usr/src/redhat") {
+    # redhat
+    $RPMDIR="/usr/src/redhat";
+}
+if (-d "/usr/src/RPM") {
+    # mandrake
+    $RPMDIR="/usr/src/RPM";
+}
+if (-d "/home/ldestail/rpmbuild") {
+    # debian
+    $RPMDIR="/home/ldestail/rpmbuild";
+}
+
+
 my $copyalreadydone=0;
 my $batch=0;
 
 print "Makepack version $VERSION\n";
 print "Building package name: $PROJECT\n";
-print "Building package version: $MAJOR.$MINOR.$BUILD\n";
+print "Building package version: $MAJOR.$MINOR\n";
 print "Source directory (SOURCE): $SOURCE\n";
 print "Target directory (DESTI) : $DESTI\n";
 
@@ -212,8 +226,8 @@ if (! $copyalreadydone) {
        print "Create directory $BUILDROOT/$PROJECT\n";
        mkdir "$BUILDROOT/$PROJECT";
 
-       print "Recopie de $SOURCE/README.TXT dans $BUILDROOT/$PROJECT\n";
-       $ret=`cp -p "$SOURCE/README.TXT" "$BUILDROOT/$PROJECT"`;
+       print "Recopie de $SOURCE/README.md dans $BUILDROOT/$PROJECT\n";
+       $ret=`cp -p "$SOURCE/README.md" "$BUILDROOT/$PROJECT"`;
 
        print "Recopie de $SOURCE/docs dans $BUILDROOT/$PROJECT/docs\n";
        mkdir "$BUILDROOT/$PROJECT/docs";

diff --git a/make/makepack-howto.txt b/make/makepack-howto.txt
index ccb1b99786a4260a783f3d76f36dd55d94f9620e..e1fc3dd8e779bee8fd8290fd2e641b2bf5fc7bbd 100644 (file)
--- a/make/makepack-howto.txt
+++ b/make/makepack-howto.txt
@@ -1,11 +1,11 @@
 ***** Actions to build a beta or release *****
 - Check all files are commited.
 - Update file tools/webmin/awstats/module.info
-- Update file README.txt
+- Update file README.md
 - Update version number in doc files
 - Update version number in nsi file
-- Update version number in makepack file
 - Update version number and copyright year in awstats.pl file
+- Update version number in makepack file
 - Build PAD files
 - Build PDF
 - Tagger Git (AWSTATS_x_x_BETA or AWSTATS_x_x)

diff --git a/make/rpm/awstats.spec b/make/rpm/awstats.spec
index 64d4786d595877952992494fac7b1b29ee094b39..357b9fafbc38f58520da55970fb5694eac8afc0a 100644 (file)
--- a/make/rpm/awstats.spec
+++ b/make/rpm/awstats.spec
@@ -55,38 +55,38 @@ features.
 
 %description -l pl
 awstats (Advanced Web Statistics - zaawansowane statystyki WWW) to
-potê¿ne i bogate w mo¿liwo¶ci narzêdzie generuj±ce zaawansowane
-graficzne statystyki serwera WWW. Ten analizator logów serwera
-dzia³a z linii poleceñ lub jako CGI i pokazuje wszystkie informacje
-zawarte w logu w postaci graficznych stron WWW. Mo¿e analizowaæ logi
-wielu serwerów WWW/WAP/proxy, takich jak Apache, IIS, Weblogic,
-Webstar, Squid... ale tak¿e serwerów pocztowych lub ftp.
-
-Ten program mo¿e mierzyæ odwiedziny, odwiedzaj±cych, uwierzytelnionych
-u¿ytkowników, strony, domeny/kraje, najbardziej zajête godziny,
-odwiedziny robotów, rodzaje plików, u¿ywane wyszukiwarki i s³owa
-kluczowe, czasy trwania odwiedzin, b³êdy HTTP... a nawet wiêcej.
-Statystyki mog± byæ uaktualniane z przegl±darki lub schedulera.
-Program obs³uguje tak¿e serwery wirtualne, wtyczki i wiele innych
+pot�ne i bogate w mo�liwo�ci narz�dzie generuj�ce zaawansowane
+graficzne statystyki serwera WWW. Ten analizator log�w serwera
+dzia�a z linii polece� lub jako CGI i pokazuje wszystkie informacje
+zawarte w logu w postaci graficznych stron WWW. Mo�e analizowa� logi
+wielu serwer�w WWW/WAP/proxy, takich jak Apache, IIS, Weblogic,
+Webstar, Squid... ale tak�e serwer�w pocztowych lub ftp.
+
+Ten program mo�e mierzy� odwiedziny, odwiedzaj�cych, uwierzytelnionych
+u�ytkownik�w, strony, domeny/kraje, najbardziej zaj�te godziny,
+odwiedziny robot�w, rodzaje plik�w, u�ywane wyszukiwarki i s�owa
+kluczowe, czasy trwania odwiedzin, b��dy HTTP... a nawet wi�cej.
+Statystyki mog� by� uaktualniane z przegl�darki lub schedulera.
+Program obs�uguje tak�e serwery wirtualne, wtyczki i wiele innych
 rzeczy.
 
 %description -l fr
-AWStats (Advanced Web Statistics) est un outils pour générer des 
-statistiques avancés d'un serveur web (mais aussi ftp ou mail)
-de manière graphique.
+AWStats (Advanced Web Statistics) est un outils pour g�n�rer des 
+statistiques avanc�s d'un serveur web (mais aussi ftp ou mail)
+de mani�re graphique.
 
 Cet analyseur de log fonctionne en CGI ou en ligne de commande
-et syntétise toutes les informations que vos logs contiennent en
+et synt�tise toutes les informations que vos logs contiennent en
 quelques pages comme les visites, visiteurs uniques, logins,
 pages vues, domaines/pays, heures de pointes, visites des robots, 
-type de fichiers, moteurs de recherche, mots et phrases clés,
-durée des visites, répartition clusters, erreurs HTTP mais aussi
-support java,flash,etc des navigateurs, résolution d'écran,
+type de fichiers, moteurs de recherche, mots et phrases cl�s,
+dur�e des visites, r�partition clusters, erreurs HTTP mais aussi
+support java,flash,etc des navigateurs, r�solution d'�cran,
 estimation des ajouts aux favoris, etc...
 
-Les statistiques peuvent etre mise à jour par un navigateur ou un
-séquenceur.
-AWStats génère un fichier d'informations consolidés pour pouvoir
+Les statistiques peuvent etre mise � jour par un navigateur ou un
+s�quenceur.
+AWStats g�n�re un fichier d'informations consolid�s pour pouvoir
 traiter de large sites souvent et rapidement.
 
 Il peut analyser des logs IIS (W3C log format), fichier log Apache
@@ -94,7 +94,7 @@ Il peut analyser des logs IIS (W3C log format), fichier log Apache
 plupart des logs de serveur web, proxy, wap, streaming serveurs
 (et aussi serveurs ftp et de mails).
 Ce programme supporte de plus les serveurs virtuels, des plugins
-et de nombreuses fonctionalités.
+et de nombreuses fonctionalit�s.
 
 
 
@@ -173,8 +173,8 @@ install -m 444 wwwroot/cgi-bin/lang/tooltips_f/* $RPM_BUILD_ROOT/usr/local/awsta
 install -m 444 wwwroot/cgi-bin/lang/tooltips_m/* $RPM_BUILD_ROOT/usr/local/awstats/wwwroot/cgi-bin/lang/tooltips_m
 install -m 444 wwwroot/cgi-bin/lang/tooltips_w/* $RPM_BUILD_ROOT/usr/local/awstats/wwwroot/cgi-bin/lang/tooltips_w
 install -m 444 wwwroot/cgi-bin/lang/awstats* $RPM_BUILD_ROOT/usr/local/awstats/wwwroot/cgi-bin/lang
-install -m 444 README.TXT  $RPM_BUILD_ROOT/usr/local/awstats/README.TXT
-#install -m 644 README.TXT  $RPM_BUILD_ROOT/usr/share/awstats/man
+install -m 444 README.md  $RPM_BUILD_ROOT/usr/local/awstats/README.md
+#install -m 644 README.md  $RPM_BUILD_ROOT/usr/share/awstats/man
 install -m 444 docs/*.* $RPM_BUILD_ROOT/usr/local/awstats/docs
 install -m 444 docs/images/* $RPM_BUILD_ROOT/usr/local/awstats/docs/images
 
@@ -186,13 +186,13 @@ rm -rf $RPM_BUILD_ROOT
 #---- files
 %files
 %defattr(-,root,root)
-%doc README.TXT
+%doc README.md
 %doc /usr/local/awstats/docs/*
 %config /%{_sysconfdir}/awstats/*
 %dir /usr/local/awstats/wwwroot
 %dir /usr/local/awstats/tools
 
-/usr/local/awstats/README.TXT
+/usr/local/awstats/README.md
 /usr/local/awstats/wwwroot/*
 /usr/local/awstats/tools/*