[QuickTour] updated listings

Sebastian Ionescu · fabpot · commit f47246a593f4 · 2010-11-22T09:03:59.000+01:00
diff --git a/quick_tour/the_architecture.rst b/quick_tour/the_architecture.rst
@@ -27,17 +27,15 @@ The Web Directory
 
 The web root directory is the home of all public and static files like images,
 stylesheets, and JavaScript files. It is also where the front controllers
-live:
-
-.. code-block:: html+php
-
-    <!-- web/app.php -->
-    <?php
+live::
 
+    // web/app.php
     require_once __DIR__.'/../app/AppKernel.php';
 
+    use Symfony\Component\HttpFoundation\Request;
+
     $kernel = new AppKernel('prod', false);
-    $kernel->handle()->send();
+    $kernel->handle(new Request())->send();
 
 Like any front controller, ``app.php`` uses a Kernel Class, ``AppKernel``, to
 bootstrap the application.
@@ -89,15 +87,16 @@ stored in the ``src/`` directory::
 
     $loader = new UniversalClassLoader();
     $loader->registerNamespaces(array(
-        'Symfony'                    => $vendorDir.'/symfony/src',
-        'Application'                => __DIR__,
-        'Bundle'                     => __DIR__,
-        'Doctrine\\Common'           => $vendorDir.'/doctrine-common/lib',
-        'Doctrine\\DBAL\\Migrations' => $vendorDir.'/doctrine-migrations/lib',
-        'Doctrine\\ODM\\MongoDB'     => $vendorDir.'/doctrine-mongodb/lib',
-        'Doctrine\\DBAL'             => $vendorDir.'/doctrine-dbal/lib',
-        'Doctrine'                   => $vendorDir.'/doctrine/lib',
-        'Zend'                       => $vendorDir.'/zend/library',
+        'Symfony'                        => $vendorDir.'/symfony/src',
+        'Application'                    => __DIR__,
+        'Bundle'                         => __DIR__,
+        'Doctrine\\Common\\DataFixtures' => $vendorDir.'/doctrine-data-fixtures/lib',
+        'Doctrine\\Common'               => $vendorDir.'/doctrine-common/lib',
+        'Doctrine\\DBAL\\Migrations'     => $vendorDir.'/doctrine-migrations/lib',
+        'Doctrine\\ODM\\MongoDB'         => $vendorDir.'/doctrine-mongodb/lib',
+        'Doctrine\\DBAL'                 => $vendorDir.'/doctrine-dbal/lib',
+        'Doctrine'                       => $vendorDir.'/doctrine/lib',
+        'Zend'                           => $vendorDir.'/zend/library',
     ));
     $loader->registerPrefixes(array(
         'Swift_' => $vendorDir.'/swiftmailer/lib/classes',
@@ -147,7 +146,7 @@ method of the ``AppKernel`` class::
             //new Symfony\Bundle\TwigBundle\TwigBundle(),
 
             // register your bundles
-            new Application\AppBundle\AppBundle(),
+            new Application\HelloBundle\HelloBundle(),
         );
 
         if ($this->isDebug()) {
@@ -179,12 +178,9 @@ PHP. Have a look at the default configuration:
             templating:
                 escaping:       htmlspecialchars
                 #assets_version: SomeVersionScheme
-            #user:
-            #    default_locale: fr
-            #    session:
-            #        name:     SYMFONY
-            #        type:     Native
-            #        lifetime: 3600
+            session:
+                default_locale: en
+                lifetime: 3600
 
         ## Twig Configuration
         #twig.config:
@@ -213,11 +209,7 @@ PHP. Have a look at the default configuration:
             <app:router resource="%kernel.root_dir%/config/routing.xml" />
             <app:validation enabled="true" annotations="true" />
             <app:templating escaping="htmlspecialchars" />
-            <!--
-            <app:user default-locale="fr">
-                <app:session name="SYMFONY" type="Native" lifetime="3600" />
-            </app:user>
-            //-->
+            <app:session default-locale="en" lifetime="3600" />
         </app:config>
 
         <!-- Twig Configuration -->
@@ -255,14 +247,10 @@ PHP. Have a look at the default configuration:
                 'escaping'        => 'htmlspecialchars'
                 #'assets_version' => "SomeVersionScheme",
             ),
-            #'user' => array(
-            #    'default_locale' => "fr",
-            #    'session' => array(
-            #        'name' => "SYMFONY",
-            #        'type' => "Native",
-            #        'lifetime' => "3600",
-            #    )
-            #),
+            'session' => array(
+                'default_locale' => "en",
+                'lifetime' => "3600",
+            ),
         ));
 
         // Twig Configuration
@@ -316,7 +304,7 @@ specific configuration file:
         zend.config:
             logger:
                 priority: debug
-                path:     %kernel.root_dir%/logs/%kernel.environment%.log
+                path:     %kernel.logs_dir%/%kernel.environment%.log
 
     .. code-block:: xml
 
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
@@ -230,7 +230,6 @@ The controller is responsible for returning a representation of the resource
         }
     }
 
-
 The code is pretty straightforward but let's explain this code line by line:
 
 * *line 3*: Symfony2 takes advantage of new PHP 5.3 features and as such, all

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,6 @@ The controller is responsible for returning a representation of the resource`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`
`233`		`-`
`234`	`233`	`The code is pretty straightforward but let's explain this code line by line:`
`235`	`234`
`236`	`235`	`* line 3: Symfony2 takes advantage of new PHP 5.3 features and as such, all`