Merge branch '2.0' into 2.1

weaverryan · weaverryan · commit d5de482775b4 · 2012-10-31T22:18:20.000-05:00
diff --git a/book/page_creation.rst b/book/page_creation.rst
@@ -394,7 +394,7 @@ and in the ``app`` directory:
             </head>
             <body>
                 <?php $view['slots']->output('_content') ?>
-                <?php $view['slots']->output('stylesheets') ?>
+                <?php $view['slots']->output('javascripts') ?>
             </body>
         </html>
 
