Merge remote-tracking branch 'origin/master' into topic/dnthayer/doc-fixes-for-2.6

This commit is contained in:
Daniel Thayer 2018-08-17 11:34:16 -05:00
commit a71ed6f781
85 changed files with 823 additions and 773 deletions

View file

@ -99,7 +99,3 @@
# Uncomment the following line to enable logging of link-layer addresses. Enabling
# this adds the link-layer address for each connection endpoint to the conn.log file.
# @load policy/protocols/conn/mac-logging
# Uncomment the following line to enable the SMB analyzer. The analyzer
# is currently considered a preview and therefore not loaded by default.
# @load policy/protocols/smb