merged anarcat's osm fixes

diff --git a/debian/changelog b/debian/changelog
index a77c42e425f88f2f4864214a38958ceb85497f58..bf4ff9db1474594653aac445748f9155fb9a9039 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ ikiwiki (3.20120630) UNRELEASED; urgency=low
     in the recentchanges page, with visibility toggleable via javascript.
     Thanks, Antoine Beaupré
   * Split CFLAGS into words when building wrapper. Closes: #682237
+  * osm: Avoid calling urlto before generated files are registered.
+    Thanks, Philippe Gauthier and Antoine Beaupré
+  * osm: Add osm_openlayers_url configuration setting.
+    Thanks, Genevieve
 
  -- Joey Hess <joeyh@debian.org>  Thu, 19 Jul 2012 13:46:52 -0400
 

diff --git a/doc/bugs/osm_linkto__40____41___usage_breaks_map_rendering.mdwn b/doc/bugs/osm_linkto__40____41___usage_breaks_map_rendering.mdwn
index 6420e133d50b484e39ab065fcd87f3dc0dd0ee82..89c08b73ccc186e9eb07b32c3c1888c7f39063dc 100644 (file)
--- a/doc/bugs/osm_linkto__40____41___usage_breaks_map_rendering.mdwn
+++ b/doc/bugs/osm_linkto__40____41___usage_breaks_map_rendering.mdwn
@@ -8,10 +8,16 @@ Indeed, that URL yields a 404. The proper URL is <http://mesh.openisp.ca/map/poi
 
 ## Proposed solution
 
-The problem seems to be caused by `urlto()` being called for the `osm` directive before the generated files are registered with `will_render()` from the `waypoint` directive. Proposed patch adds a function that is called from the `preprocess` hook for both directives that registers the files.
+The problem seems to be caused by `urlto()` being called for the `osm`
+directive before the generated files are registered with `will_render()`
+from the `waypoint` directive. Proposed patch adds a function that is
+called from the `preprocess` hook for both directives that registers the
+files.
 
 Here is a [[patch]] to IkiWiki/Plugin/osm.pm: <https://reseaulibre.deuxpi.ca/0000-Fix-incorrect-URL-pointing-to-the-generated-waypoint.patch>
 
 --[[deuxpi]]
 
 I confirm the patch works, and I added it to my master branch. --[[anarcat]]
+
+> [[applied|done]]. Thanks guys. --[[Joey]]