From 8b6ea4bdec2338bd453ab964a4294865969dd060 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Thu, 30 Jul 2015 18:04:27 +0000
Subject: [PATCH 1/3] Added config option for navbar menu manage groups

---
 html/includes/print-menubar.php | 12 +++++++++---
 includes/defaults.inc.php       |  3 +++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index e42c634e93..a24f91c752 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -140,11 +140,17 @@ if ($_SESSION['userlevel'] >= '10') {
             </li>
             ');
     }
-    echo('
+    echo '
             <li role="presentation" class="divider"></li>
-            <li><a href="'.generate_url(array('page'=>'device-groups')).'"><i class="fa fa-th fa-fw fa-lg"></i> Manage Groups</a></li>
+         ';
+
+    if ($config['navbar']['manage_groups']['hide'] === 0) {
+        echo '<li><a href="'.generate_url(array('page'=>'device-groups')).'"><i class="fa fa-th fa-fw fa-lg"></i> Manage Groups</a></li>';
+    }
+
+     echo '
             <li><a href="addhost/"><i class="fa fa-plus fa-col-success fa-fw fa-lg"></i> Add Device</a></li>
-            <li><a href="delhost/"><i class="fa fa-trash fa-col-info fa-fw fa-lg"></i> Delete Device</a></li>');
+            <li><a href="delhost/"><i class="fa fa-trash fa-col-info fa-fw fa-lg"></i> Delete Device</a></li>';
 }
 
 ?>
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index ff52c59abe..332c758c43 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -780,3 +780,6 @@ $config['mapael']['default_map']                        = 'maps/world_countries.
 $config['leaflet']['default_lat']                       = '50.898482';
 $config['leaflet']['default_lng']                       = '-3.401402';
 $config['leaflet']['default_zoom']                       = 2;
+
+// Navbar variables
+$config['navbar']['manage_groups']['hide']              = 0;

From 2a1b74dab86bd6cf2ef9792747c84ecfd3ea2dff Mon Sep 17 00:00:00 2001
From: ghbms <bsmith@bigbrainglobal.com>
Date: Thu, 30 Jul 2015 20:02:59 -0400
Subject: [PATCH 2/3] Update Agent-Setup.md

If you do not change directory, the directions won't work.
---
 doc/Extensions/Agent-Setup.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/Extensions/Agent-Setup.md b/doc/Extensions/Agent-Setup.md
index 7ec1e80839..3e562c0582 100644
--- a/doc/Extensions/Agent-Setup.md
+++ b/doc/Extensions/Agent-Setup.md
@@ -14,6 +14,7 @@ On each of the hosts you would like to use the agent on then you need to do the
 ```shell
 cd /opt/
 git clone https://github.com/librenms/librenms-agent.git
+cd librenms-agent
 cp check_mk_agent /usr/bin/check_mk_agent
 chmod +x /usr/bin/check_mk_agent
 ```

From 4fa9c3f70160e555d0531cd2a4df8a9631ceeb35 Mon Sep 17 00:00:00 2001
From: Daniel Preussker <f0o@users.noreply.github.com>
Date: Fri, 31 Jul 2015 16:49:01 +0000
Subject: [PATCH 3/3] Update Network-Map Docs

Fix Typo
---
 doc/Extensions/Network-Map.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/Extensions/Network-Map.md b/doc/Extensions/Network-Map.md
index b231a318b6..5a2f380492 100644
--- a/doc/Extensions/Network-Map.md
+++ b/doc/Extensions/Network-Map.md
@@ -1,6 +1,6 @@
 # Network Map
 
-## LibreNMS has the ability to show you a network mab based on:
+## LibreNMS has the ability to show you a network map based on:
 
 - xDP Discovery
 - MAC addresses