Merge pull request #125 from urschrei/patch-1

Correct drawmapscale() docstring

Author: Jeff Whitaker

lib/mpl_toolkits/basemap/__init__.py

@@ -4385,8 +4385,8 @@ def drawmapscale(self,lon,lat,lon0,lat0,length,barstyle='simple',\
                          to the styles provided by Generic Mapping Tools).
                          Default ``simple``.
         fontsize         for map scale annotations, default 9.
-        color            for map scale annotations, default black.
-        labelstype       ``simple`` (default) or ``fancy``.  For
+        fontcolor            for map scale annotations, default black.
+        labelstyle       ``simple`` (default) or ``fancy``.  For
                          ``fancy`` the map scale factor (ratio betwee
                          the actual distance and map projection distance
                          at lon0,lat0) and the value of lon0,lat0 are also