aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2019-12-30 11:44:31 -0800
committerJaap Keuter <jaap.keuter@xs4all.nl>2019-12-30 20:15:57 +0000
commit6d5c7497853fed1e9f7210ca5a2f27f7dccfabb7 (patch)
treeb2af70d8340b1faf2725b552ee06c178b090f2cb
parentc189393f0616b0c247a76ebb129cd9013e7330dc (diff)
Guides: Update some of the MaxMind text.
Update the User's Guide to match MaxMind's upcoming database access changes: https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/ Add a Win64 link to the Developer's Guide. Change-Id: Iaaaaedeb81616f026c542c6f2d8559a3a0084f95 Reviewed-on: https://code.wireshark.org/review/35610 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
-rw-r--r--docbook/wsdg_src/WSDG_chapter_libraries.adoc4
-rw-r--r--docbook/wsug_src/WSUG_chapter_customize.adoc10
2 files changed, 6 insertions, 8 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_libraries.adoc b/docbook/wsdg_src/WSDG_chapter_libraries.adoc
index 0ad9cc386d..50e9cb7d4a 100644
--- a/docbook/wsdg_src/WSDG_chapter_libraries.adoc
+++ b/docbook/wsdg_src/WSDG_chapter_libraries.adoc
@@ -363,7 +363,9 @@ If libmaxminddb library isn't already installed or available as a
package for your platform, you can get it at
https://github.com/maxmind/libmaxminddb[].
-We provide a package for Windows at
+We provide packages for Windows at
+https://anonsvn.wireshark.org/wireshark-win64-libs/trunk/packages/[]
+and
https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[].
[[ChLibsSparkle]]
diff --git a/docbook/wsug_src/WSUG_chapter_customize.adoc b/docbook/wsug_src/WSUG_chapter_customize.adoc
index 5dca14fcba..cd59dcbd03 100644
--- a/docbook/wsug_src/WSUG_chapter_customize.adoc
+++ b/docbook/wsug_src/WSUG_chapter_customize.adoc
@@ -819,13 +819,9 @@ The textual representation for the value.
=== MaxMind Database Paths
-If your copy of Wireshark supports
-https://www.maxmind.com/[MaxMind’s] MaxMindDB library, you can use
-their databases to match IP addresses to countries, cites, autonomous
-system numbers, and other bits of information. Some databases are
-https://dev.maxmind.com/geoip/geoip2/downloadable/[available at no
-cost], while others require a licensing fee. See
-https://www.maxmind.com/[the MaxMind web site] for more information.
+If your copy of Wireshark supports https://www.maxmind.com/[MaxMind’s] MaxMindDB library, you can use their databases to match IP addresses to countries, cites, autonomous system numbers, and other bits of information.
+Some databases are https://dev.maxmind.com/geoip/geoip2/geolite2/[available at no cost for registered users], while others require a licensing fee.
+See https://www.maxmind.com/[the MaxMind web site] for more information.
The configuration for the MaxMind database is a user table, as described
in <<ChUserTable>>, with the following fields: