From 432f6e5276b9be1671ef473f4081d99af3c7771c Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Mon, 12 Dec 2016 18:51:10 +0000
Subject: [PATCH] docs: Removed mailing list in various places + small
 improvements to docs (#5154)

---
 .github/ISSUE_TEMPLATE.md        |  2 +-
 .github/PULL_REQUEST_TEMPLATE.md |  2 ++
 README.md                        |  1 -
 doc/Developing/Support-New-OS.md | 19 +++++++------------
 doc/Support/FAQ.md               |  2 +-
 html/pages/about.inc.php         |  2 +-
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 8669891115..b96c72e996 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -8,5 +8,5 @@ You can use our irc channel ##librenms on freenode to ask questions or our [comm
 - [ ] Is your install up to date? [Updating your install](http://docs.librenms.org/General/Updating/)
       Please do not submit an issue if your install is not up to date within the last 24 hours or on a stable monthly release.
 - [ ] Please include all of the information between the `====================================` section of `./validate.php`.
-- [ ] If you would like us to add a new device then please provide the information asked for [here](http://docs.librenms.org/Support/FAQ/#faq20)
+- [ ] If you would like us to add a new device or your device is listed as Generic then please provide the information asked for [here](http://docs.librenms.org/Support/FAQ/#faq20)
 - [ ] Please provide as much detail as possible.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d7add3a28a..5226fec941 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,5 @@
+DO NOT DELETE THIS TEXT
+
 #### Please note
 
 > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting.
diff --git a/README.md b/README.md
index 9dc7c3c50a..17cc5c2b26 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,6 @@ Participating
 You can participate in the project by:
 - Talking to us on IRC ([##librenms on Freenode][4]) or [Twitter][3].
 - Joining the [LibreNMS Community](https://community.librenms.org)
-- Joining the [librenms-project][1] mailing list.
 - Improving the [documentation][5].
 - Cloning the [repo][2] and filing [bug reports][18] and [pull requests][19] on github.
   See [CONTRIBUTING][15] for more details.
diff --git a/doc/Developing/Support-New-OS.md b/doc/Developing/Support-New-OS.md
index efd04ea4d2..1d74d7e756 100644
--- a/doc/Developing/Support-New-OS.md
+++ b/doc/Developing/Support-New-OS.md
@@ -48,10 +48,8 @@ Look at other files to get help in the code structure.
 ```php
 <?php
 
-if (!$os) {
-    if (str_contains($sysDescr, 'Pulse Connect Secure')) {
-        $os = 'pulse';
-    }
+if (str_contains($sysDescr, array('Pulse Connect Secure', 'Pulse Secure', 'Juniper Networks,Inc,VA-DTE', 'VA-SPE'))) {
+    $os = 'pulse';
 }
 ```
 
@@ -65,9 +63,9 @@ This file will usually set the variables for $version, $hardware and $hostname r
 ```php
 <?php
 
-$version = trim(snmp_get($device, "productVersion.0", "-OQv", "PULSESECURE-PSG-MIB"),'"');
-$hardware = "Juniper " . trim(snmp_get($device, "productName.0", "-OQv", "PULSESECURE-PSG-MIB"),'"');
-$hostname = trim(snmp_get($device, "sysName.0", "-OQv", "SNMPv2-MIB"),'"');
+$version = preg_replace('/[\r\n\"]+/', ' ', snmp_get($device, "productVersion.0", "-OQv", "PULSESECURE-PSG-MIB"));
+$hardware = "Juniper " . preg_replace('/[\r\n\"]+/', ' ', snmp_get($device, "productName.0", "-OQv", "PULSESECURE-PSG-MIB"));
+$hostname = trim($poll_device['sysName'], '"');
 ```
 
 Quick explanation and examples :
@@ -173,11 +171,8 @@ Look at other files to get help in the code structure. For this example, it can
 
 ```php
 // Pulse Secure OS definition
-<?php
-if (!$os) {
-    if (strstr($sysDescr, 'Pulse Connect Secure')) {
-        $os = 'pulse';
-    }
+if (str_contains($sysDescr, array('Pulse Connect Secure', 'Pulse Secure', 'Juniper Networks,Inc,VA-DTE', 'VA-SPE'))) {
+    $os = 'pulse';
 }
 ```
 
diff --git a/doc/Support/FAQ.md b/doc/Support/FAQ.md
index 1ea1bc0538..594af68c95 100644
--- a/doc/Support/FAQ.md
+++ b/doc/Support/FAQ.md
@@ -55,7 +55,7 @@ You have two options for adding a new device into LibreNMS.
 
 We have a few methods for you to get in touch to ask for help.
 
-[Mailing List](https://groups.google.com/forum/#!forum/librenms-project)
+[Community Forum](https://community.librenms.org)
 
 [IRC](https://webchat.freenode.net/) Freenode ##librenms
 
diff --git a/html/pages/about.inc.php b/html/pages/about.inc.php
index 287fce218d..530ad67c11 100644
--- a/html/pages/about.inc.php
+++ b/html/pages/about.inc.php
@@ -176,7 +176,7 @@ echo "
       <a href="http://www.librenms.org/">Web site</a> |
       <a href="https://github.com/librenms/">GitHub</a> |
       <a href="https://github.com/librenms/librenms/issues">Bug tracker</a> |
-      <a href="https://groups.google.com/forum/#!forum/librenms-project">Mailing list</a> |
+      <a href="https://community.librenms.org">Community Forum</a> |
       <a href="http://twitter.com/librenms">Twitter</a> |
       <a href="http://www.librenms.org/changelog.html">Changelog</a> |
       <a href="#" data-toggle="modal" data-target="#git_log">Git log</a>