backport documentation updates from master

mapbox · May 31, 2017 · 43f17b0 · 43f17b0
1 parent ac4054c
commit 43f17b0
Show file tree

Hide file tree

Showing 39 changed files with 28,523 additions and 22,075 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 test/rendering/layers/
 test/rendering/cache/
 test/rendering-mss/npm-debug.log
+docs/_build/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Changelog
 
+## 0.18.1
+
+* Updated `mapnik-reference` to fix an install problem for some Node.js versions
+* Backported documentation updates
+
 ## 0.18.0
 
 * Compile time performance improvement by leaving out rules that do not apply to layer minzoom and maxzoom restrictions if specified ([#469](https://github.com/mapbox/carto/issues/469))

diff --git a/docs-generator/README.md b/docs-generator/README.md
diff --git a/docs-generator/generate.js b/docs-generator/generate.js
diff --git a/docs-generator/index._ b/docs-generator/index._
diff --git a/docs-generator/package.json b/docs-generator/package.json
diff --git a/docs-generator/symbolizers._ b/docs-generator/symbolizers._