diff --git a/CHANGES b/CHANGES index f18249dfe9..83fd9d5f5a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.6-beta2-42 | 2018-10-18 10:21:01 -0500 + + * Fix documentation link for notice_alarm.log fields (Jon Siwek, Corelight) + 2.6-beta2-40 | 2018-10-16 15:37:49 -0500 * Change DNP3::function_codes name for request 0x21 (Dale Lakes) diff --git a/VERSION b/VERSION index 77eb0644ad..dfc98289cd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-beta2-40 +2.6-beta2-42 diff --git a/doc/script-reference/log-files.rst b/doc/script-reference/log-files.rst index 539e4ae87f..6c0e7ff899 100644 --- a/doc/script-reference/log-files.rst +++ b/doc/script-reference/log-files.rst @@ -112,7 +112,7 @@ Detection +----------------------------+---------------------------------------+---------------------------------+ | notice.log | Bro notices | :bro:type:`Notice::Info` | +----------------------------+---------------------------------------+---------------------------------+ -| notice_alarm.log | The alarm stream | :bro:enum:`Notice::ACTION_ALARM`| +| notice_alarm.log | The alarm stream | :bro:enum:`Notice::Info` | +----------------------------+---------------------------------------+---------------------------------+ | signatures.log | Signature matches | :bro:type:`Signatures::Info` | +----------------------------+---------------------------------------+---------------------------------+