From 9ece96ae96345688f0095cf2e4139233d31771bd Mon Sep 17 00:00:00 2001
From: Juho Vanhanen <juho@vanhanen.me>
Date: Sat, 26 Sep 2015 21:40:40 +0300
Subject: [PATCH 01/29] Changed font-weight to normal in light.css

---
 html/css/light.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/html/css/light.css b/html/css/light.css
index f224ff3cb..7482b08b2 100644
--- a/html/css/light.css
+++ b/html/css/light.css
@@ -94,3 +94,7 @@
   0% { transform: rotate(0deg); transform: rotate(0deg); }
   100% { transform: rotate(360deg); transform: rotate(360deg); }
 }
+
+label {
+    font-weight: normal;
+}
\ No newline at end of file

From ae47b92fb6b20ae9c15cc631796c77a4a053de7d Mon Sep 17 00:00:00 2001
From: Juho Vanhanen <juho@vanhanen.me>
Date: Wed, 30 Sep 2015 13:58:57 +0300
Subject: [PATCH 02/29] Added normal font-weight to labels for light theme

---
 html/css/light.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/html/css/light.css b/html/css/light.css
index f224ff3cb..7482b08b2 100644
--- a/html/css/light.css
+++ b/html/css/light.css
@@ -94,3 +94,7 @@
   0% { transform: rotate(0deg); transform: rotate(0deg); }
   100% { transform: rotate(360deg); transform: rotate(360deg); }
 }
+
+label {
+    font-weight: normal;
+}
\ No newline at end of file

From 5c1a67a8d95ab10d5f6d9c086f3fe67c7db32714 Mon Sep 17 00:00:00 2001
From: Arjit Chaudhary <arjit.c@gmail.com>
Date: Thu, 1 Oct 2015 20:04:32 +0530
Subject: [PATCH 03/29] Fixes #2012

---
 html/pages/logon.inc.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/html/pages/logon.inc.php b/html/pages/logon.inc.php
index bd0b86cf5..05e4508c3 100644
--- a/html/pages/logon.inc.php
+++ b/html/pages/logon.inc.php
@@ -42,14 +42,6 @@ else {
                         $msg_box[] = array('type'=>'error','message'=>$auth_message,'title'=>'Login error');
                     }
                     ?>
