merged anarcat/osm_arbitrary_layers

diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index 2c555f372630e8d02a37031a01711ac05b30132f..f570f4032e00150ad7d57235f366925e8e47758e 100644 (file)
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -69,7 +69,7 @@ sub getsetup () {
                },
                osm_layers => {
                        type => "string",
-                       example => { 'OSM', 'GoogleSattelite' },
+                       example => { 'OSM', 'GoogleSatellite' },
                        description => "Layers to use in the map. Can be either the 'OSM' string or a type option for Google maps (GoogleNormal, GoogleSatellite, GoogleHybrid or GooglePhysical). It can also be an arbitrary URL in a syntax acceptable for OpenLayers.Layer.OSM.url parameter.",
                        safe => 0,
                        rebuild => 1,

diff --git a/debian/changelog b/debian/changelog
index 40fd86ed0a3d1044437d68221b8021e031c9c19e..5a6f7f437fc499a6de8a59bd121aef0026712cc0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,8 @@ ikiwiki (3.20120630) UNRELEASED; urgency=low
     Thanks, Philippe Gauthier and Antoine Beaupré
   * osm: Add osm_openlayers_url configuration setting.
     Thanks, Genevieve
-  * 
+  * osm: osm_layers can be used to configured the layers displayed on the map.
+    Thanks, Antoine Beaupré
 
  -- Joey Hess <joeyh@debian.org>  Thu, 19 Jul 2012 13:46:52 -0400
 

diff --git a/doc/todo/osm_arbitrary_layers.mdwn b/doc/todo/osm_arbitrary_layers.mdwn
index 94cc27bb19c2fc15510aa98ae4abc298da0415a4..4e579b54a24b4d74dda5a0217abb7b223aec457b 100644 (file)
--- a/doc/todo/osm_arbitrary_layers.mdwn
+++ b/doc/todo/osm_arbitrary_layers.mdwn
@@ -37,3 +37,5 @@ I got tired of hacking at the osm.pm every time I wanted to change the layers, s
 >>>> Thanks for your time.  -- [[anarcat]]
 
 >>>>> I have implemented 1.b) and 2. (ie. it's a simple array now, and I split this stuff in different branches.) I'll open another todo for the other branches. --[[anarcat]]
+
+>>>>>> [[merged|done]] --[[Joey]]