diff --git a/docs/example_generation.jl b/docs/example_generation.jl
index cd74616e..d6699633 100644
--- a/docs/example_generation.jl
+++ b/docs/example_generation.jl
@@ -49,18 +49,18 @@ const examples = PlotExample[
   PlotExample("Heatmaps",
               "",
               [:(heatmap(randn(10000),randn(10000); nbins=100))]),
-  PlotExample("Suported line types",
-              "All options: (:line, :orderedline, :step, :stepinverted, :sticks, :scatter, :none, :heatmap, :hexbin, :hist, :bar)",
+  PlotExample("Line types",
+              "",
               [:(types = intersect(supportedTypes(), [:line, :step, :stepinverted, :sticks, :scatter])),
                   :(n = length(types)),
                   :(x = Vector[sort(rand(20)) for i in 1:n]),
                   :(y = rand(20,n)),
                   :(plot(x, y; linetypes=types, labels=map(string,types)))]),
-  PlotExample("Supported line styles",
-              "All options: (:solid, :dash, :dot, :dashdot, :dashdotdot)",
+  PlotExample("Line styles",
+              "",
               [:(styles = setdiff(supportedStyles(), [:auto])), :(plot(rand(20,length(styles)); linestyle=:auto, labels=map(string,styles)))]),
-  PlotExample("Supported marker types",
-              "All options: (:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon)",
+  PlotExample("Marker types",
+              "",
               [:(markers = setdiff(supportedMarkers(), [:none,:auto])), :(scatter(0.5:9.5, [fill(i-0.5,10) for i=length(markers):-1:1]; marker=:auto, labels=map(string,markers), markersize=10))]),
   PlotExample("Bar",
               "x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)",
@@ -133,7 +133,7 @@ function generate_markdown(pkgname::Symbol)
       imgname = "$(pkgname)_example_$i.png"
 
       # NOTE: uncomment this to overwrite the images as well
-      savepng("$IMGDIR/$pkgname/$imgname")
+      # savepng("$IMGDIR/$pkgname/$imgname")
 
       # write out the header, description, code block, and image link
       write(md, "### $(example.header)\n\n")
diff --git a/docs/gadfly_examples.md b/docs/gadfly_examples.md
index bc0d5249..38605e6e 100644
--- a/docs/gadfly_examples.md
+++ b/docs/gadfly_examples.md
@@ -51,7 +51,7 @@ Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, um
 ```julia
 plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33:
             sin(2x)
-        end),0,2π)
+        end),0,2π,legend=false)
 ```
 
 ![](../img/gadfly/gadfly_example_4.png)
@@ -118,9 +118,9 @@ heatmap(randn(10000),randn(10000); nbins=100)
 
 ![](../img/gadfly/gadfly_example_10.png)
 
-### Suported line types
+### Line types
+
 
-All options: (:line, :orderedline, :step, :stepinverted, :sticks, :scatter, :none, :heatmap, :hexbin, :hist, :bar)
 
 ```julia
 types = intersect(supportedTypes(),[:line,:step,:stepinverted,:sticks,:scatter])
@@ -132,9 +132,9 @@ plot(x,y; linetypes=types,labels=map(string,types))
 
 ![](../img/gadfly/gadfly_example_11.png)
 
-### Supported line styles
+### Line styles
+
 
-All options: (:solid, :dash, :dot, :dashdot, :dashdotdot)
 
 ```julia
 styles = setdiff(supportedStyles(),[:auto])
@@ -143,13 +143,13 @@ plot(rand(20,length(styles)); linestyle=:auto,labels=map(string,styles))
 
 ![](../img/gadfly/gadfly_example_12.png)
 
-### Supported marker types
+### Marker types
+
 
-All options: (:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon)
 
 ```julia
 markers = setdiff(supportedMarkers(),[:none,:auto])
-plot(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,labels=map(string,markers),markersize=10)
+scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,labels=map(string,markers),markersize=10)
 ```
 
 ![](../img/gadfly/gadfly_example_13.png)
diff --git a/docs/immerse_examples.md b/docs/immerse_examples.md
index 73b5b2c5..d3585e33 100644
--- a/docs/immerse_examples.md
+++ b/docs/immerse_examples.md
@@ -51,7 +51,7 @@ Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, um
 ```julia
 plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33:
             sin(2x)
-        end),0,2π)
+        end),0,2π,legend=false)
 ```
 
 ![](../img/immerse/immerse_example_4.png)
@@ -118,9 +118,9 @@ heatmap(randn(10000),randn(10000); nbins=100)
 
 ![](../img/immerse/immerse_example_10.png)
 
-### Suported line types
+### Line types
+
 
-All options: (:line, :orderedline, :step, :stepinverted, :sticks, :scatter, :none, :heatmap, :hexbin, :hist, :bar)
 
 ```julia
 types = intersect(supportedTypes(),[:line,:step,:stepinverted,:sticks,:scatter])
@@ -132,9 +132,9 @@ plot(x,y; linetypes=types,labels=map(string,types))
 
 ![](../img/immerse/immerse_example_11.png)
 
-### Supported line styles
+### Line styles
+
 
-All options: (:solid, :dash, :dot, :dashdot, :dashdotdot)
 
 ```julia
 styles = setdiff(supportedStyles(),[:auto])
@@ -143,13 +143,13 @@ plot(rand(20,length(styles)); linestyle=:auto,labels=map(string,styles))
 
 ![](../img/immerse/immerse_example_12.png)
 
-### Supported marker types
+### Marker types
+
 
-All options: (:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon)
 
 ```julia
 markers = setdiff(supportedMarkers(),[:none,:auto])
-plot(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,labels=map(string,markers),markersize=10)
+scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,labels=map(string,markers),markersize=10)
 ```
 
 ![](../img/immerse/immerse_example_13.png)
diff --git a/docs/pyplot_examples.md b/docs/pyplot_examples.md
index 4bf0e6e7..7ec5ff2d 100644
--- a/docs/pyplot_examples.md
+++ b/docs/pyplot_examples.md
@@ -118,9 +118,9 @@ heatmap(randn(10000),randn(10000); nbins=100)
 
 ![](../img/pyplot/pyplot_example_10.png)
 
-### Suported line types
+### Line types
+
 
-All options: (:line, :orderedline, :step, :stepinverted, :sticks, :scatter, :none, :heatmap, :hexbin, :hist, :bar)
 
 ```julia
 types = intersect(supportedTypes(),[:line,:step,:stepinverted,:sticks,:scatter])
@@ -132,9 +132,9 @@ plot(x,y; linetypes=types,labels=map(string,types))
 
 ![](../img/pyplot/pyplot_example_11.png)
 
-### Supported line styles
+### Line styles
+
 
-All options: (:solid, :dash, :dot, :dashdot, :dashdotdot)
 
 ```julia
 styles = setdiff(supportedStyles(),[:auto])
@@ -143,9 +143,9 @@ plot(rand(20,length(styles)); linestyle=:auto,labels=map(string,styles))
 
 ![](../img/pyplot/pyplot_example_12.png)
 
-### Supported marker types
+### Marker types
+
 
-All options: (:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon)
 
 ```julia
 markers = setdiff(supportedMarkers(),[:none,:auto])
diff --git a/docs/qwt_examples.md b/docs/qwt_examples.md
index 81de2c55..1b04264d 100644
--- a/docs/qwt_examples.md
+++ b/docs/qwt_examples.md
@@ -51,7 +51,7 @@ Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, um
 ```julia
 plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33:
             sin(2x)
-        end),0,2π)
+        end),0,2π,legend=false)
 ```
 
 ![](../img/qwt/qwt_example_4.png)
@@ -118,9 +118,9 @@ heatmap(randn(10000),randn(10000); nbins=100)
 
 ![](../img/qwt/qwt_example_10.png)
 
-### Suported line types
+### Line types
+
 
-All options: (:line, :orderedline, :step, :stepinverted, :sticks, :scatter, :none, :heatmap, :hexbin, :hist, :bar)
 
 ```julia
 types = intersect(supportedTypes(),[:line,:step,:stepinverted,:sticks,:scatter])
@@ -132,9 +132,9 @@ plot(x,y; linetypes=types,labels=map(string,types))
 
 ![](../img/qwt/qwt_example_11.png)
 
-### Supported line styles
+### Line styles
+
 
-All options: (:solid, :dash, :dot, :dashdot, :dashdotdot)
 
 ```julia
 styles = setdiff(supportedStyles(),[:auto])
@@ -143,13 +143,13 @@ plot(rand(20,length(styles)); linestyle=:auto,labels=map(string,styles))
 
 ![](../img/qwt/qwt_example_12.png)
 
-### Supported marker types
+### Marker types
+
 
-All options: (:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon)
 
 ```julia
 markers = setdiff(supportedMarkers(),[:none,:auto])
-plot(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,labels=map(string,markers),markersize=10)
+scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,labels=map(string,markers),markersize=10)
 ```
 
 ![](../img/qwt/qwt_example_13.png)
diff --git a/docs/winston_examples.md b/docs/winston_examples.md
index 1dd98a27..4b5bd22e 100644
--- a/docs/winston_examples.md
+++ b/docs/winston_examples.md
@@ -51,7 +51,7 @@ Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, um
 ```julia
 plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33:
             sin(2x)
