Updated documentation.

diff --git a/docs/awstats.pdf b/docs/awstats.pdf
index 7c525eca4e54d20c512384d151d89e410bed3ee9..7bab3b2dcdcced59ce2af97f3a215e19ba14204b 100644 (file)
Binary files a/docs/awstats.pdf and b/docs/awstats.pdf differ

diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index c2d17f2ba7bdddde5e4d0e02b3c3f9485e98e8ff..931dc4fe0c156a46269782d5d55b2f4627911d80 100644 (file)
--- a/docs/awstats_changelog.txt
+++ b/docs/awstats_changelog.txt
@@ -2,7 +2,7 @@ AWStats Changelog
 -----------------
 $Revision$ - $Author$ - $Date$
 
-5.91
+6.0
 
 Fixes:
 - Fixed bug 816267: onedigit dayofmonth breaks syslog regex

diff --git a/docs/awstats_config.html b/docs/awstats_config.html
index 6556ac8e37d892726b9706a72e06673f0a70cda2..0e1355b2682734670c832a8286a476e6d426fe17 100644 (file)
--- a/docs/awstats_config.html
+++ b/docs/awstats_config.html
@@ -407,10 +407,11 @@ when reading it), follow the example:<br>
 
 <a name="DirCgi"><b>DirCgi</b></a><br>
 <b>Version : </b>1.0+<br>
-<br># Relative or absolute web URL of your awstats.pl directory.
+<br># Relative or absolute web URL of your awstats cgi-bin directory.
 <br># This parameter is used only when AWStats is ran from command line
 <br># with -output option (to generate links in HTML reported page).
-<br># Default: "/cgi-bin"   (means awstats.pl is in "/mywwwroot/cgi-bin")
+<br># Example: "/awstats"
+<br># Default: "/cgi-bin"   (means awstats.pl is in "/yourwwwroot/cgi-bin")
 <br>#
 <br>DirCgi="/cgi-bin"
 
@@ -418,11 +419,10 @@ when reading it), follow the example:<br>
 
 <a name="DirIcons"><b>DirIcons</b></a><br>
 <b>Version : </b>1.0+<br>
-<br># If AWStats used as a CGI, enter relative or absolute web URL of all icons
-<br># subdirectories.
+<br># Relative or absolute web URL of your awstats icon directory.
 <br># If you build static reports ("... -output > outputpath/output.html"), enter
-<br># path of icon directory relative to the directory outputpath.
-<br># Example: "/icon"
+<br># path of icon directory relative to the output directory 'outputpath'.
+<br># Example: "/awstatsicons"
 <br># Example: "../icon"
 <br># Default: "/icon" (means you must copy icon directories in "/mywwwroot/icon")
 <br>#
@@ -518,9 +518,9 @@ when reading it), follow the example:<br>
 <br># same time to prevent unknown conflicts problems and avoid DoS attacks when
 <br># AllowToUpdateStatsFromBrowser is set to 1.
 <br># Because, when you use lock file, you can experience sometimes problems in
-<br># lock file not correctly removed (when process is killed for example, this
-<br># requires that you remove the file manualy), this option is not enabled by
-<br># default (Do not enable this option with no consol server access).
+<br># lock file not correctly removed (killed process for example requires that
+<br># you remove the file manualy), this option is not enabled by default (Do
+<br># not enable this option with no console server access).
 <br># Possible values: 0 or 1
 <br># Default: 0
 <br>#
@@ -1540,6 +1540,7 @@ parameter.
 <br># You can ask AWStats to use a particular CSS (Cascading Style Sheet) to
 <br># change its look. To create a style sheet, you can use samples provided with
 <br># AWStats in wwwroot/css directory.
+<br># Example: "/awstatscss/awstats_bw.css"
 <br># Example: "/css/awstats_bw.css"
 <br># Default: ""
 <br>#

