Merge branch 'topic/vlad/doc_tweaks'

* topic/vlad/doc_tweaks:
  docs: escape * in documentation
  Update the mail_dest documentation with the new email_dest field

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)

VERSION

@@ -1 +1 @@
-4.1.0-dev.918
+4.1.0-dev.921

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.

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
 ##