Merge remote-tracking branch 'matrixhacker/master'

Conflicts:
	docs/config.rst

docs/config.rst

@@ -609,8 +609,10 @@ Rendering
 .. _crop:
 
 ``crop``
-    You can use this to render a small subset of your map, instead of the entire
-    thing. The format is (min x, min z, max x, max z).
+    You can use this to render one or more small subsets of your map. The format
+    of an individual crop zone is (min x, min z, max x, max z); if you wish to
+    specify multiple crop zones, you may do so by specifying a list of crop zones,
+    i.e. [(min x1, min z1, max x1, max z1), (min x2, min z2, max x2, max z2)]
 
     The coordinates are block coordinates. The same you get with the debug menu
     in-game and the coordinates shown when you view a map.
@@ -623,6 +625,14 @@ Rendering
                 'crop': (-500, -500, 500, 500),
         }
 
+    Example that renders two 500 by 500 squares of land:
+
+        renders['myrender'] = {
+                'world': 'myworld',
+                'title': "Multi cropped Example",
+                'crop': [(-500, -500, 0, 0), (0, 0, 500, 500)]
+        }
+
     This option performs a similar function to the old ``--regionlist`` option
     (which no longer exists). It is useful for example if someone has wandered
     really far off and made your map too large. You can set the crop for the
@@ -830,7 +840,6 @@ Other HTML/JS output options
        markers and signs on our map, you must also run the genPO script.  See
        the :doc:`Signs and markers<signs>` section for more details and documenation.
 
-
     **Default:** ``[]`` (an empty list)