diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index bf6a29257c..86581b171c 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -12,3 +12,4 @@ Please confirm each of the sections below by putting an `x` in the box like `[x]
 - [ ] Please include all of the information between the `====================================` section of `./validate.php` which you can run from the cli.
 - [ ] Unless your issue is for a WebUI fix or feature then please provide ALL info asked for [here](http://docs.librenms.org/Support/FAQ/#faq20).
 - [ ] Please provide as much detail as possible.
+- [ ] Please do NOT post more than 10 lines of debug information here, use a pastebin service or GitHub Gists.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 5226fec941..b7fc60bab2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,5 +4,5 @@ DO NOT DELETE THIS TEXT
 
 > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting.
 
-- [ ] Have you signed the [Contributors agreement](http://docs.librenms.org/General/Contributing/)
+- [ ] Have you signed the [Contributors agreement](http://docs.librenms.org/General/Contributing/) - please do NOT submit a pull request unless you have (signing the agreement in the same pull request is fine). Your commit message for signing the agreement must appear as per the docs.
 - [ ] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/)
diff --git a/doc/Support/FAQ.md b/doc/Support/FAQ.md
index 1d4e15f448..668f7757e4 100644
--- a/doc/Support/FAQ.md
+++ b/doc/Support/FAQ.md
@@ -254,8 +254,8 @@ You can also use the command line to obtain the information.  Especially, if snm
 Replace the relevant information in these commands such as HOSTNAME and COMMUNITY. Use `snmpwalk` instead of `snmpbulkwalk` for v1 devices.
 
 ```bash
-./discovery.php -h HOSTNAME -d -m os
-./poller.php -h HOSTNAME -r -f -d -m os
+./discovery.php -h HOSTNAME -d
+./poller.php -h HOSTNAME -r -f -d
 snmpbulkwalk -OUneb -v2c -c COMMUNITY HOSTNAME .
 ```