-        end),0,2π)
+        end),0,2π,legend=false)
 ```
 
 ![](../img/winston/winston_example_4.png)
@@ -108,9 +108,9 @@ scatter!(rand(100); markersize=6,color=:blue)
 
 ![](../img/winston/winston_example_9.png)
 
-### Suported line types
+### Line types
+
 
-All options: (:line, :orderedline, :step, :stepinverted, :sticks, :scatter, :none, :heatmap, :hexbin, :hist, :bar)
 
 ```julia
 types = intersect(supportedTypes(),[:line,:step,:stepinverted,:sticks,:scatter])
@@ -122,9 +122,9 @@ plot(x,y; linetypes=types,labels=map(string,types))
 
 ![](../img/winston/winston_example_11.png)
 
-### Supported line styles
+### Line styles
+
 
-All options: (:solid, :dash, :dot, :dashdot, :dashdotdot)
 
 ```julia
 styles = setdiff(supportedStyles(),[:auto])
@@ -133,9 +133,9 @@ plot(rand(20,length(styles)); linestyle=:auto,labels=map(string,styles))
 
 ![](../img/winston/winston_example_12.png)
 
-### Supported marker types
+### Marker types
+
 
-All options: (:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon)
 
 ```julia
 markers = setdiff(supportedMarkers(),[:none,:auto])