diff --git a/docs/awstats_setup.html b/docs/awstats_setup.html
index c65d551963ef301487efa13650efaf15bbcf973d..18e622da64fed85e764285f84a375cb14702d1f8 100644 (file)
--- a/docs/awstats_setup.html
+++ b/docs/awstats_setup.html
@@ -47,7 +47,7 @@ AWStats common use is made in 3 steps:<br>
 <a name="INSTALLAPACHE"><b>A) With Apache or compatible server (on Unix/Linux, Windows, MacOS...)</b></a><br>
 <br>
 <font style="color: #111155"><b>* Step 1-1</b>:</font><br>
-(if you use a package provided with a Linux distribution or windows installer, this might be
+(if you use a package provided with a Linux distribution or Windows installer, this might be
 already done and is not necessary)<br>
 <br>
 Configure your apache web server to have <b>NCSA combined/XLF/ELF</b> log format (you can use your own log format but
@@ -63,7 +63,7 @@ your homepage. This is an example of records you should get then in your new log
 <br>
 
 <font style="color: #111155"><b>* Step 1-2</b>:</font><br>
-(if you use a package provided with a Linux distribution or windows installer, this might be
+(if you use a package provided with a Linux distribution or Windows installer, this might be
 already done and is not necessary)<br>
 <br>
 Check that your Apache config file (httpd.conf) contains the following directives and add them
@@ -80,10 +80,12 @@ Alias /awstatscss "/usr/local/awstats/wwwroot/css/"<br>
 Alias /awstatsicons "/usr/local/awstats/wwwroot/icon/"<br>\r
 ScriptAlias /awstats/ "/usr/local/awstats/wwwroot/cgi-bin/"<br>\r
 </i>
+<br>
+Note that you need to restart Apache to apply the changes.<br>
 <br>\r
 
 <font style="color: #111155"><b>* Step 1-3</b>:</font><br>
-(with most Perl interpreter correctly setup, this step is not required)<br><br>
+(if Perl interpreter is correctly setup, this step is not required)<br><br>
 If necessary, edit the first (top-most) line of awstats.pl file that is<br>
 <i>#!/usr/bin/perl</i><br>
 to reflect the path were your Perl interpreter is installed. Default value works for most of Unix OS, but it also might be<br>
@@ -93,16 +95,15 @@ With Apache for Windows and ActivePerl interpreter, it might be<br>
 <br>
 
 <font style="color: #111155"><b>* Step 1-4</b>:</font><br>
-(if you use a package provided with a Linux distribution or windows installer, this might be
-already done and is not necessary)<br>
+(if you use a package provided with a Linux distribution or Windows installer, this might not be necessary)<br>
 <br>
 Move AWStats <b>icon sub-directories</b> and its content into a directory readable by your
-web server, for example /yourwwwroot/icon or /yourwwwroot/icons.<br>
+web server, for example /yourwwwroot/icon.<br>
 <br>
 
 <font style="color: #111155"><b>* Step 1-5</b>:</font><br>
-(if you use a package provided with a Linux distribution, your config file might
-have been already created under /etc/awstats directory)<br>
+(if you use a package provided with a Linux distribution or Windows installer, your config
+file might have been already created)<br>
 <br>
 Create a config file by copying <b>awstats.model.conf</b> file into a new file named <b>awstats.myvirtualhostname.conf</b>.
 You can use the value of your choice instead of "myvirtualhostname". This new file must be stored in<br>
@@ -111,8 +112,9 @@ You can use the value of your choice instead of "myvirtualhostname". This new fi
 <br>
 
 <font style="color: #111155"><b>* Step 1-6</b>:</font><br>
-(if you use a package provided with a Linux distribution, your config file
-might have been already edited and stored in /etc/awstats)<br><br>
+(if you use a package provided with a Linux distribution or Windows installer, your config
+file already contains the right values)<br>
+<br>
 Edit this new config file with your own setup :<br>
 - Change <a href="awstats_config.html#LogFile">LogFile</a> value with full path of your web server log file (You
 can also use a relative path from your awstats.pl directory).<br>