--- a/examples/doctest.txt	Mon Jan 10 14:39:21 2011 -0800
+++ b/examples/doctest.txt	Mon Jan 10 19:57:13 2011 -0800
@@ -1,7 +1,9 @@
 MakeItSo!
 =========
 
-Boilerplate:
+A filesystem templating system for rapid deploy of projects
+
+Boilerplate::
 
     >>> import makeitso
     >>> import os
@@ -15,22 +17,22 @@
     >>> template = makeitso.PolyTemplate([example], interactive=False)
     >>> template.missing()
     set(['name'])
-    >>> template.substitute(name='foo')
+    >>> template.substitute(output=None, name='foo')
     Hello foo
     
 Substitute to a buffer::
 
     >>> buffer = StringIO()
-    >>> template = makeitso.PolyTemplate([example], output=buffer, interactive=False)
-    >>> template.substitute(name='bar')
+    >>> template = makeitso.PolyTemplate([example], interactive=False)
+    >>> template.substitute(output=buffer, name='bar')
     >>> buffer.getvalue().strip()
     'Hello bar'
 
 Substitute to a file::
 
     >>> buffer = tempfile.mktemp()
-    >>> template = makeitso.PolyTemplate([example], output=buffer, interactive=False)
-    >>> template.substitute(name='fleem')
+    >>> template = makeitso.PolyTemplate([example], interactive=False)
+    >>> template.substitute(buffer, name='fleem')
     >>> file(buffer).read().strip()
     'Hello fleem'
     >>> os.remove(buffer)
@@ -39,10 +41,10 @@
 
     >>> exampledir = os.path.join(here, 'directory-example')
     >>> tempdir = tempfile.mkdtemp()
-    >>> template = makeitso.PolyTemplate([exampledir], output=tempdir, interactive=False)
+    >>> template = makeitso.PolyTemplate([exampledir], interactive=False)
     >>> sorted(template.missing())
     ['bar', 'foo', 'subdir']
-    >>> template.substitute(foo='It', bar='life', subdir='mysubdir')
+    >>> template.substitute(tempdir, foo='It', bar='life', subdir='mysubdir')
     >>> sorted(os.listdir(tempdir))
     ['foo.txt', 'mysubdir']
     >>> file(os.path.join(tempdir, 'foo.txt')).read().strip()
@@ -64,16 +66,16 @@
 
     >>> variables = dict([(i, i.title()) for i in variables])
     >>> try:
-    ...    template.substitute(**variables)
+    ...    template.substitute(output=None, **variables)
     ... except AssertionError, e:
     ...    pass
     >>> e
-    AssertionError('Must specify output ...
+    AssertionError()
 
 Provide an output::
 
-    >>> template = makeitso.PolyTemplate([example, exampledir], output=tempdir, interactive=False)
-    >>> template.substitute(**variables)
+    >>> template = makeitso.PolyTemplate([example, exampledir], interactive=False)
+    >>> template.substitute(tempdir, **variables)
     >>> sorted(os.listdir(tempdir))
     ['Subdir', 'example.txt', 'foo.txt']
     >>> shutil.rmtree(tempdir)
@@ -86,8 +88,8 @@
     ...    templates = ['example.txt']
     ...    vars = [Variable(name='name', default='bar')]
     >>> buffer = tempfile.mktemp()
-    >>> apitemplate = MyTemplate(output=buffer)
-    >>> apitemplate.substitute()
+    >>> apitemplate = MyTemplate(interactive=False)
+    >>> apitemplate.substitute(buffer)
     >>> file(buffer).read().strip()
     'Hello bar'
     >>> os.remove(buffer)
@@ -99,8 +101,8 @@
     >>> print >> f, '#!/bin/bash\necho foo'
     >>> f.close()
     >>> os.chmod(buffer, 0755)
-    >>> uritemplate = makeitso.URITemplate(example, output=buffer, interactive=False)
-    >>> uritemplate.substitute(name='bar')
+    >>> uritemplate = makeitso.URITemplate(example, interactive=False)
+    >>> uritemplate.substitute(buffer, name='bar')
     >>> ('%o' % os.stat(buffer).st_mode).endswith('755')
     True
     >>> os.remove(buffer)