ditch CloudMade pass two

FAQ.md

@@ -29,7 +29,6 @@ Check out [this example](http://leaflet-extras.github.io/leaflet-providers/previ
 with half a hundred different layers to choose from.
 Popular commercial options, free up to a particular number of requests, include
 [MapBox](http://mapbox.com),
-[CloudMade](http://cloudmade.com),
 [Bing Maps](http://www.microsoft.com/maps/choose-your-binge's-maps-API.aspx) (using a [plugin](https://github.com/shramov/leaflet-plugins)),
 [Esri ArcGIS](http://www.arcgis.com/features/maps/imagery.html) ([official plugin](https://github.com/Esri/esri-leaflet))
 and [Nokia Here](http://developer.here.com/web-experiences).

_layouts/default.html

@@ -55,7 +55,7 @@
 <body{% if page.bodyclass %} class="{{ page.bodyclass }}"{% endif %}>
 	<div class="container">
 		<h1><a href="http://leafletjs.com">Leaflet</a></h1>
-		<h3 class="alt">An Open-Source JavaScript Library for Mobile-Friendly Interactive Maps<!-- by <a href="http://cloudmade.com">CloudMade</a>--></h3>
+		<h3 class="alt">An Open-Source JavaScript Library for Mobile-Friendly Interactive Maps</h3>
 
 		<div class="social-buttons">
 			<iframe src="http://ghbtns.com/github-btn.html?user=Leaflet&amp;repo=Leaflet&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="104px" height="20px"></iframe>
@@ -80,7 +80,6 @@ <h3 class="alt">An Open-Source JavaScript Library for Mobile-Friendly Interactiv
 		</div>
 
 		<ul class="nav clearfix">
-			<!-- <li><a class="cloudmade-link" href="http://cloudmade.com"></a></li> -->
 			<li>
 				{% if page.title == nil %}
 					<span>Overview</span>

_posts/2012-08-20-guest-post-markerclusterer-0-1-released.md

@@ -91,10 +91,10 @@ Dave Leaver.
 <script src="http://leaflet.github.io/Leaflet.markercluster/example/realworld.388.js"></script>
 
 <script>
-	var cloudmade = new L.TileLayer(MB_URL, {maxZoom: 18, attribution: MB_ATTR, id: 'examples.map-9ijuk24y'}),
+	var mapbox = new L.TileLayer(MB_URL, {maxZoom: 18, attribution: MB_ATTR, id: 'examples.map-9ijuk24y'}),
 		latlng = new L.LatLng(-37.820, 175.217);
 
-	var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
+	var map = new L.Map('map', {center: latlng, zoom: 15, layers: [mapbox]});
 
 	map.attributionControl.addAttribution("Points &copy 2012 LINZ");
 

atom.xml

@@ -11,7 +11,7 @@ title: Leaflet Developer Blog Atom Feed
 	<link href="http://leafletjs.com"/>
 
 	<updated>{{ site.time | date_to_xmlschema }}</updated>
-	<id>http://leaflet.cloudmade.com/</id>
+	<id>http://leafletjs.com/</id>
 
 	<author>
 		<name>Vladimir Agafonkin</name>
@@ -22,7 +22,7 @@ title: Leaflet Developer Blog Atom Feed
 		<title>{{ post.title }}</title>
 		<link href="http://leafletjs.com{{ post.url }}"/>
 		<updated>{{ post.date | date_to_xmlschema }}</updated>
-		<id>http://leaflet.cloudmade.com{{ post.id }}</id>
+		<id>http://leafletjs.com{{ post.id }}</id>
 		<content type="html">{{ post.content | xml_escape }}</content>
 	</entry>
 	{% endfor %}

examples/choropleth.md

@@ -62,14 +62,13 @@ The GeoJSON with state shapes was kindly shared by [Mike Bostock](http://bost.oc
 
 ### Basic States Map
 
-Let's display our states data on a map with CloudMade tiles of style 22677 for nice grayscale tiles that look perfect as a background for visualizations:
+Let's display our states data on a map with a custom Mapbox style for nice grayscale tiles that look perfect as a background for visualizations:
 
 	var map = L.map('map').setView([37.8, -96], 4);
 
-	L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png', {
-		key: ...,
-		attribution: ...,
-		styleId: 22677
+	L.tileLayer('http://{s}.tiles.mapbox.com/{id}/{z}/{x}/{y}.png', {
+		id: 'examples.map-20v6611k',
+		attribution: ...
 	}).addTo(map);
 
 	L.geoJson(statesData).addTo(map);

examples/geojson.html

@@ -14,9 +14,9 @@ <h3>Using GeoJSON with Leaflet</h3>
 
 	var map = L.map('map').setView([39.74739, -105], 13);
 
-	L.tileLayer('http://{s}.tile.cloudmade.com/{key}/22677/256/{z}/{x}/{y}.png', {
-		attribution: 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-		key: 'BC9A493B41014CAABB98F0471D759707'
+	L.tileLayer(MB_URL, {
+		attribution: MB_ATTR,
+		id: 'examples.map-20v6611k'
 	}).addTo(map);
 
 	var baseballIcon = L.icon({

examples/mobile.md

@@ -32,8 +32,8 @@ We'll now initialize the map in the JavaScript code exactly like we did in the [
 
 <pre><code class="javascript">var map = L.map('map');
 
-L.tileLayer('http://{s}.tile.cloudmade.com/<a href="http://account.cloudmade.com/register">API-key</a>/997/256/{z}/{x}/{y}.png', {
-	attribution: 'Map data &amp;copy; <span class="text-cut" data-cut="[&hellip;]">&lt;a href="http://openstreetmap.org"&gt;OpenStreetMap&lt;/a&gt; contributors, &lt;a href="http://creativecommons.org/licenses/by-sa/2.0/"&gt;CC-BY-SA&lt;/a&gt;, Imagery &copy; &lt;a href="http://cloudmade.com"&gt;CloudMade&lt;/a&gt;</span>',
+L.tileLayer('http://{s}.tiles.mapbox.com/v3/<a href="https://mapbox.com">MapID</a>/997/256/{z}/{x}/{y}.png', {
+	attribution: 'Map data &amp;copy; <span class="text-cut" data-cut="[&hellip;]">&lt;a href="http://openstreetmap.org"&gt;OpenStreetMap&lt;/a&gt; contributors, &lt;a href="http://creativecommons.org/licenses/by-sa/2.0/"&gt;CC-BY-SA&lt;/a&gt;, Imagery &copy; &lt;a href="http://mapbox.com"&gt;Mapbox&lt;/a&gt;</span>',
 	maxZoom: 18
 }).addTo(map);</code></pre>
 

examples/quick-start.md

@@ -41,7 +41,7 @@ Now you're ready to initialize the map and do some stuff with it.
 <div id="map1" class="map" style="height: 180px"></div>
 
 
-Let's create a map of the center of London with pretty CloudMade tiles. First we'll initialize the map and set its view to our chosen geographical coordinates and a zoom level:
+Let's create a map of the center of London with pretty Mapbox Streets tiles. First we'll initialize the map and set its view to our chosen geographical coordinates and a zoom level:
 
 	var map = L.map('map').setView([51.505, -0.09], 13);
 

index.md

@@ -20,15 +20,15 @@ and a simple, readable [source code][] that is a joy to [contribute][] to.
 Used by:
 [Flickr](http://flickr.com/map)
 [foursquare](https://foursquare.com/)
+[Pinterest](http://pinterest.com)
 [craigslist](http://t.co/V4EiURIA)
 [Data.gov](http://data.gov)
 [IGN](http://www.ign.com/wikis/the-elder-scrolls-5-skyrim/interactive-maps/Skyrim)
 [Wikimedia](http://blog.wikimedia.org/2012/04/05/new-wikipedia-app-for-ios-and-an-update-for-our-android-app/)
 [OSM](http://openstreetmap.org)
 [Meetup](http://www.meetup.com/)
 [WSJ](http://projects.wsj.com/campaign2012/maps/)
-[MapBox](http://mapbox.com)
-[CloudMade](http://cloudmade.com)
+[Mapbox](http://mapbox.com)
 [CartoDB](http://cartodb.com)
 [GIS Cloud](http://www.giscloud.com/)
 ...

reference.html

@@ -1770,10 +1770,7 @@ <h2 id="tilelayer">TileLayer</h2>
 
 <h3>Usage example</h3>
 
-<pre><code class="javascript">L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png', {
-	key: 'API-key',
-	styleId: 997
-}).addTo(map);</code></pre>
+<pre><code class="javascript">L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png?{foo}', {foo: 'bar'}).addTo(map);</code></pre>
 
 <h3>Creation</h3>
 
@@ -1855,7 +1852,7 @@ <h3 id="tilelayer-options">Options</h3>
 		<td><code><b>attribution</b></code></td>
 		<td><code>String</code></td>
 		<td><code><span class="string">''</span></code></td>
-		<td>e.g. "&copy; CloudMade" &mdash; the string used by the attribution control, describes the layer data.</td>
+		<td>e.g. "&copy; Mapbox" &mdash; the string used by the attribution control, describes the layer data.</td>
 	</tr>
 	<tr>
 		<td><code><b>tms</b></code></td>
@@ -4365,7 +4362,7 @@ <h3>Methods</h3>
 			<nobr>&lt;String&gt; <i>text</i> )</nobr>
 		</code></td>
 		<td><code><span class="keyword">this</span></code></td>
-		<td>Adds an attribution text (e.g. <code><span class="string">'Vector data &amp;copy; CloudMade'</span></code>).</td>
+		<td>Adds an attribution text (e.g. <code><span class="string">'Vector data &amp;copy; Mapbox'</span></code>).</td>
 	</tr>
 	<tr>
 		<td><code><b>removeAttribution</b>(
@@ -4382,7 +4379,7 @@ <h2 id="control-layers">Control.Layers</h2>
 <p>The layers control gives users the ability to switch between different base layers and switch overlays on/off (check out the <a href="http://leafletjs.com/examples/layers-control.html">detailed example</a>). Extends <a href="#control">Control</a>.</p>
 
 <pre><code>var baseLayers = {
-	"CloudMade": cloudmade,
+	"Mapbox": mapbox,
 	"OpenStreetMap": osm
 };