renamed hello/ directory to app/ as per the sandbox change

fabpot · fabpot · commit 93aae982ea91 · 2010-09-20T21:27:14.000+02:00
diff --git a/quick_tour/the_architecture.rst b/quick_tour/the_architecture.rst
@@ -16,8 +16,7 @@ The directory structure of a Symfony :term:`application` is rather flexible
 but the directory structure of a sandbox reflects the typical and recommended
 structure of a Symfony application:
 
-* ``hello/``: This directory, named after your application, contains the
-  configuration files;
+* ``app/``: This directory contains the application configuration;
 
 * ``src/``: All the PHP code is stored under this directory;
 
@@ -35,22 +34,22 @@ live:
     <!-- web/index.php -->
     <?php
 
-    require_once __DIR__.'/../hello/HelloKernel.php';
+    require_once __DIR__.'/../app/AppKernel.php';
 
-    $kernel = new HelloKernel('prod', false);
+    $kernel = new AppKernel('prod', false);
     $kernel->handle()->send();
 
-Like any front controller, ``index.php`` uses a Kernel Class, ``HelloKernel``, to
-bootstrap the application.
+Like any front controller, ``index.php`` uses a Kernel Class, ``AppKernel``,
+to bootstrap the application.
 
 .. index::
    single: Kernel
 
 The Application Directory
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The ``HelloKernel`` class is the main entry point of the application
-configuration and as such, it is stored in the ``hello/`` directory.
+The ``AppKernel`` class is the main entry point of the application
+configuration and as such, it is stored in the ``app/`` directory.
 
 This class must implement four methods:
 
@@ -72,7 +71,7 @@ understand the flexibility of the framework.
 To make things work together, the kernel requires one file from the ``src/``
 directory::
 
-    // hello/HelloKernel.php
+    // app/AppKernel.php
     require_once __DIR__.'/../src/autoload.php';
 
 The Source Directory
@@ -128,14 +127,13 @@ own bundles. It makes it so easy to pick and choose which features to enable
 in your application and optimize them the way you want.
 
 An application is made up of bundles as defined in the ``registerBundles()``
-method of the ``HelloKernel`` class::
+method of the ``AppKernel`` class::
 
