Merge branch '2.0'

Author: weaverryan

book/controller.rst

@@ -521,6 +521,15 @@ The Symfony templating engine is explained in great detail in the
         $templating = $this->get('templating');
         $content = $templating->render('AcmeHelloBundle:Hello:index.html.twig', array('name' => $name));
 
+.. note::
+
+    It is possible to render templates in deeper subdirectories as well, however
+    be careful to avoid the pitfall of making your directory structure unduly
+    elaborate::
+
+        $templating->render('AcmeHelloBundle:Hello/Greetings:index.html.twig', array('name' => $name));
+        // index.html.twig found in Resources/views/Hello/Greetings is rendered.
+
 .. index::
    single: Controller; Accessing services
 

book/page_creation.rst

@@ -689,6 +689,10 @@ some of the most common elements of a bundle:
 
 * ``Controller/`` contains the controllers of the bundle (e.g. ``HelloController.php``);
 
+* ``DependencyInjection/`` holds certain dependency injection extension classes,
+  which may import service configuration, register compiler passes or more
+  (this directory is not necessary);
+
 * ``Resources/config/`` houses configuration, including routing configuration
   (e.g. ``routing.yml``);
 

contributing/code/license.rst

@@ -14,7 +14,7 @@ According to `Uncyclopedia`_:
 The License
 -----------
 
-Copyright (c) 2004-2011 Fabien Potencier
+Copyright (c) 2004-2012 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

contributing/documentation/format.rst

@@ -146,7 +146,11 @@ Installing the Sphinx extensions
     
     # ...
     sys.path.append(os.path.abspath('_exts'))
-    
+
+    # adding PhpLexer
+    from sphinx.highlighting import lexers
+    from pygments.lexers.web import PhpLexer
+
     # ...
     # add the extensions to the list of extensions
     extensions = [..., 'sensio.sphinx.refinclude', 'sensio.sphinx.configurationblock', 'sensio.sphinx.phpcode']