# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1691161690 -10800
# Node ID c16e21ccdc4005dd8a4be7a96fab23de617a0d21
# Parent  d75ce123587578d6439cd660a83ade6040605a6c# Parent  6e6828089bb8420b44eab0dff1ee05a6fd5d3ff5
Merge.

diff -r d75ce1235875 -r c16e21ccdc40 world/Makefile
--- a/world/Makefile	Thu Aug 03 08:59:10 2023 +0300
+++ b/world/Makefile	Fri Aug 04 18:08:10 2023 +0300
@@ -115,7 +115,7 @@
 	@diff -ubB $(patsubst %.map,%.loc,$<) $(patsubst %.map,%.nloc,$<) | patch
 # Fetch raw ASCII maps from bat.org to *.new
 fetch:
-	@for AMAP in $(CONT_MAPS); do echo "Fetching $${AMAP}.new"; $(HTTPGET) "$${AMAP}.new" "$(BATMAPURL)$${AMAP}.txt"; done
+	@for AMAP in $(CONT_MAPS); do echo "Fetching $${AMAP}.new"; $(HTTPGET) "$${AMAP}.new" "$(BATMAP_URL)$${AMAP}.txt"; done
 
 
 # Remove all temporary .diff files
diff -r d75ce1235875 -r c16e21ccdc40 www/faq.xml
--- a/www/faq.xml	Thu Aug 03 08:59:10 2023 +0300
+++ b/www/faq.xml	Fri Aug 04 18:08:10 2023 +0300
@@ -50,7 +50,7 @@
  mapdata and some locations. His work was invaluable in the early days of
  the project.
  </li>
- <li><b>Jeskko</b> - Did his own <a href="http://jeskko.pupunen.net/">Google Maps-style
+ <li><b>Jeskko</b> - Did his own <a href="http://jeskko.pupunen.net/gmap2/">Google Maps-style
  implementation</a>, which has become rather popular. Worked with BatMUD staff
  to assist development of Batclient's map feature (which was based on his
  map style). Has also helped with Laenor and Lucentium re-mapping, general project
@@ -151,7 +151,7 @@
  </li>
 
  <li><b>15-16 Dec 2006</b> - Jeskko publishes first version of his <a
- href="http://jeskko.pupunen.net/map/">Google Maps</a>-style
+ href="http://jeskko.pupunen.net/gmap2/">Google Maps</a>-style
  continent map, based on PupuMaps data.
  </li>