closing 3.6.0

Changes

@@ -1,4 +1,4 @@
-3.N.N  - DD-Aug-2014
+3.6.0  - 20-Aug-2014
 ====================
 - Added a complete statistical Libvirt (libvirt) graph.
 - Added a complete processes statistics (process) graph.

docs/monitorix.spec

@@ -3,7 +3,7 @@
 
 Summary: Monitorix is a system monitoring tool
 Name: monitorix
-Version: 3.5.1
+Version: 3.6.0
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System

man/man5/monitorix.conf.5

@@ -3,7 +3,7 @@
 .\"
 .\" This is the man page for the monitorix.conf configuration file.
 .\"
-.TH monitorix.conf 5 "May 2014" 3.5.1 "Monitorix configuration file"
+.TH monitorix.conf 5 "Aug 2014" 3.6.0 "Monitorix configuration file"
 .SH NAME
 monitorix.conf \- Configuration file for Monitorix.
 .SH DESCRIPTION

man/man8/monitorix.8

@@ -3,7 +3,7 @@
 .\"
 .\" This is the man page for the monitorix collector daemon.
 .\"
-.TH monitorix 8 "May 2014" 3.5.1 "Monitorix collector daemon"
+.TH monitorix 8 "Aug 2014" 3.6.0 "Monitorix collector daemon"
 .SH NAME
 monitorix - a lightweight system monitoring tool
 .SH SYNOPSIS
@@ -13,13 +13,14 @@ This Perl daemon starts the main Monitorix process, which gathers statistics abo
 .SH OPTIONS
 .TP
 \fB\-c\fR \fIconfigfile\fR
-The default location of the configuration file varies depending on the operating system:
+The default location of the main configuration file varies depending on the operating system:
 .P
 .RS
-Linux:        \fI/etc/monitorix.conf\fP
+Linux:        \fI/etc/monitorix/monitorix.conf\fP
 .br
 FreeBSD:      \fI/usr/local/etc/monitorix.conf\fP
 .P
+Extra configuration files can be placed in \fI/etc/monitorix/conf.d\fP, they will be loaded right after the main configuration file (overriding previous options).
 .RE
 .TP
 \fB\-p\fR \fIpidfile\fR
@@ -34,7 +35,7 @@ For a reference of all graph names check the option \fBgraph_name\fP in the \fIm
 Displays version information.
 .TP
 \fB\-n\fR
-This argument will prevent Monitorix from daemonizing and force it to run in the foreground.
+This argument will prevent Monitorix from daemonizing, and hence, forcing it to run in foreground. This is specially usefull for debugging purposes.
 .SH SIGNALS
 On receipt of a SIGHUP, \fBmonitorix\fP will close and reopen its log file. This is useful in scripts which rotate and age log files.
 .P

monitorix

@@ -46,8 +46,8 @@ $SIG{'TERM'} = 'INT_handler';
 $SIG{'CHLD'} = 'CHLD_handler';
 $SIG{'HUP' } = 'HUP_handler';
 
-use constant VERSION	=> "3.5.1";
-use constant RELDATE	=> "06-May-2014";
+use constant VERSION	=> "3.6.0";
+use constant RELDATE	=> "20-Aug-2014";
 
 my @suppsys = ("Linux", "FreeBSD", "OpenBSD", "NetBSD");
 our %config;