--- a/doc/scripts/docgen.py	Wed Feb 29 12:43:07 2012 -0500
+++ b/doc/scripts/docgen.py	Mon Mar 05 17:35:15 2012 -0500
@@ -28,7 +28,9 @@
         print '  --help: this help'
         sys.exit(0)
 
-    options['--all'] = not (bool(options['--epydoc']) ^ bool(options['--rst']))
+    if not (options['--epydoc'] or options['--rst']):
+        # Default is now rst
+        options['--rst'] = True
 
     def mkdir(path):
         try:
@@ -39,8 +41,6 @@
     outdir = options['-o'] or (pylearn_root + '/html')
     mkdir(outdir)
     os.chdir(outdir)
-    mkdir("doc")
-    mkdir("api")
 
     # Make sure the appropriate 'theano' directory is in the PYTHONPATH
     pythonpath = os.environ.get('PYTHONPATH', '')
@@ -48,6 +48,7 @@
     os.environ['PYTHONPATH'] = pythonpath
 
     if options['--all'] or options['--epydoc']:
+        mkdir("api")
         from epydoc.cli import cli
         sys.path[0:0] = [pylearn_root]
 
@@ -63,6 +64,7 @@
         # TODO
 
     if options['--all'] or options['--rst']:
+        mkdir("doc")
         import sphinx
         sys.path[0:0] = [os.path.join(pylearn_root, 'doc')]
         sphinx.main(['', '-E', os.path.join(pylearn_root, 'doc'), '.'])