Merge pull request #138 from mwaskom/update_docs

Prepare for 0.6 release

Author: mwaskom

doc/documentation/config_file.rst

@@ -8,5 +8,3 @@ Detailed Documentation
    ./command_line
    ./custom_viz
    ./split_brain
-   ./config_file
-

doc/documentation/index.rst

@@ -60,7 +60,7 @@
                     help="overlay sign")
 parser.add_argument("-name",
                     help="name to use for the overlay")
-parser.add_argument("-size", default=800,
+parser.add_argument("-size", default=800, nargs="?",
                     help="size of the display window (in pixels)")
 parser.add_argument("-background", metavar="COLOR", default="black",
                     help="background color for display")

surfer/_commandline.py

@@ -477,7 +477,7 @@ def _set_window_properties(self, size, background, foreground):
         # old option "size" sets both width and height
         try:
             width, height = size
-        except TypeError:
+        except (TypeError, ValueError):
             width, height = size, size
         self._scene_size = height, width