Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-09 10:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/fastpath'

Browse source 
* origin/fastpath:
  Fix a "make doc" warning
This commit is contained in:
Robin Sommer 2013-09-28 11:16:29 -07:00
commit 5ddbe9e75f
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.2-beta-8 | 2013-09-28 11:16:29 -0700
* Fix a "make doc" warning. (Daniel Thayer)
2.2-beta-4 | 2013-09-24 13:23:30 -0700 2.2-beta-4 | 2013-09-24 13:23:30 -0700
* Fix for setting REPO in Makefile. (Robin Sommer) * Fix for setting REPO in Makefile. (Robin Sommer)

2
VERSION
View file

@ -1 +1 @@
2.2-beta-4 2.2-beta-8

3
doc/scripting/index.rst
View file

@ -90,8 +90,7 @@ the script starts to define instructions to take in a given event.
:lines: 33-57 :lines: 33-57
The workhorse of the script is contained in the event handler for The workhorse of the script is contained in the event handler for
``file_hash``. The ``file_hash`` event is defined in the ``file_hash``. The :bro:see:`file_hash` event allows scripts to access
:doc:`/scripts/base/bif/plugins/Bro_FileHash.events.bif.bro` script and allows scripts to access
the information associated with a file for which Bro's file analysis framework has the information associated with a file for which Bro's file analysis framework has
generated a hash. The event handler is passed the file itself as ``f``, the type of digest generated a hash. The event handler is passed the file itself as ``f``, the type of digest
algorithm used as ``kind`` and the hash generated as ``hash``. algorithm used as ``kind`` and the hash generated as ``hash``.