-    // hello/HelloKernel.php
+    // app/AppKernel.php
 
     public function registerBundles()
     {
         $bundles = array(
-            new Symfony\Framework\KernelBundle(),
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new Symfony\Bundle\ZendBundle\ZendBundle(),
             new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
@@ -165,7 +163,7 @@ PHP. Have a look at the default configuration:
 
     .. code-block:: yaml
 
-        # hello/config/config.yml
+        # app/config/config.yml
         kernel.config:
             charset:       UTF-8
             error_handler: null
@@ -179,7 +177,7 @@ PHP. Have a look at the default configuration:
 
     .. code-block:: xml
 
-        <!-- hello/config/config.xml -->
+        <!-- app/config/config.xml -->
         <kernel:config
             charset="UTF-8"
             error_handler="null"
@@ -196,7 +194,7 @@ PHP. Have a look at the default configuration:
 
     .. code-block:: php
 
-        // hello/config/config.php
+        // app/config/config.php
         $container->loadFromExtension('kernel', 'config', array(
             'charset'       => 'UTF-8',
             'error_handler' => null,
@@ -223,7 +221,7 @@ specific configuration file:
 
     .. code-block:: yaml
 
-        # hello/config/config_dev.yml
+        # app/config/config_dev.yml
         imports:
             - { resource: config.yml }
 
@@ -236,7 +234,7 @@ specific configuration file:
 
     .. code-block:: xml
 
-        <!-- hello/config/config_dev.xml -->
+        <!-- app/config/config_dev.xml -->
         <imports>
             <import resource="config.xml" />
         </imports>
@@ -252,7 +250,7 @@ specific configuration file:
 
     .. code-block:: php
 
-        // hello/config/config.php
+        // app/config/config.php
         $loader->import('config.php');
 
         $container->loadFromExtension('web', 'config', array(
@@ -331,13 +329,13 @@ Run it without any arguments to learn more about its capabilities:
 
 .. code-block:: bash
 
-    $ php hello/console
+    $ php app/console
 
 The ``--help`` option helps you discover the usage of a command:
 
 .. code-block:: bash
 
-    $ php hello/console router:debug --help
+    $ php app/console router:debug --help
 
 Final Thoughts
 --------------
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
@@ -30,7 +30,7 @@ should now have a ``sandbox/`` directory::
 
     www/ <- your web root directory
         sandbox/ <- the unpacked archive
-            hello/
+            app/
                 cache/
                 config/
                 logs/
@@ -76,7 +76,7 @@ What's going on here? Let's dissect the URL:
 .. index:: Front Controller
 
 * ``index_dev.php``: This is a "front controller". It is the unique entry
-  point of the hello application and it responds to all user requests;
+  point of the application and it responds to all user requests;
 
 * ``/hello/Fabien``: This is the "virtual" path to the resource the user wants
   to access.
@@ -100,9 +100,9 @@ very easy).
 
 .. tip::
    The sandbox defaults to YAML, but you can easily switch to XML or PHP by
-   editing the ``config/HelloKernel.php`` file. You can switch now by looking
-   at the bottom of ``config/HelloKernel.php`` for instructions (the tutorials
-   show the configuration for all supported formats).
+   editing the ``config/AppKernel.php`` file. You can switch now by looking at
+   the bottom of ``config/AppKernel.php`` for instructions (the tutorials show
+   the configuration for all supported formats).
 
 .. index::
    single: Routing
@@ -117,7 +117,7 @@ So, Symfony routes the request by reading the routing configuration file:
 
     .. code-block:: yaml
 
-        # hello/config/routing.yml
+        # app/config/routing.yml
         homepage:
             pattern:  /
             defaults: { _controller: FrameworkBundle:Default:index }
@@ -127,7 +127,7 @@ So, Symfony routes the request by reading the routing configuration file:
 
     .. code-block:: xml
 
-        <!-- hello/config/routing.xml -->
+        <!-- app/config/routing.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
 
         <routes xmlns="http://www.symfony-project.org/schema/routing"
@@ -143,7 +143,7 @@ So, Symfony routes the request by reading the routing configuration file:
 
     .. code-block:: php
 
-        // hello/config/routing.php
+        // app/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
@@ -302,7 +302,7 @@ better looking URL:
     http://localhost/hello/Fabien
 
 To make the production environment as fast as possible, Symfony maintains a
-cache under the ``hello/cache/`` directory. When you make changes, you need to
+cache under the ``app/cache/`` directory. When you make changes, you need to
 manually remove the cached files. That's why you should always use the
 development front controller (``index_dev.php``) when working on a project.
 
diff --git a/quick_tour/the_view.rst b/quick_tour/the_view.rst
@@ -51,12 +51,12 @@ Now, let's have a look at the ``layout.php`` file:
 The layout is itself decorated by another layout (``::layout``). Symfony
 supports multiple decoration levels: a layout can itself be decorated by
 another one. When the bundle part of the template name is empty, views are
-looked for in the ``hello/views/`` directory. This directory store global
-views for your entire project:
+looked for in the ``app/views/`` directory. This directory store global views
+for your entire project:
 
 .. code-block:: html+php
 
-    <!-- hello/views/layout.php -->
+    <!-- app/views/layout.php -->
     <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     <html>
         <head>
@@ -100,7 +100,7 @@ The base layout already have the code to output the title in the header:
 
 .. code-block:: html+php
 
-    <!-- hello/views/layout.php -->
+    <!-- app/views/layout.php -->
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <title><?php $view['slots']->output('title', 'Hello Application') ?></title>
