fixed previous commit

Author: fabpot

book/controller.rst

@@ -131,7 +131,7 @@ Mapping a URI to a Controller
 Our new controller returns a simple HTML page. To render this controller
 at a specific URL, we need to create a route to it.
 
-We'll talk about the ``Routing`` component in detail in the :doc:`Routing guide</guides/routing>`,
+We'll talk about the ``Routing`` component in detail in the :doc:`Routing guide</book/routing>`,
 but let's create a simple route to our controller:
 
 .. configuration-block::
@@ -389,7 +389,7 @@ class, which is designed specifically to redirect the user to another URL::
 
 The ``generateUrl()`` method is just a shortcut that calls ``generate()``
 on the ``router`` service. It takes the route name and an array of parameters
-as arguments and returns the associated friendly URL. See the :doc:`Routing </guides/routing>`
+as arguments and returns the associated friendly URL. See the :doc:`Routing </book/routing>`
 guide for more information.
 
 By default, the ``redirect`` method does a 302 (temporary) redirect. To perform
@@ -474,7 +474,7 @@ returns a ``Response`` object with the content from the template::
 
  return $this->render('HelloBundle:Hello:index.html.twig', array('name' => $name));
 
-The Symfony templating engine is explained in great detail in the :doc:`Templating </guides/templating>`
+The Symfony templating engine is explained in great detail in the :doc:`Templating </book/templating>`
 guide.
 
 .. tip::
@@ -505,7 +505,7 @@ via the ``get()`` method. Here are several common services you might need::
  $mailer = $this->get('mailer');
 
 The are countless other services available and you are encouraged to define
-your own. For more information, see the :doc:`Extending Symfony </guides/extending_symfony>`
+your own. For more information, see the :doc:`Extending Symfony </book/extending_symfony>`
 guide.
 
 .. index::

book/doctrine/orm/overview.rst

@@ -14,7 +14,7 @@ persistence for PHP objects.
  official `documentation`_ website.
 
 To get started, enable and configure the :doc:`Doctrine DBAL
-</guides/doctrine/dbal/overview>`, then enable the ORM. The minimal
+</book/doctrine/dbal/overview>`, then enable the ORM. The minimal
 necessary configuration is to specify the bundle name which contains your entities.
 
 .. configuration-block::

book/forms/fields/map.rst.inc

@@ -1,23 +1,23 @@
-* :doc:`BirthdayField </guides/forms/fields/BirthdayField>`
-* :doc:`CheckboxField </guides/forms/fields/CheckboxField>`
-* :doc:`ChoiceField </guides/forms/fields/ChoiceField>`
-* :doc:`CollectionField </guides/forms/fields/CollectionField>`
-* :doc:`CountryField </guides/forms/fields/CountryField>`
-* :doc:`DateField </guides/forms/fields/DateField>`
-* :doc:`DateTimeField </guides/forms/fields/DateTimeField>`
-* :doc:`EntityChoiceField </guides/forms/fields/EntityChoiceField>`
-* :doc:`FileField </guides/forms/fields/FileField>`
-* :doc:`HiddenField </guides/forms/fields/HiddenField>`
-* :doc:`IntegerField </guides/forms/fields/IntegerField>`
-* :doc:`LanguageField </guides/forms/fields/LanguageField>`
-* :doc:`LocaleField </guides/forms/fields/LocaleField>`
-* :doc:`MoneyField </guides/forms/fields/MoneyField>`
-* :doc:`NumberField </guides/forms/fields/NumberField>`
-* :doc:`PasswordField </guides/forms/fields/PasswordField>`
-* :doc:`PercentField </guides/forms/fields/PercentField>`
-* :doc:`RepeatedField </guides/forms/fields/RepeatedField>`
-* :doc:`TextareaField </guides/forms/fields/TextareaField>`
-* :doc:`TextField </guides/forms/fields/TextField>`
-* :doc:`TimeField </guides/forms/fields/TimeField>`
-* :doc:`TimezoneField </guides/forms/fields/TimezoneField>`
-* :doc:`UrlField </guides/forms/fields/UrlField>`
+* :doc:`BirthdayField </book/forms/fields/BirthdayField>`
+* :doc:`CheckboxField </book/forms/fields/CheckboxField>`
+* :doc:`ChoiceField </book/forms/fields/ChoiceField>`
+* :doc:`CollectionField </book/forms/fields/CollectionField>`
+* :doc:`CountryField </book/forms/fields/CountryField>`
+* :doc:`DateField </book/forms/fields/DateField>`
+* :doc:`DateTimeField </book/forms/fields/DateTimeField>`
+* :doc:`EntityChoiceField </book/forms/fields/EntityChoiceField>`
+* :doc:`FileField </book/forms/fields/FileField>`
+* :doc:`HiddenField </book/forms/fields/HiddenField>`
+* :doc:`IntegerField </book/forms/fields/IntegerField>`
+* :doc:`LanguageField </book/forms/fields/LanguageField>`
+* :doc:`LocaleField </book/forms/fields/LocaleField>`
+* :doc:`MoneyField </book/forms/fields/MoneyField>`
+* :doc:`NumberField </book/forms/fields/NumberField>`
+* :doc:`PasswordField </book/forms/fields/PasswordField>`
+* :doc:`PercentField </book/forms/fields/PercentField>`
+* :doc:`RepeatedField </book/forms/fields/RepeatedField>`
+* :doc:`TextareaField </book/forms/fields/TextareaField>`
+* :doc:`TextField </book/forms/fields/TextField>`
+* :doc:`TimeField </book/forms/fields/TimeField>`
+* :doc:`TimezoneField </book/forms/fields/TimezoneField>`
+* :doc:`UrlField </book/forms/fields/UrlField>`

book/forms/overview.rst

@@ -238,7 +238,7 @@ data.
 
 If any constraint fails, the error is displayed next to the corresponding
 form field. You can learn more about constraints in :doc:`Validation 
