merge topic/vern/deprecations

Description

Per bro-dev mailing list discussion, this branch deprecates (1) && and || operators for patterns; (2) mixing of scalars and vectors; and (3) the merge_pattern built-in, which will be superseded by the & operator for patterns. Also fixes a couple of documentation nits.

Environment

None

Status

Assignee

Jon Siwek

Reporter

Vern Paxson

Labels

None

External issue ID

None

Components

Fix versions

Priority

Normal
Configure