Merge dev to 2.4

faq.rst

@@ -199,8 +199,9 @@ How can I add local rules?
 
 Please see the :ref:`detections` section.
 
-Can I connect Security Onion to Active Directory or LDAP?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-We understand the appeal of integrating with directory services like Active Directory and LDAP, but we typically recommend against joining any security infrastructure (including Security Onion) to directory services. The reason is that when you get an adversary inside your network, one of their first goals is going to be gaining access to that directory. If they get access to the directory, then they get access to everything connected to the directory. For that reason, we recommend that all security infrastructure (including Security Onion) be totally separate from directory services.
+Can I connect Security Onion to Active Directory or another OIDC provider?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Please see the :ref:`oidc` section.
 
 `back to top <#top>`__

soc-customization.rst

@@ -27,7 +27,7 @@ You can add images but they must be hosted from another host that is accessible
 
 ::
 
-        ![SOC Dashboards](https://docs.securityonion.net/en/2.4/_images/51_dashboards.png)
+        ![SOC Dashboards](https://docs.securityonion.net/en/2.4/_images/53_dashboards.png)
 
 Links
 -----