diff --git a/CHANGES b/CHANGES index a5cea19277..a50370c236 100644 --- a/CHANGES +++ b/CHANGES @@ -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 * Add links to Intelligence Framework documentation. (Daniel Thayer) diff --git a/VERSION b/VERSION index d0f800bd5e..421b3adf31 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1-1364 +2.1-1368 diff --git a/doc/frameworks/geoip.rst b/doc/frameworks/geoip.rst index 3c3883a607..f54ea03096 100644 --- a/doc/frameworks/geoip.rst +++ b/doc/frameworks/geoip.rst @@ -67,8 +67,8 @@ functionality: function lookup_location(a:addr): geo_location -There is also the ``geo_location`` data structure that is returned -from the ``lookup_location`` function: +There is also the :bro:see:`geo_location` data structure that is returned +from the :bro:see:`lookup_location` function: .. code:: bro