-                    <?php
-                    if (isset($config['login_message'])) {
-                      echo('
-                            <div class="form-group">
-                                <div class="alert alert-info text-center">'.$config['login_message'].'</div>
-                            </div>');
-                    }
-                    ?>
                     </form>
                     <script type="text/javascript">
                     <!--
@@ -61,6 +53,11 @@ else {
                     ?>
                     </div>
                   </div>
+                  <?php
+                    if (isset($config['login_message'])) {
+                      echo('<div class="panel-footer"><center>'.$config['login_message'].'</center></div>');
+                    }
+                    ?>
                 </div>
               </div>
             <div class="col-md-4"></div>

From 81b4fbf22158428bccf9d3315d49654215afd9f8 Mon Sep 17 00:00:00 2001
From: f0o <f0o@librenms.org>
Date: Fri, 2 Oct 2015 02:00:28 +0000
Subject: [PATCH 04/29] Fixes #2037

---
 includes/rrdtool.inc.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/includes/rrdtool.inc.php b/includes/rrdtool.inc.php
index 1c12f7e39..b846d060e 100644
--- a/includes/rrdtool.inc.php
+++ b/includes/rrdtool.inc.php
@@ -191,7 +191,7 @@ function rrdtool($command, $filename, $options) {
         print $console_color->convert('RRD[%g'.$cmd.'%n] ');
     }
     else {
-        $tmp = stream_get_contents($rrd_pipes[1]).stream_get_contents($rrd_pipes[2]);
+        return array(stream_get_contents($rrd_pipes[1]),stream_get_contents($rrd_pipes[2]));
     }
 
 }
@@ -206,6 +206,12 @@ function rrdtool($command, $filename, $options) {
 
 
 function rrdtool_create($filename, $options) {
+    if( $config['rrdcached'] && $config['rrdtool_version'] >= 1.5 ) {
+        $chk = rrdtool('info', $filename);
+        if (!empty($chk[0])) {
+            return true;
+        }
+    }
     return rrdtool('create', $filename,  str_replace(array("\r", "\n"), '', $options));
 }
 

From c09d81d26276ba7d88d23e306eadd4546255b574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Paszkiewicz?= <paszczus@uni.opole.pl>
Date: Fri, 2 Oct 2015 13:29:13 +0200
Subject: [PATCH 05/29] - updated RHEL/CentOS installation docs

---
 .../Installation-(RHEL-CentOS).md             | 44 ++++++++++++-------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/doc/Installation/Installation-(RHEL-CentOS).md b/doc/Installation/Installation-(RHEL-CentOS).md
index 101a0d766..208494e1b 100644
--- a/doc/Installation/Installation-(RHEL-CentOS).md
+++ b/doc/Installation/Installation-(RHEL-CentOS).md
@@ -1,4 +1,4 @@
-NOTE: What follows is a very rough list of commands.  This works on a fresh install of CentOS 6.4.
+NOTE: What follows is a very rough list of commands.  This works on a fresh install of CentOS 6.4 and CentOS 7.
 
 NOTE: These instructions assume you are the root user.  If you are not, prepend `sudo` to all shell commands (the ones that aren't at `mysql>` prompts) or temporarily become a user with root privileges with `sudo -s`.
 
@@ -10,7 +10,7 @@ This host is where the MySQL database runs.  It could be the same machine as you
 
 You are free to choose between using MySQL or MariaDB:
 
-**MySQL**
+**MySQL** (NOTE: In CentOS 7 there is only mariadb in official repo)
 ```bash
 yum install net-snmp mysql-server mysql-client
 chkconfig mysqld on
@@ -20,15 +20,15 @@ service mysqld start
 **MariaDB**
 ```bash
 yum install net-snmp mariadb-server mariadb-client
-chkconfig mariadb on
-service mariadb start
+systemctl enable mariadb
+systemctl start mariadb
 ```
 
 Now continue with the installation:
 
 ```bash
-service snmpd start
-chkconfig snmpd on
+chkconfig snmpd on (systemctl enable snmpd on CentOS 7)
+service snmpd start (systemctl start snmpd on CentOS 7)
 mysql_secure_installation
 mysql -uroot -p
 ```
@@ -70,20 +70,28 @@ Install necessary software.  The packages listed below are an all-inclusive list
 Note if not using HTTPd (Apache): RHEL requires `httpd` to be installed regardless of of `nginx`'s (or any other web-server's) presence.
 
     yum install epel-release
-    yum install php php-cli php-gd php-mysql php-snmp php-pear php-curl httpd net-snmp graphviz graphviz-php mysql ImageMagick jwhois nmap mtr rrdtool MySQL-python net-snmp-utils vixie-cron php-mcrypt fping git
+(CentOS 6)    yum install php php-cli php-gd php-mysql php-snmp php-pear php-curl httpd net-snmp graphviz graphviz-php mysql ImageMagick jwhois nmap mtr rrdtool MySQL-python net-snmp-utils vixie-cron php-mcrypt fping git
+(CentOS 7)    yum install php php-cli php-gd php-mysql php-snmp php-pear php-curl httpd net-snmp graphviz graphviz-php mariadb ImageMagick jwhois nmap mtr rrdtool MySQL-python net-snmp-utils vixie-cron php-mcrypt fping git
     pear install Net_IPv4-1.3.4
     pear install Net_IPv6-1.2.2b2
 
-### Adding the librenms-user ###
-
+### Adding the librenms-user for Apache ###
+```bash
     useradd librenms -d /opt/librenms -M -r
     usermod -a -G librenms apache
+```
+
+### Adding the librenms-user for Nginx ###
+```bash
+    useradd librenms -d /opt/librenms -M -r
+    usermod -a -G librenms nginx
+```
 
 ### Using HTTPd (Apache2) ###
 
 Set `httpd` to start on system boot.
 
-    chkconfig --levels 235 httpd on
+    chkconfig --levels 235 httpd on (systemctl enable httpd on CentOS 7)
 
 Next, add the following to `/etc/httpd/conf.d/librenms.conf`
 
@@ -110,8 +118,8 @@ If the file `/etc/httpd/conf.d/welcome.conf` exists, you might want to remove th
 Install necessary extra software and let it start on system boot.
 
     yum install nginx php-fpm
-    chkconfig nginx on
-    chkconfig php-fpm on
+    chkconfig nginx on (systemctl enable nginx on CentOS 7)
+    chkconfig php-fpm on (systemctl enable php-fpm on CentOS 7)
 
 Modify permissions and configuration for `php-fpm` to use nginx credentials.
 
@@ -193,23 +201,27 @@ To prepare the web interface (and adding devices shortly), you'll need to create
 
 First, create and chown the `rrd` directory and create the `logs` directory
 
+```bash
     mkdir rrd logs
     chown -R librenms:librenms /opt/librenms
+    chmod 775 rrd
+
     # For HTTPd (Apache):
     chown apache:apache logs
+
     # For Nginx:
     chown nginx:nginx logs
-
-    chmod 775 rrd
+```
 
 > If you're planing on running rrdcached, make sure that the path is also chmod'ed to 775 and chown'ed to librenms:librenms.
 
 Start the web-server:
 
     # For HTTPd (Apache):
-    service httpd restart
+    service httpd restart (systemctl restart httpd on CentOS 7)
+
     # For Nginx:
-    service nginx restart
+    service nginx restart (systemctl restart nginx on CentOS 7)
 
 ### Add localhost ###
 

From a947f3829cc8af8bb2e05fc237be499ba1135acf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Paszkiewicz?= <paszczus@uni.opole.pl>
Date: Fri, 2 Oct 2015 13:41:43 +0200
Subject: [PATCH 06/29] - added configuration for SELinux

---
 doc/Installation/Installation-(RHEL-CentOS).md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/doc/Installation/Installation-(RHEL-CentOS).md b/doc/Installation/Installation-(RHEL-CentOS).md
index 208494e1b..70e85799f 100644
--- a/doc/Installation/Installation-(RHEL-CentOS).md
+++ b/doc/Installation/Installation-(RHEL-CentOS).md
@@ -215,6 +215,20 @@ First, create and chown the `rrd` directory and create the `logs` directory
 
 > If you're planing on running rrdcached, make sure that the path is also chmod'ed to 775 and chown'ed to librenms:librenms.
 
+**SELinux**
+> if you're using SELinux you need to allow nginx to write into logs directory.
+> semanage tool is a part of policycoreutils-python, so if don't have it, you can install it
+
+```bash
+    yum install policycoreutils-python
+```
+
+```bash
+    semanage fcontext -a -t httpd_sys_content_t '/opt/librenms/logs(/.*)?'
+    semanage fcontext -a -t httpd_sys_rw_content_t '/opt/librenms/logs(/.*)?'
+    restorecon -RFvv /opt/librenms/logs/
+```
+
 Start the web-server:
 
     # For HTTPd (Apache):

From 970d83da0b135e8220d204f1a4f22dc8d3215ada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Paszkiewicz?= <paszczus@uni.opole.pl>
Date: Fri, 2 Oct 2015 14:46:15 +0200
Subject: [PATCH 07/29] - create session dir for php-fpm

---
 doc/Installation/Installation-(RHEL-CentOS).md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/Installation/Installation-(RHEL-CentOS).md b/doc/Installation/Installation-(RHEL-CentOS).md
index 70e85799f..09be1dbaa 100644
--- a/doc/Installation/Installation-(RHEL-CentOS).md
+++ b/doc/Installation/Installation-(RHEL-CentOS).md
@@ -123,6 +123,7 @@ Install necessary extra software and let it start on system boot.
 
 Modify permissions and configuration for `php-fpm` to use nginx credentials.
 
+    mkdir /var/lib/php/session
     chown root:nginx /var/lib/php -R
     vi /etc/php-fpm.d/www.conf      # At line #12: Change `listen` to `/var/run/php5-fpm.sock`
                                     # At line #39-41: Change the `user` and `group` to `nginx`

From 2c5c5fbff987f35085ac79d25639c9bc4c823cb0 Mon Sep 17 00:00:00 2001
From: Mike Rostermund <mike@kollegienet.dk>
Date: Fri, 2 Oct 2015 15:50:41 +0200
Subject: [PATCH 08/29] Fixed spacing to align text in menubar

---
 html/includes/print-menubar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 220112c51..50902dc05 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -51,7 +51,7 @@ else {
           <ul class="dropdown-menu">
             <li><a href="<?php echo(generate_url(array('page'=>'overview'))); ?>"><i class="fa fa-lightbulb-o fa-fw fa-lg"></i> Overview</a></li>
           <li class="dropdown-submenu">
-            <a><i class="fa fa-exclamation-circle fa-fw fa-lg"> </i>Alerts</a>
+            <a><i class="fa fa-exclamation-circle fa-fw fa-lg"> </i> Alerts</a>
             <ul class="dropdown-menu scrollable-menu">
             <li><a href="<?php echo(generate_url(array('page'=>'alerts'))); ?>"><i class="fa fa-bell fa-fw fa-lg"></i> Notifications</a></li>
             <li><a href="<?php echo(generate_url(array('page'=>'alert-log'))); ?>"><i class="fa fa-th-list fa-fw fa-lg"></i> Historical Log</a></li>

From fa6a8c8f2d4165555c2664cf3e9f46816386acbe Mon Sep 17 00:00:00 2001
From: Rosiak <sorenrosiak@gmail.com>
Date: Fri, 2 Oct 2015 22:03:06 +0200
Subject: [PATCH 09/29] Enhance WatchGuard OS Detection

Fix #2024
---
 includes/discovery/os/watchguard.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/discovery/os/watchguard.inc.php b/includes/discovery/os/watchguard.inc.php
index 0e0cec1f2..f3f872796 100644
--- a/includes/discovery/os/watchguard.inc.php
+++ b/includes/discovery/os/watchguard.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 if (!$os) {
-    if (preg_match('/^WatchGuard\ Fireware/', $sysDescr)) {
+    if (preg_match('/^WatchGuard\ Fireware/', $sysDescr) || strpos($sysObjectId, '1.3.6.1.4.1.3097.1.5') !== false) {
         $os = 'firebox';
     }
 }

From 4ee9200db085e6754589dc3fe3b4a36fa75b1fde Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Fri, 2 Oct 2015 17:05:36 -0300
Subject: [PATCH 10/29] Moved Device Groups SubMenu

Space fix
---
 html/includes/print-menubar.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 220112c51..179049cc1 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -129,16 +129,18 @@ foreach (dbFetchRows($sql,$param) as $devtype) {
     echo('            <li><a href="devices/type=' . $devtype['type'] . '/"><i class="fa fa-angle-double-right fa-fw fa-lg"></i> ' . ucfirst($devtype['type']) . '</a></li>');
 }
 
-require_once '../includes/device-groups.inc.php';
-
-foreach( GetDeviceGroups() as $group ) {
-    echo '<li><a href="'.generate_url(array('page'=>'devices','group'=>$group['id'])).'" alt="'.$group['desc'].'"><i class="fa fa-th fa-fw fa-lg"></i> '.ucfirst($group['name']).'</a></li>';
-}
-unset($group);
-
         echo ('</ul>
              </li>');
-
+            require_once '../includes/device-groups.inc.php';
+            $devices_groups = GetDeviceGroups();
+            if (count($devices_groups) > 0 ){
+                echo '<li class="dropdown-submenu"><a ><i class="fa fa-th fa-fw fa-lg"></i> Groups</a><ul class="dropdown-menu scrollable-menu">';
+                foreach( GetDeviceGroups() as $group ) {
+                    echo '<li><a href="'.generate_url(array('page'=>'devices','group'=>$group['id'])).'" alt="'.$group['desc'].'"><i class="fa fa-th fa-fw fa-lg"></i> '.ucfirst($group['name']).'</a></li>';
+                }
+                unset($group);
+                echo '</ul></li>';
+            }
 if ($_SESSION['userlevel'] >= '10') {
     if ($config['show_locations']) {
         echo('

From 4f6fa8a947f9af68301addd947a952eb5f385714 Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Fri, 2 Oct 2015 17:18:34 -0300
Subject: [PATCH 11/29] Fix double query

---
 html/includes/print-menubar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 179049cc1..ac40706d6 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -135,7 +135,7 @@ foreach (dbFetchRows($sql,$param) as $devtype) {
             $devices_groups = GetDeviceGroups();
             if (count($devices_groups) > 0 ){
                 echo '<li class="dropdown-submenu"><a ><i class="fa fa-th fa-fw fa-lg"></i> Groups</a><ul class="dropdown-menu scrollable-menu">';
-                foreach( GetDeviceGroups() as $group ) {
+                foreach( $devices_groups as $group ) {
                     echo '<li><a href="'.generate_url(array('page'=>'devices','group'=>$group['id'])).'" alt="'.$group['desc'].'"><i class="fa fa-th fa-fw fa-lg"></i> '.ucfirst($group['name']).'</a></li>';
                 }
                 unset($group);

From 6d0dbb23bcb7b5af1ac6b42ec5f80dd4013ec1d7 Mon Sep 17 00:00:00 2001
From: Juho Vanhanen <juho@vanhanen.me>
Date: Fri, 2 Oct 2015 23:28:43 +0300
Subject: [PATCH 12/29] Set font-weight to normal for all site styles

---
 html/css/light.css  | 4 ----
 html/css/styles.css | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/css/light.css b/html/css/light.css
index 7482b08b2..f224ff3cb 100644
--- a/html/css/light.css
+++ b/html/css/light.css
@@ -94,7 +94,3 @@
   0% { transform: rotate(0deg); transform: rotate(0deg); }
   100% { transform: rotate(360deg); transform: rotate(360deg); }
 }
-
-label {
-    font-weight: normal;
-}
\ No newline at end of file
diff --git a/html/css/styles.css b/html/css/styles.css
index c7e55d4e6..46abbc37f 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -1761,3 +1761,7 @@ tr.search:nth-child(odd) {
 .edit-storage-input {
     width: 100px;
 }
+
+label {
+    font-weight: normal;
+}
\ No newline at end of file

From 8be91f25da9b1faa1b351fbe435429c56048a567 Mon Sep 17 00:00:00 2001
From: Juho Vanhanen <juho@vanhanen.me>
Date: Fri, 2 Oct 2015 23:39:06 +0300
Subject: [PATCH 13/29] Removed useless CSS

---
 html/css/light.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/html/css/light.css b/html/css/light.css
index 7482b08b2..f224ff3cb 100644
--- a/html/css/light.css
+++ b/html/css/light.css
@@ -94,7 +94,3 @@
   0% { transform: rotate(0deg); transform: rotate(0deg); }
   100% { transform: rotate(360deg); transform: rotate(360deg); }
 }
-
-label {
-    font-weight: normal;
-}
\ No newline at end of file

From 8490ec0bfbc8f6a9386e28975923f969922387fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Paszkiewicz?= <paszczus@uni.opole.pl>
Date: Sat, 3 Oct 2015 14:27:26 +0200
Subject: [PATCH 14/29] - fixes for compability with CentOS 6

---
 doc/Installation/Installation-(RHEL-CentOS).md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/Installation/Installation-(RHEL-CentOS).md b/doc/Installation/Installation-(RHEL-CentOS).md
index 09be1dbaa..d3de23deb 100644
--- a/doc/Installation/Installation-(RHEL-CentOS).md
+++ b/doc/Installation/Installation-(RHEL-CentOS).md
@@ -20,8 +20,8 @@ service mysqld start
 **MariaDB**
 ```bash
 yum install net-snmp mariadb-server mariadb-client
-systemctl enable mariadb
-systemctl start mariadb
+chkconfig mariadb on (systemctl enable mariadb on CentOS 7)
+service mariadb start (systemctl start mariadb on CentOS 7)
 ```
 
 Now continue with the installation:

From 5fd1f598524dba46c2fe6c50d4e10f8246fb43b7 Mon Sep 17 00:00:00 2001
From: f0o <f0o@librenms.org>
Date: Sat, 3 Oct 2015 16:14:23 +0000
Subject: [PATCH 15/29] Fixup

---
 includes/rrdtool.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/rrdtool.inc.php b/includes/rrdtool.inc.php
index b846d060e..b71eee7a0 100644
--- a/includes/rrdtool.inc.php
+++ b/includes/rrdtool.inc.php
@@ -206,8 +206,9 @@ function rrdtool($command, $filename, $options) {
 
 
 function rrdtool_create($filename, $options) {
+    global $config;
     if( $config['rrdcached'] && $config['rrdtool_version'] >= 1.5 ) {
-        $chk = rrdtool('info', $filename);
+        $chk = rrdtool('info', $filename, '');
         if (!empty($chk[0])) {
             return true;
         }

From 3341fdbfc4e626c6f1f35166bfba5de938f6ebdb Mon Sep 17 00:00:00 2001
From: Mattz0r <matt@mattz0r.me.uk>
Date: Sat, 3 Oct 2015 18:39:08 +0200
Subject: [PATCH 16/29] Fixed some spelling mistakes within Alerting.md

---
 AUTHORS.md                 | 1 +
 doc/Extensions/Alerting.md | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 6ff840e07..f2ce958c1 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -58,5 +58,6 @@ Contributors to LibreNMS:
 - Mark Nagel <mnagel@willingminds.com> (ciscoqid)
 - Sławomir Paszkiewicz <paszczus@pld-linux.org> (paszczus)
 - Frederik Mogensen <frederik@server-1.dk> (mogensen)
+- Matthew Scully <matt@mattz0r.me.uk (mattz0r)
 
 [1]: http://observium.org/ "Observium web site"
diff --git a/doc/Extensions/Alerting.md b/doc/Extensions/Alerting.md
index bd0b1a786..fe4e51dab 100644
--- a/doc/Extensions/Alerting.md
+++ b/doc/Extensions/Alerting.md
@@ -66,7 +66,7 @@ __Conditions__ can be any of:
 __Values__ can be Entities or any single-quoted data.  
 __Glues__ can be either `&&` for `AND` or `||` for `OR`.
 
-__Note__: The difference between `Equals` and `Matches` (and it's negation) is that `Equals` does a strict comparison and `Matches` allows the usage of RegExp.  
+__Note__: The difference between `Equals` and `Matches` (and its negation) is that `Equals` does a strict comparison and `Matches` allows the usage of RegExp.  
 Arithmetics are allowed as well.
 
 ## <a name="rules-examples">Examples</a>
@@ -145,7 +145,7 @@ To include users that have `Global-Read` or `Administrator` permissions it is re
 ~
 ```php
 $config['alert']['globals'] = true; //Include Global-Read into alert-contacts
-$config['alert']['admins']  = true; //Include Adminstrators into alert-contacts
+$config['alert']['admins']  = true; //Include Administrators into alert-contacts
 ```
 ~~
 
@@ -374,7 +374,7 @@ $config['alert']['transports']['pushbullet'] = 'MYFANCYACCESSTOKEN';
 
 # <a name="entities">Entities
 
-Entities as described earlier are based on the table and column names within the database, if you are ensure of what the entity is you want then have a browse around inside MySQL using `show tables` and `desc <tablename>`.
+Entities as described earlier are based on the table and column names within the database, if you are unsure of what the entity is you want then have a browse around inside MySQL using `show tables` and `desc <tablename>`.
 
 ## <a name="entity-devices">Devices</a>
 

From 9d866618c5a0e3dae0a506eec357c3c176f52d3c Mon Sep 17 00:00:00 2001
From: Mattz0r <matt@mattz0r.me.uk>
Date: Sat, 3 Oct 2015 18:49:19 +0200
Subject: [PATCH 17/29] I agree to the conditions of the Contributor Agreement
 contained in doc/General/Contributing.md.

---
 AUTHORS.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index f2ce958c1..6ff840e07 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -58,6 +58,5 @@ Contributors to LibreNMS:
 - Mark Nagel <mnagel@willingminds.com> (ciscoqid)
 - Sławomir Paszkiewicz <paszczus@pld-linux.org> (paszczus)
 - Frederik Mogensen <frederik@server-1.dk> (mogensen)
-- Matthew Scully <matt@mattz0r.me.uk (mattz0r)
 
 [1]: http://observium.org/ "Observium web site"

From 9aa3bf400f03887063a2bd0348a6e442effefd78 Mon Sep 17 00:00:00 2001
From: Mattz0r <matt@mattz0r.me.uk>
Date: Sat, 3 Oct 2015 18:50:07 +0200
Subject: [PATCH 18/29] I agree to the conditions of the Contributor Agreement
 contained in doc/General/Contributing.md.

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 6ff840e07..6fbea29d3 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -58,5 +58,6 @@ Contributors to LibreNMS:
 - Mark Nagel <mnagel@willingminds.com> (ciscoqid)
 - Sławomir Paszkiewicz <paszczus@pld-linux.org> (paszczus)
 - Frederik Mogensen <frederik@server-1.dk> (mogensen)
+- Matthew Scully <matt@mattz0r.me.uk> (mattz0r)
 
 [1]: http://observium.org/ "Observium web site"

From 36b547cf6cfbd0626131620751ed2bae3a69b63a Mon Sep 17 00:00:00 2001
From: Daniel Preussker <f0o@users.noreply.github.com>
Date: Sun, 4 Oct 2015 09:46:49 +0000
Subject: [PATCH 19/29] Fix typo in FAQ

---
 doc/Support/FAQ.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/Support/FAQ.md b/doc/Support/FAQ.md
index 4fb4d74cb..d7317db4f 100644
--- a/doc/Support/FAQ.md
+++ b/doc/Support/FAQ.md
@@ -22,7 +22,7 @@
 
 This is currently well documented within the doc folder of the installation files.
 
-For Debian / Ubuntu installs follow [Debian / Ubuntu](http://docs.librenms.org/Installation/Installation-(Debian-Ubuntu)
+For Debian / Ubuntu installs follow [Debian / Ubuntu](http://docs.librenms.org/Installation/Installation-(Debian-Ubuntu))
 
 For RedHat / CentOS installs follow [RedHat / CentOS](http://docs.librenms.org/Installation/Installation-(RHEL-CentOS))
 
@@ -60,7 +60,7 @@ However we will always aim to help wherever possible so if you are running a dis
 
 #### <a name="faq5"> Do you have a demo available?</a>
 
-We do indeed, you can find access to the demo [here](demo.librenms.org)
+We do indeed, you can find access to the demo [here](https://demo.librenms.org)
 
 #### <a name="faq6"> Why do I get blank pages sometimes in the WebUI?</a>
 

From 4e747249faf4d7e4b39ba189360236a78e138f80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Paszkiewicz?= <paszczus@uni.opole.pl>
Date: Sun, 4 Oct 2015 14:06:52 +0200
Subject: [PATCH 20/29] - LibreNMS and SELinux is still experimental

---
 doc/Installation/Installation-(RHEL-CentOS).md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/Installation/Installation-(RHEL-CentOS).md b/doc/Installation/Installation-(RHEL-CentOS).md
index d3de23deb..eaeff7c44 100644
--- a/doc/Installation/Installation-(RHEL-CentOS).md
+++ b/doc/Installation/Installation-(RHEL-CentOS).md
@@ -219,6 +219,7 @@ First, create and chown the `rrd` directory and create the `logs` directory
 **SELinux**
 > if you're using SELinux you need to allow nginx to write into logs directory.
 > semanage tool is a part of policycoreutils-python, so if don't have it, you can install it
+> Please note that running LibreNMS with SELinux is still experimental and we cannot guarantee that everything will be working fine for now.
 
 ```bash
     yum install policycoreutils-python

From 80a816dab9b8dedd2bea1f19aa95b9a7a9aa5131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Paszkiewicz?= <paszczus@uni.opole.pl>
Date: Sun, 4 Oct 2015 19:15:12 +0200
Subject: [PATCH 21/29] - added env php to top of file

---
 scripts/gen_smokeping.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/gen_smokeping.php b/scripts/gen_smokeping.php
index 9421af137..cd4baacfe 100755
--- a/scripts/gen_smokeping.php
+++ b/scripts/gen_smokeping.php
@@ -1,3 +1,4 @@
+#!/usr/bin/env php
 <?php
 /*
 * LibreNMS

From 1c51ddd46b6e5ac124d27d35d839e6c452308000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Paszkiewicz?= <paszczus@uni.opole.pl>
Date: Mon, 5 Oct 2015 10:56:22 +0200
Subject: [PATCH 22/29] - separated commands for CentOS 6 and CentOS 7

---
 .../Installation-(RHEL-CentOS).md             | 81 ++++++++++++++++---
 1 file changed, 69 insertions(+), 12 deletions(-)

diff --git a/doc/Installation/Installation-(RHEL-CentOS).md b/doc/Installation/Installation-(RHEL-CentOS).md
index eaeff7c44..d4dde6f9a 100644
--- a/doc/Installation/Installation-(RHEL-CentOS).md
+++ b/doc/Installation/Installation-(RHEL-CentOS).md
@@ -8,9 +8,10 @@ This host is where the MySQL database runs.  It could be the same machine as you
 
 > ** Whilst we are working on ensuring LibreNMS is compatible with MySQL strict mode, for now, please disable this after mysql is installed.
 
+**CentOS 6**:
 You are free to choose between using MySQL or MariaDB:
 
-**MySQL** (NOTE: In CentOS 7 there is only mariadb in official repo)
+**MySQL**
 ```bash
 yum install net-snmp mysql-server mysql-client
 chkconfig mysqld on
@@ -24,11 +25,30 @@ chkconfig mariadb on (systemctl enable mariadb on CentOS 7)
 service mariadb start (systemctl start mariadb on CentOS 7)
 ```
 
+**CentOS 7**
+
+(NOTE: In CentOS 7 there is only mariadb in official repo)
+**MariaDB**
+```bash
+yum install net-snmp mariadb-server mariadb-client
+systemctl enable mariadb
+systemctl start mariadb
+```
+
 Now continue with the installation:
 
+**CentOS 6**
 ```bash
-chkconfig snmpd on (systemctl enable snmpd on CentOS 7)
-service snmpd start (systemctl start snmpd on CentOS 7)
+chkconfig snmpd on
+service snmpd start
+mysql_secure_installation
+mysql -uroot -p
+```
+
+**CentOS 7**
+```bash
+systemctl enable snmpd
+systemctl start snmpd
 mysql_secure_installation
 mysql -uroot -p
 ```
@@ -69,11 +89,20 @@ Install necessary software.  The packages listed below are an all-inclusive list
 
 Note if not using HTTPd (Apache): RHEL requires `httpd` to be installed regardless of of `nginx`'s (or any other web-server's) presence.
 
+**CentOS 6**
+```bash
     yum install epel-release
-(CentOS 6)    yum install php php-cli php-gd php-mysql php-snmp php-pear php-curl httpd net-snmp graphviz graphviz-php mysql ImageMagick jwhois nmap mtr rrdtool MySQL-python net-snmp-utils vixie-cron php-mcrypt fping git
-(CentOS 7)    yum install php php-cli php-gd php-mysql php-snmp php-pear php-curl httpd net-snmp graphviz graphviz-php mariadb ImageMagick jwhois nmap mtr rrdtool MySQL-python net-snmp-utils vixie-cron php-mcrypt fping git
+yum install php php-cli php-gd php-mysql php-snmp php-pear php-curl httpd net-snmp graphviz graphviz-php mysql ImageMagick jwhois nmap mtr rrdtool MySQL-python net-snmp-utils vixie-cron php-mcrypt fping git
     pear install Net_IPv4-1.3.4
     pear install Net_IPv6-1.2.2b2
+```
+
+**CentOS 7**
+```bash
+    yum install php php-cli php-gd php-mysql php-snmp php-pear php-curl httpd net-snmp graphviz graphviz-php mariadb ImageMagick jwhois nmap mtr rrdtool MySQL-python net-snmp-utils vixie-cron php-mcrypt fping git
+    pear install Net_IPv4-1.3.4
+    pear install Net_IPv6-1.2.2b2
+```
 
 ### Adding the librenms-user for Apache ###
 ```bash
@@ -91,7 +120,11 @@ Note if not using HTTPd (Apache): RHEL requires `httpd` to be installed regardle
 
 Set `httpd` to start on system boot.
 
-    chkconfig --levels 235 httpd on (systemctl enable httpd on CentOS 7)
+**CentOS 6**
+    chkconfig --levels 235 httpd on
+
+**CentOS 7**
+    systemctl enable httpd
 
 Next, add the following to `/etc/httpd/conf.d/librenms.conf`
 
@@ -117,9 +150,19 @@ If the file `/etc/httpd/conf.d/welcome.conf` exists, you might want to remove th
 
 Install necessary extra software and let it start on system boot.
 
+**CentOS 6**
+```bash
     yum install nginx php-fpm
-    chkconfig nginx on (systemctl enable nginx on CentOS 7)
-    chkconfig php-fpm on (systemctl enable php-fpm on CentOS 7)
+    chkconfig nginx on
+    chkconfig php-fpm on
+```
+
+**CentOS 7**
+```bash
+    yum install nginx php-fpm
+    systemctl enable nginx
+    systemctl enable php-fpm
+```
 
 Modify permissions and configuration for `php-fpm` to use nginx credentials.
 
@@ -160,15 +203,19 @@ server {
 
 You can clone the repository via HTTPS or SSH.  In either case, you need to ensure the appropriate port (443 for HTTPS, 22 for SSH) is open in the outbound direction for your server.
 
+```bash
     cd /opt
     git clone https://github.com/librenms/librenms.git librenms
     cd /opt/librenms
+```
 
 At this stage you can either launch the web installer by going to http://IP/install.php, follow the on-screen instructions then skip to the 'Web Interface' section further down. Alternatively if you want
 to continue the setup manually then just keep following these instructions.
 
+```bash
     cp config.php.default config.php
-    vim config.php
+    vim config.
+```
 
 NOTE: The recommended method of cloning a git repository is HTTPS.  If you would like to clone via SSH instead, use the command `git clone git@github.com:librenms/librenms.git librenms` instead.
 
@@ -233,11 +280,21 @@ First, create and chown the `rrd` directory and create the `logs` directory
 
 Start the web-server:
 
+**CentOS 6**
+
     # For HTTPd (Apache):
-    service httpd restart (systemctl restart httpd on CentOS 7)
+    service httpd restart
 
     # For Nginx:
-    service nginx restart (systemctl restart nginx on CentOS 7)
+    service nginx restart
+
+**CentOS 7**
+
+    # For HTTPd (Apache):
+    systemctl restart httpd
+
+    # For Nginx:
+    systemctl restart nginx
 
 ### Add localhost ###
 
@@ -283,4 +340,4 @@ If you don't see data after this, please refer to the [FAQ](http://docs.librenms
 
 That's it!  You now should be able to log in to http://librenms.example.com/.  Please note that we have not covered HTTPS setup in this example, so your LibreNMS install is not secure by default.  Please do not expose it to the public Internet unless you have configured HTTPS and taken appropriate web server hardening steps.
 
-It would be great if you would consider opting into the stats system we have, please see [this page](http://docs.librenms.org/General/Callback-Stats-and-Privacy/) on what it is and how to enable it.
+It would be great if you would consider opting into the stats system we have, please see [this page](http://docs.librenms.org/General/Callback-Stats-and-Privacy/) on what it is and how to enable it.
\ No newline at end of file

From 0901c795f3da6340a0934ec970c6d90a566a1ddd Mon Sep 17 00:00:00 2001
From: Juho Vanhanen <juho@vanhanen.me>
Date: Mon, 5 Oct 2015 16:26:27 +0300
Subject: [PATCH 23/29] Added colors to alerts sent to IRC

---
 doc/Extensions/IRC-Bot.md |  1 +
 includes/defaults.inc.php | 21 +++++++++++----------
 irc.php                   | 15 +++++++++++++--
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/doc/Extensions/IRC-Bot.md b/doc/Extensions/IRC-Bot.md
index c06353f67..7410869f1 100644
--- a/doc/Extensions/IRC-Bot.md
+++ b/doc/Extensions/IRC-Bot.md
@@ -23,6 +23,7 @@ Option | Default-Value | Notes
 --- | --- | ---
 `$config['irc_alert']` | `false` | Optional; Enables Alerting-Socket. `EXPERIMENTAL`
 `$config['irc_alert_chan']` | `false` | Optional; Multiple channels can be defined as Array or delimited with `,`. `EXPERIMENTAL`
+`$config['irc_alert_utf8']` | `false` | Optional; Enables use of strikethrough in alerts via UTF-8 encoded characters. Might cause trouble for some clients.
 `$config['irc_authtime']` | `3` | Optional; Defines how long in Hours an auth-session is valid.
 `$config['irc_chan']` | `##librenms` | Optional; Multiple channels can be defined as Array or delimited with `,`
 `$config['irc_debug']` | `false` | Optional; Enables debug output (Wall of text)
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index e42195015..a47a32d87 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -501,16 +501,17 @@ $config['device_traffic_descr'][] = '/null/';
 $config['device_traffic_descr'][] = '/dummy/';
 
 // IRC Bot configuration
-$config['irc_host']     = '';
-$config['irc_port']     = '';
-$config['irc_maxretry'] = 3;
-$config['irc_nick']     = $config['project_name'];
-$config['irc_chan'][]   = '##'.$config['project_id'];
-$config['irc_pass']     = '';
-$config['irc_external'] = '';
-$config['irc_authtime'] = 3;
-$config['irc_debug']    = false;
-$config['irc_alert']    = false;
+$config['irc_host']       = '';
+$config['irc_port']       = '';
+$config['irc_maxretry']   = 3;
+$config['irc_nick']       = $config['project_name'];
+$config['irc_chan'][]     = '##'.$config['project_id'];
+$config['irc_pass']       = '';
+$config['irc_external']   = '';
+$config['irc_authtime']   = 3;
+$config['irc_debug']      = false;
+$config['irc_alert']      = false;
+$config['irc_alert_utf8'] = false;
 
 // Authentication
 $config['allow_unauth_graphs'] = 0;
diff --git a/irc.php b/irc.php
index 96cc1a572..38953b8a9 100755
--- a/irc.php
+++ b/irc.php
@@ -227,9 +227,20 @@ class ircbot {
                 return false;
             }
 
+            switch ($alert['state']):
+                case 3: $severity_extended = '+'; break;
+                case 4: $severity_extended = '-'; break;
+                default: $severity_extended = '';
+            endswitch;
+
+            $severity = str_replace(array('warning', 'critical'), array(chr(3).'8Warning', chr(3).'4Critical'), $alert['severity']).$severity_extended.chr(3).' ';
+            if ($alert['state'] == 0 and $this->config['irc_alert_utf8']) {
+                $severity = str_replace(array('Warning', 'Critical'), array('W̶a̶r̶n̶i̶n̶g̶', 'C̶r̶i̶t̶i̶c̶a̶l̶'), $severity);
+            }
+
             if ($this->config['irc_alert_chan']) {
                 foreach ($this->config['irc_alert_chan'] as $chan) {
-                    $this->irc_raw('PRIVMSG '.$chan.' :'.trim($alert['title']).' - Rule: '.trim($alert['name'] ? $alert['name'] : $alert['rule']).(sizeof($alert['faults']) > 0 ? ' - Faults:' : ''));
+                    $this->irc_raw('PRIVMSG '.$chan.' :'.$severity.trim($alert['title']).' - Rule: '.trim($alert['name'] ? $alert['name'] : $alert['rule']).(sizeof($alert['faults']) > 0 ? ' - Faults:' : ''));
                     foreach ($alert['faults'] as $k => $v) {
                         $this->irc_raw('PRIVMSG '.$chan.' :#'.$k.' '.$v['string']);
                     }
@@ -238,7 +249,7 @@ class ircbot {
             else {
                 foreach ($this->authd as $nick => $data) {
                     if ($data['expire'] >= time()) {
-                        $this->irc_raw('PRIVMSG '.$nick.' :'.trim($alert['title']).' - Rule: '.trim($alert['name'] ? $alert['name'] : $alert['rule']).(sizeof($alert['faults']) > 0 ? ' - Faults'.(sizeof($alert['faults']) > 3 ? ' (showing first 3 out of '.sizeof($alert['faults']).' )' : '' ).':' : ''));
+                        $this->irc_raw('PRIVMSG '.$nick.' :'.$severity.trim($alert['title']).' - Rule: '.trim($alert['name'] ? $alert['name'] : $alert['rule']).(sizeof($alert['faults']) > 0 ? ' - Faults'.(sizeof($alert['faults']) > 3 ? ' (showing first 3 out of '.sizeof($alert['faults']).' )' : '' ).':' : ''));
                         foreach ($alert['faults'] as $k => $v) {
                             $this->irc_raw('PRIVMSG '.$nick.' :#'.$k.' '.$v['string']);
                             if ($k >= 3) {

From 20db0e29b24ce57c54a75858c1ff8e80af774eec Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Mon, 5 Oct 2015 12:27:12 -0300
Subject: [PATCH 24/29] Renamed menu name.

---
 html/includes/print-menubar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index ac40706d6..3ebd0f7ab 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -134,7 +134,7 @@ foreach (dbFetchRows($sql,$param) as $devtype) {
             require_once '../includes/device-groups.inc.php';
             $devices_groups = GetDeviceGroups();
             if (count($devices_groups) > 0 ){
-                echo '<li class="dropdown-submenu"><a ><i class="fa fa-th fa-fw fa-lg"></i> Groups</a><ul class="dropdown-menu scrollable-menu">';
+                echo '<li class="dropdown-submenu"><a ><i class="fa fa-th fa-fw fa-lg"></i> Device Groups</a><ul class="dropdown-menu scrollable-menu">';
                 foreach( $devices_groups as $group ) {
                     echo '<li><a href="'.generate_url(array('page'=>'devices','group'=>$group['id'])).'" alt="'.$group['desc'].'"><i class="fa fa-th fa-fw fa-lg"></i> '.ucfirst($group['name']).'</a></li>';
                 }
@@ -531,7 +531,7 @@ if ($_SESSION['userlevel'] >= '10') {
            </ul>
            </li>
            <li role="presentation" class="divider"></li>');
-} 
+}
 
 if ($_SESSION['authenticated']) {
     echo('

From 9ca61ffe900e223a7cbee5eb984054f0f5fc7bd8 Mon Sep 17 00:00:00 2001
From: Juho Vanhanen <juho@vanhanen.me>
Date: Tue, 6 Oct 2015 01:24:44 +0300
Subject: [PATCH 25/29] Fixed irc bot reconnect if socket dies

---
 irc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/irc.php b/irc.php
index 38953b8a9..4a9a374d3 100755
--- a/irc.php
+++ b/irc.php
@@ -74,7 +74,6 @@ class ircbot {
             $this->sql = $database_link;
         }
 
-        $this->j      = 2;
         $this->config = $config;
         $this->debug  = $this->config['irc_debug'];
         $this->config['irc_authtime'] = $this->config['irc_authtime'] ? $this->config['irc_authtime'] : 3;
@@ -150,6 +149,8 @@ class ircbot {
             $this->connect_alert();
         }
 
+        $this->j = 2;
+
         $this->connect();
         $this->log('Connected');
         if ($this->pass) {
@@ -159,7 +160,7 @@ class ircbot {
         $this->doAuth();
         while (true) {
             foreach ($this->socket as $n => $socket) {
-                if (!is_resource($socket)) {
+                if (!is_resource($socket) || feof($socket)) {
                     $this->log("Socket '$n' closed. Restarting.");
                     break 2;
                 }

From f879fdc23fde5b40cdf4a35b9558e1e11adc4a57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Paszkiewicz?= <paszczus@uni.opole.pl>
Date: Tue, 6 Oct 2015 10:44:41 +0200
Subject: [PATCH 26/29] - fixes after last changes

---
 doc/Installation/Installation-(RHEL-CentOS).md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/Installation/Installation-(RHEL-CentOS).md b/doc/Installation/Installation-(RHEL-CentOS).md
index d4dde6f9a..76b9550fb 100644
--- a/doc/Installation/Installation-(RHEL-CentOS).md
+++ b/doc/Installation/Installation-(RHEL-CentOS).md
@@ -21,8 +21,8 @@ service mysqld start
 **MariaDB**
 ```bash
 yum install net-snmp mariadb-server mariadb-client
-chkconfig mariadb on (systemctl enable mariadb on CentOS 7)
-service mariadb start (systemctl start mariadb on CentOS 7)
+chkconfig mariadb on
+service mariadb start
 ```
 
 **CentOS 7**
@@ -92,7 +92,7 @@ Note if not using HTTPd (Apache): RHEL requires `httpd` to be installed regardle
 **CentOS 6**
 ```bash
     yum install epel-release
-yum install php php-cli php-gd php-mysql php-snmp php-pear php-curl httpd net-snmp graphviz graphviz-php mysql ImageMagick jwhois nmap mtr rrdtool MySQL-python net-snmp-utils vixie-cron php-mcrypt fping git
+    yum install php php-cli php-gd php-mysql php-snmp php-pear php-curl httpd net-snmp graphviz graphviz-php mysql ImageMagick jwhois nmap mtr rrdtool MySQL-python net-snmp-utils vixie-cron php-mcrypt fping git
     pear install Net_IPv4-1.3.4
     pear install Net_IPv6-1.2.2b2
 ```
@@ -340,4 +340,4 @@ If you don't see data after this, please refer to the [FAQ](http://docs.librenms
 
 That's it!  You now should be able to log in to http://librenms.example.com/.  Please note that we have not covered HTTPS setup in this example, so your LibreNMS install is not secure by default.  Please do not expose it to the public Internet unless you have configured HTTPS and taken appropriate web server hardening steps.
 
-It would be great if you would consider opting into the stats system we have, please see [this page](http://docs.librenms.org/General/Callback-Stats-and-Privacy/) on what it is and how to enable it.
\ No newline at end of file
+It would be great if you would consider opting into the stats system we have, please see [this page](http://docs.librenms.org/General/Callback-Stats-and-Privacy/) on what it is and how to enable it.

From 58e8e19efe1a81fefeb93694899b2e961a5eb8e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Paszkiewicz?= <paszczus@uni.opole.pl>
Date: Tue, 6 Oct 2015 10:58:51 +0200
Subject: [PATCH 27/29] - another part of fixes

---
 doc/Installation/Installation-(RHEL-CentOS).md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/Installation/Installation-(RHEL-CentOS).md b/doc/Installation/Installation-(RHEL-CentOS).md
index 76b9550fb..994dcc85c 100644
--- a/doc/Installation/Installation-(RHEL-CentOS).md
+++ b/doc/Installation/Installation-(RHEL-CentOS).md
@@ -168,7 +168,7 @@ Modify permissions and configuration for `php-fpm` to use nginx credentials.
 
     mkdir /var/lib/php/session
     chown root:nginx /var/lib/php -R
-    vi /etc/php-fpm.d/www.conf      # At line #12: Change `listen` to `/var/run/php5-fpm.sock`
+    vim /etc/php-fpm.d/www.conf      # At line #12: Change `listen` to `/var/run/php5-fpm.sock`
                                     # At line #39-41: Change the `user` and `group` to `nginx`
 
 Add configuration for `nginx` at `/etc/nginx/conf.d/librenms.conf` with the following content:
@@ -214,7 +214,7 @@ to continue the setup manually then just keep following these instructions.
 
 ```bash
     cp config.php.default config.php
-    vim config.
+    vim config.php
 ```
 
 NOTE: The recommended method of cloning a git repository is HTTPS.  If you would like to clone via SSH instead, use the command `git clone git@github.com:librenms/librenms.git librenms` instead.
@@ -264,9 +264,9 @@ First, create and chown the `rrd` directory and create the `logs` directory
 > If you're planing on running rrdcached, make sure that the path is also chmod'ed to 775 and chown'ed to librenms:librenms.
 
 **SELinux**
-> if you're using SELinux you need to allow nginx to write into logs directory.
+> if you're using SELinux you need to allow web server user to write into logs directory.
 > semanage tool is a part of policycoreutils-python, so if don't have it, you can install it
-> Please note that running LibreNMS with SELinux is still experimental and we cannot guarantee that everything will be working fine for now.
+> **Please note that running LibreNMS with SELinux is still experimental and we cannot guarantee that everything will be working fine for now.**
 
 ```bash
     yum install policycoreutils-python

From 090496d8b8d59db9026686e94e23508a6cfaef7c Mon Sep 17 00:00:00 2001
From: Daniel Preussker <f0o@users.noreply.github.com>
Date: Tue, 6 Oct 2015 09:26:54 +0000
Subject: [PATCH 28/29] Update Installation-(RHEL-CentOS).md

---
 doc/Installation/Installation-(RHEL-CentOS).md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/doc/Installation/Installation-(RHEL-CentOS).md b/doc/Installation/Installation-(RHEL-CentOS).md
index 994dcc85c..a9b560de8 100644
--- a/doc/Installation/Installation-(RHEL-CentOS).md
+++ b/doc/Installation/Installation-(RHEL-CentOS).md
@@ -308,10 +308,7 @@ Discover localhost:
 
 ### Create cronjob ###
 
-The polling method used by LibreNMS is `poller-wrapper.py`, which was placed in
-the public domain by its author.  By default, the LibreNMS cronjob runs `poller-
-wrapper.py` with 16 threads.  The current LibreNMS recommendation is to use 4 th
-reads per core.  The default if no thread count is `16 threads`.
+The polling method used by LibreNMS is `poller-wrapper.py`, which was placed in the public domain by its author.  By default, the LibreNMS cronjob runs `poller-wrapper.py` with 16 threads.  The current LibreNMS recommendation is to use 4 threads per core.  The default if no thread count is `16 threads`.
 
 If the thread count needs to be changed, you can do so by editing the cron file (`/etc/cron.d/librenms`).
  Just add a number after `poller-wrapper.py`, as in the below example:

From 7b15f2d29dda31f995b63cf8fdae2474d616bbf0 Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Tue, 6 Oct 2015 08:12:31 -0300
Subject: [PATCH 29/29] Fixed missing href

---
 html/includes/print-menubar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 3ebd0f7ab..684b1dc56 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -134,7 +134,7 @@ foreach (dbFetchRows($sql,$param) as $devtype) {
             require_once '../includes/device-groups.inc.php';
             $devices_groups = GetDeviceGroups();
             if (count($devices_groups) > 0 ){
-                echo '<li class="dropdown-submenu"><a ><i class="fa fa-th fa-fw fa-lg"></i> Device Groups</a><ul class="dropdown-menu scrollable-menu">';
+                echo '<li class="dropdown-submenu"><a href="#"><i class="fa fa-th fa-fw fa-lg"></i> Device Groups</a><ul class="dropdown-menu scrollable-menu">';
                 foreach( $devices_groups as $group ) {
                     echo '<li><a href="'.generate_url(array('page'=>'devices','group'=>$group['id'])).'" alt="'.$group['desc'].'"><i class="fa fa-th fa-fw fa-lg"></i> '.ucfirst($group['name']).'</a></li>';
                 }