Merge remote-tracking branch 'origin/master'

* origin/master:
  Update link to flex pattern docs
This commit is contained in:
Robin Sommer 2018-05-21 21:37:54 +00:00
commit d6cddffe32
3 changed files with 13 additions and 3 deletions

12
CHANGES
View file

@ -1,5 +1,5 @@
2.5-587 | 2018-05-21 18:02:23 +0000 2.5-589 | 2018-05-21 21:37:54 +0000
* Switch Bro's communication over to Broker; deprecate the old * Switch Bro's communication over to Broker; deprecate the old
communication system, including Broccoli. See NEWS for more. communication system, including Broccoli. See NEWS for more.
@ -17,6 +17,16 @@
* Add new operators "is" and "as" for dynamic type casting and type * Add new operators "is" and "as" for dynamic type casting and type
checking. See NEWS for more. (Robin Sommer) checking. See NEWS for more. (Robin Sommer)
2.5-582 | 2018-05-21 13:34:16 -0500
* Update link to flex pattern docs (Corelight)
* Add non-standard experimental Google post-quantum ciphers (Johanna Amann)
* ARP: fix the l2 source address check for ARP over Wi-Fi (Pierre LALET)
* Support 802.11 monitor mode (Pierre LALET)
2.5-569 | 2018-05-10 11:24:07 -0500 2.5-569 | 2018-05-10 11:24:07 -0500
* BIT-1927: relocate notice/extend-email/ scripts to policy/ dir and * BIT-1927: relocate notice/extend-email/ scripts to policy/ dir and

View file

@ -1 +1 @@
2.5-587 2.5-589

View file

@ -198,7 +198,7 @@ Here is a more detailed description of each type:
for fast text-searching operations. Pattern constants are created for fast text-searching operations. Pattern constants are created
by enclosing text within forward slashes (/) and is the same syntax by enclosing text within forward slashes (/) and is the same syntax
as the patterns supported by the `flex lexical analyzer as the patterns supported by the `flex lexical analyzer
<http://flex.sourceforge.net/manual/Patterns.html>`_. The speed of <http://westes.github.io/flex/manual/Patterns.html>`_. The speed of
regular expression matching does not depend on the complexity or regular expression matching does not depend on the complexity or
size of the patterns. Patterns support two types of matching, exact size of the patterns. Patterns support two types of matching, exact
and embedded. and embedded.