Merge branch 'master' of https://github.com/Security-Onion-Solutions/security-onion

Author: dougburks

.github/ISSUE_TEMPLATE

@@ -1,8 +1,7 @@
-This issue tracker is primarily used to track issues that need to be fixed and are added to our Roadmap:
-https://github.com/Security-Onion-Solutions/security-onion/wiki/Roadmap
+PLEASE STOP AND READ THIS INFORMATION!
 
 If you are creating an issue just to ask a question, you will likely get faster and better responses by posting to our mailing list instead:
-https://github.com/Security-Onion-Solutions/security-onion/wiki/MailingLists
+https://securityonion.net/docs/mailing-lists
 
 If you have found a bug in Security Onion, you can continue with creating an issue here, but please make sure you have done the following:
 - duplicated the issue on a fresh installation of the latest version

CONTRIBUTING.md

@@ -3,22 +3,22 @@
 First, thanks for being a part of the Security Onion community!  We appreciate any and all contributions!
 
 #### Mailing List
-The biggest thing that we need help with right now is supporting users on the [security-onion group](https://groups.google.com/forum/#!forum/security-onion).  Please see the [group guidelines](https://github.com/Security-Onion-Solutions/security-onion/wiki/MailingLists).
+The biggest thing that we need help with right now is supporting users on the [security-onion group](https://groups.google.com/forum/#!forum/security-onion).  Please see the [group guidelines](https://securityonion.net/docs/MailingLists).
 
 #### QA
 We ask for testing before we release updates.  Please join our [security-onion-testing group](https://groups.google.com/forum/#!forum/security-onion-testing) and help us avoid regressions!
 
 #### **Did you find a bug?**
 
-* **Do not open up a GitHub issue if the bug is a security vulnerability in Security Onion**, and instead refer to [security](https://github.com/Security-Onion-Solutions/security-onion/wiki/Security).
+* **Do not open up a GitHub issue if the bug is a security vulnerability in Security Onion**, and instead refer to https://securityonion.net/docs/Security.
 
 * **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/Security-Onion-Solutions/security-onion/issues).
 
 * If you're unable to find an open issue addressing the problem, send a detailed email to the [security-onion group](https://groups.google.com/forum/#!forum/security-onion).  We'll triage the issue and then open a Github Issue if necessary.
 
 #### **Want to help us work on issues?**
 
-* We've put issues on the [Roadmap](https://github.com/Security-Onion-Solutions/security-onion/wiki/Roadmap) in a rough order of prioritization and scheduling.  Issues listed under a certain month are already being worked on.  Take a look at the issues under "Beyond" and see if there are issues you are interested in tackling.  Please keep in mind that some of these issues may be older and thus no longer accurate or applicable.  When in doubt, please feel free to reach out to the [security-onion group](https://groups.google.com/forum/#!forum/security-onion) for clarification and guidance.
+* Take a look at the unassigned issues at https://github.com/Security-Onion-Solutions/security-onion/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+no%3Aassignee and see if there are issues you are interested in tackling.  Please keep in mind that some of these issues may be older and thus no longer accurate or applicable.  When in doubt, please feel free to reach out to the [security-onion group](https://groups.google.com/forum/#!forum/security-onion) for clarification and guidance.
 
 #### **Are you looking for source code?**
 
@@ -34,7 +34,7 @@ Docker images can be found at [https://hub.docker.com/u/securityonionsolutions/]
 
 #### **Do you want to contribute to the Security Onion documentation?**
 
-* If you want to add or make changes to the [wiki](https://github.com/Security-Onion-Solutions/security-onion/wiki), please send modifications to the [security-onion group](https://groups.google.com/forum/#!forum/security-onion) and we'll review and post.
+* If you want to add or make changes to the [documentation](https://securityonion.net/docs), please see https://securityonion.readthedocs.io/en/latest/about.html#contributing.
 
 Thanks! :heart: :heart: :heart:
 

README.md

@@ -1,25 +1,25 @@
 ## Security Onion
 Security Onion is a free and open source Linux distribution for intrusion detection, enterprise security monitoring, and log management. It includes Elasticsearch, Logstash, Kibana, Snort, Suricata, Bro, OSSEC, Sguil, Squert, NetworkMiner, and many other security tools. The easy-to-use Setup wizard allows you to build an army of distributed sensors for your enterprise in minutes!
 
-For more information about Security Onion, please see our [main website](https://securityonion.net), [blog](https://blog.securityonion.net), and [wiki](https://github.com/Security-Onion-Solutions/security-onion/wiki).
+For more information about Security Onion, please see our [main website](https://securityonion.net), [blog](https://blog.securityonion.net), and [docs](https://securityonion.net/docs).
 
 #### This Repo
-This repo contains the [ISO image](https://github.com/Security-Onion-Solutions/security-onion/blob/master/Verify_ISO.md), [Wiki](https://github.com/Security-Onion-Solutions/security-onion/wiki), and [Roadmap](https://github.com/Security-Onion-Solutions/security-onion/wiki/Roadmap) for [Security Onion](https://securityonion.net/).
+This repo contains the [ISO image](https://github.com/Security-Onion-Solutions/security-onion/blob/master/Verify_ISO.md) and tracks [issues](https://github.com/Security-Onion-Solutions/security-onion/issues) for [Security Onion](https://securityonion.net/).
 
 #### Want to download and verify the Security Onion ISO image?
 Please proceed to the [Verify_ISO](https://github.com/Security-Onion-Solutions/security-onion/blob/master/Verify_ISO.md) page.
 
 #### Looking for documentation? 
-Please proceed to the [Wiki](https://github.com/Security-Onion-Solutions/security-onion/wiki).
+[![Documentation Status](https://readthedocs.org/projects/securityonion/badge/?version=latest)](https://securityonion.readthedocs.io/en/latest/?badge=latest)
 
 #### Need Help?
-Please proceed to the [Help page](https://github.com/Security-Onion-Solutions/security-onion/wiki/Help).
+Please proceed to the [Help page](https://securityonion.net/docs/help).
 
 #### Have Questions?
-Please send questions to the [Security Onion mailing list](https://github.com/Security-Onion-Solutions/security-onion/wiki/MailingLists).
+Please send questions to the [Security Onion mailing list](https://securityonion.net/docs/MailingLists).
 
 #### Want to see what lies ahead for Security Onion?
-Please proceed to the [Roadmap](https://github.com/Security-Onion-Solutions/security-onion/wiki/Roadmap).
+Please proceed to the [Projects](https://github.com/Security-Onion-Solutions/security-onion/projects) page.
 
 #### Looking for source code?  
 This repo stores no source code.  You can get the source for any of our packages by doing the following at a terminal (replacing PACKAGE-NAME with the name of the package that you want the source for):
@@ -28,3 +28,6 @@ apt-get source PACKAGE-NAME
 ```
 
 Some of our packages have their own Github repos at [Security-Onion-Solutions](https://github.com/Security-Onion-Solutions).
+
+#### Security Onion Solutions
+Looking for training, professional services, or hardware appliances?  Check out https://securityonionsolutions.com.