-Constraints </guides/validator/constraints>`.
+Constraints </book/validator/constraints>`.
 
 Creating Form Fields Automatically
 ----------------------------------

book/forms/view.rst

@@ -4,7 +4,7 @@
 Forms in Templates
 ==================
 
-A Symfony2 :doc:`Form </guides/forms/overview>` is made of fields. Fields
+A Symfony2 :doc:`Form </book/forms/overview>` is made of fields. Fields
 describe the form semantic, not its end-user representation; it means that a
 form is not necessarily tied to HTML. Instead, it is the responsibility of the 
 web designer to display each form field the way he wants. So, displaying a 

book/from_flat_php_to_symfony2.rst

@@ -633,9 +633,9 @@ routing map information to determine which controller to call. Just as in
 our sample application, your controller method is responsible for returning
 the final ``Response`` object. There's really not much else to it.
 
-In the upcoming guides, we'll learn more about how each piece works and
-how the project is organized by default. For now, just realize what we've
-gained by migrating the original flat PHP application to Symfony2:
+In the upcoming chapters, we'll learn more about how each piece works and how
+the project is organized by default. For now, just realize what we've gained
+by migrating the original flat PHP application to Symfony2:
 
 * Your application code is clearly and consistently organized (though Symfony
  doesn't force you into this) in a way that promotes reusability and allows

book/http_fundamentals.rst

@@ -362,8 +362,8 @@ controller.
  v |
  Routing
 
-We'll talk a lot more about :doc:`Controllers </guides/controller>` and the
-:doc:`Router </guides/routing>` in later chapters.
+We'll talk a lot more about :doc:`Controllers </book/controller>` and the
+:doc:`Router </book/routing>` in later chapters.
 
 .. tip::
 

book/index.rst

@@ -1,5 +1,5 @@
-Guides
-======
+Book
+====
 
 Dive into Symfony2 with the topical guides:
 

book/internals/kernel.rst

@@ -143,7 +143,7 @@ method::
 .. tip::
 
  If you are not yet familiar with the Symfony2 Event Dispatcher, read the
- :doc:`dedicated chapter </guides/internals/event_dispatcher>` first.
+ :doc:`dedicated chapter </book/internals/event_dispatcher>` first.
 
 .. index::
  single: Event; core.request

book/internals/overview.rst

@@ -62,8 +62,8 @@ Dependency Injection component and a powerful plugin system (bundles).
 .. seealso::
 
  Read more about the :doc:`HttpKernel <kernel>` component. Read more about
- :doc:`Dependency Injection </guides/service_container>` and :doc:`Bundles
- </guides/bundles/index>`.
+ :doc:`Dependency Injection </book/service_container>` and :doc:`Bundles
+ </book/bundles/index>`.
 
 ``FrameworkBundle`` Bundle
 --------------------------