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

Merge remote-tracking branch 'origin/fastpath'

Browse source 
* origin/fastpath:
  Add more links in the GeoLocation document
This commit is contained in:
Robin Sommer 2013-09-19 20:07:57 -07:00
commit 0316bd77f5
3 changed files with 7 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.1-1368 | 2013-09-19 20:07:57 -0700
* Add more links in the GeoLocation document (Daniel Thayer)
2.1-1364 | 2013-09-19 15:12:08 -0700 2.1-1364 | 2013-09-19 15:12:08 -0700
* Add links to Intelligence Framework documentation. (Daniel Thayer) * Add links to Intelligence Framework documentation. (Daniel Thayer)

2
VERSION
View file

@ -1 +1 @@
2.1-1364 2.1-1368

4
doc/frameworks/geoip.rst
View file

@ -67,8 +67,8 @@ functionality:
function lookup_location(a:addr): geo_location function lookup_location(a:addr): geo_location
There is also the ``geo_location`` data structure that is returned There is also the :bro:see:`geo_location` data structure that is returned
from the ``lookup_location`` function: from the :bro:see:`lookup_location` function:
.. code:: bro .. code:: bro