diff --git a/CHANGES b/CHANGES index 75e61c34d3..edae33a80f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.6-beta2-49 | 2018-10-25 18:56:02 -0500 + + * Fix minor documentation mistakes (Jon Siwek, Corelight) + 2.6-beta2-46 | 2018-10-23 13:01:28 -0500 * GH-192: Generate ssh_auth_attempted for the 'none' authentication method. diff --git a/VERSION b/VERSION index df7af56535..b47fe5c7f6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-beta2-46 +2.6-beta2-49 diff --git a/doc/script-reference/log-files.rst b/doc/script-reference/log-files.rst index 6c0e7ff899..b3983bc42d 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::Info` | +| notice_alarm.log | The alarm stream | :bro:type:`Notice::Info` | +----------------------------+---------------------------------------+---------------------------------+ | signatures.log | Signature matches | :bro:type:`Signatures::Info` | +----------------------------+---------------------------------------+---------------------------------+ diff --git a/scripts/base/protocols/ftp/info.bro b/scripts/base/protocols/ftp/info.bro index faff6a46ad..733c01729c 100644 --- a/scripts/base/protocols/ftp/info.bro +++ b/scripts/base/protocols/ftp/info.bro @@ -39,8 +39,7 @@ export { ## Argument for the command if one is given. arg: string &log &optional; - ## Libmagic "sniffed" file type if the command indicates a file - ## transfer. + ## Sniffed mime type of file. mime_type: string &log &optional; ## Size of the file if the command indicates a file transfer. file_size: count &log &optional;