From 1c4d22b5d3c7a2d588e61e6416ea98a95ab6f6a4 Mon Sep 17 00:00:00 2001
From: Jordi Sanfeliu <jordi@fibranet.cat>
Date: Wed, 20 Aug 2014 10:14:16 +0200
Subject: [PATCH] closing 3.6.0

---
 Changes                   | 2 +-
 docs/monitorix.spec       | 2 +-
 man/man5/monitorix.conf.5 | 2 +-
 man/man8/monitorix.8      | 9 +++++----
 monitorix                 | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Changes b/Changes
index bdf9209..ee9fd02 100644
--- a/Changes
+++ b/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.
diff --git a/docs/monitorix.spec b/docs/monitorix.spec
index 2a655ba..6f16b75 100644
--- a/docs/monitorix.spec
+++ b/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
diff --git a/man/man5/monitorix.conf.5 b/man/man5/monitorix.conf.5
index 05afd0a..f1734c5 100644
--- a/man/man5/monitorix.conf.5
+++ b/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
diff --git a/man/man8/monitorix.8 b/man/man8/monitorix.8
index e427c22..489da83 100644
--- a/man/man8/monitorix.8
+++ b/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
diff --git a/monitorix b/monitorix
index 4c4cb0b..7be9ce0 100755
--- a/monitorix
+++ b/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;