diff --git a/CHANGES b/CHANGES index a5417faca1..a2fe0d2b6c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ + +4.1.0-dev.921 | 2021-07-09 12:01:40 -0700 + + * docs: escape * in documentation (Vlad Grigorescu) + + * Update the mail_dest documentation with the new email_dest field (Vlad Grigorescu) + 4.1.0-dev.918 | 2021-07-08 18:00:26 -0700 * Fix a compile warning on FreeBSD (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index f18f41e471..aa0611a01f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.0-dev.918 +4.1.0-dev.921 diff --git a/scripts/base/frameworks/notice/main.zeek b/scripts/base/frameworks/notice/main.zeek index 09e3749d2f..ebf3e29424 100644 --- a/scripts/base/frameworks/notice/main.zeek +++ b/scripts/base/frameworks/notice/main.zeek @@ -202,11 +202,12 @@ export { ## ## Note that this is overridden by the ZeekControl SendMail option. option sendmail = "/usr/sbin/sendmail"; - ## Email address to send notices with the + ## The default email address to send notices with the ## :zeek:enum:`Notice::ACTION_EMAIL` action or to send bulk alarm logs ## on rotation with :zeek:enum:`Notice::ACTION_ALARM`. ## - ## Note that this is overridden by the ZeekControl MailTo option. + ## Note that this is overridden by the ZeekControl MailTo option or by + ## the `email_dest` field in the :zeek:see:`Notice::Info` record. const mail_dest = "" &redef; ## Address that emails will be from. diff --git a/src/file_analysis/analyzer/x509/functions.bif b/src/file_analysis/analyzer/x509/functions.bif index fb49705bf8..2a41969e21 100644 --- a/src/file_analysis/analyzer/x509/functions.bif +++ b/src/file_analysis/analyzer/x509/functions.bif @@ -977,7 +977,7 @@ function x509_set_certificate_cache_hit_callback%(f: string_any_file_hook%) : bo ## our interpretation of RFC6128 wildcard expansions. This specifically means that wildcards are ## only allowed in the leftmost label, wildcards only span one label, the wildcard has to be the ## last character before the label-separator, but additional characters are allowed before it, and -## the wildcard has to be at least at the third level (so *.a.b). +## the wildcard has to be at least at the third level (so \*.a.b). ## ## hostname: Hostname to test ##