Merge pull request #67 from sensiolabs/build_errors

weaverryan · web-flow · commit cd7a37c78c04 · 2016-07-13T14:32:51.000-04:00
Another batch of build error fixes
diff --git a/doctrine/associations.rst b/doctrine/associations.rst
@@ -207,8 +207,8 @@ In other words, the related ``Category`` object will be stored in the
 relationship by storing the category's id in the ``category_id`` column
 of the ``product`` table.
 
-.. image:: /images/book/doctrine_image_2.png
-:align: center
+.. image:: /_images/doctrine/mapping_relations.png
+    :align: center
 
 The metadata above the ``Category`` entity's ``$products`` property is less
 complicated. It simply tells Doctrine to look at the ``Product.category``
@@ -289,7 +289,7 @@ Doctrine silently makes a second query to find the ``Category`` that's related
 to this ``Product``. It prepares the ``$category`` object and returns it to
 you.
 
-.. image:: /images/book/doctrine_image_3.png
+.. image:: /_images/doctrine/mapping_relations_proxy.png
     :align: center
 
 What's important is the fact that you have easy access to the product's related
diff --git a/form/form_customization.rst b/form/form_customization.rst
@@ -83,7 +83,7 @@ just one line:
 
 The remainder of this recipe will explain how every part of the form's markup
 can be modified at several different levels. For more information about form
-rendering in general, see :ref:`/form/rendering`.
+rendering in general, see :doc:`/form/rendering`.
 
 .. _cookbook-form-customization-form-themes:
 
diff --git a/form/form_themes.rst b/form/form_themes.rst
@@ -186,6 +186,8 @@ In the above example, you used the ``form_theme`` helper (in Twig) to "import"
 the custom form fragments into *just* that form. You can also tell Symfony
 to import form customizations across your entire project.
 
+.. _forms-theming-twig:
+
 Twig
 ~~~
 
diff --git a/forms.rst b/forms.rst
@@ -400,7 +400,7 @@ That's it! If you re-submit the form with invalid data, you'll see the
 corresponding errors printed out with the form.
 
 Validation is a very powerful feature of Symfony and has its own
-:doc:`dedicated chapter </book/validation>`.
+:doc:`dedicated chapter </validation>`.
 
 .. _book-forms-html5-validation-disable:
 
diff --git a/index.rst b/index.rst
@@ -34,7 +34,7 @@ Getting Started
 .. toctree::
     :maxdepth: 1
 
-    installation
+    setup
     http_fundamentals
     routing
     controller
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -1157,7 +1157,7 @@ resources
 
 A list of all resources for form theming in PHP. This setting is not required
 if you're using the Twig format for your templates, in that case refer to
-:ref:`the form book chapter <book-forms-theming-twig>`.
+:ref:`the form book chapter <forms-theming-twig>`.
 
 Assume you have custom global form themes in
 ``src/WebsiteBundle/Resources/views/Form``, you can configure this like:
diff --git a/reference/forms/types/submit.rst b/reference/forms/types/submit.rst
@@ -73,7 +73,7 @@ from the "Registration" are validated.
 
 .. seealso::
 
-    You can read more about this in :ref:`the Form chapter </form/data_based_validation>`
+    You can read more about this in :doc:`the Form chapter </form/data_based_validation>`
     of the book.
 
 Form Variables
diff --git a/routing/method_parameters.rst b/routing/method_parameters.rst
@@ -80,7 +80,7 @@ Symfony provides you with a simple way of working around this limitation. By inc
 a ``_method`` parameter in the query string or parameters of an HTTP request, Symfony
 will use this as the method when matching routes. Forms automatically include a
 hidden field for this parameter if their submission method is not GET or POST.
-See :ref:`the related chapter in the forms documentation<book-forms-changing-action-and-method>`
+See :doc:`the related chapter in the forms documentation </form/action_method>`
 for more information.
 
 .. tip::
diff --git a/security.rst b/security.rst
@@ -1331,10 +1331,10 @@ Other Security Related Topics
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. toctree::
-    :maxdepth:
+    :maxdepth: 1
 
-    password_encoding
-    security_checker
+    security/password_encoding
+    security/security_checker
 
 .. _`frameworkextrabundle documentation`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
 .. _`HWIOAuthBundle`: https://github.com/hwi/HWIOAuthBundle
diff --git a/setup.rst b/setup.rst
@@ -354,6 +354,7 @@ Learn More
     :glob:
 
     install/*
+    setup/*
 
 .. _`Composer`: https://getcomposer.org/
 .. _`enable ACL support`: https://help.ubuntu.com/community/FilePermissionsACLs
diff --git a/templating.rst b/templating.rst
@@ -966,7 +966,6 @@ Learn more
 .. _`filters`: http://twig.sensiolabs.org/doc/filters/index.html
 .. _`functions`: http://twig.sensiolabs.org/doc/functions/index.html
 .. _`add your own extensions`: http://twig.sensiolabs.org/doc/advanced.html#creating-an-extension
-.. _`hinclude.js`: http://mnot.github.io/hinclude/
 .. _`with_context`: http://twig.sensiolabs.org/doc/functions/include.html
 .. _`include() function`: http://twig.sensiolabs.org/doc/functions/include.html
 .. _`{% include %} tag`: http://twig.sensiolabs.org/doc/tags/include.html
diff --git a/templating/embedding_controllers.rst b/templating/embedding_controllers.rst
@@ -96,4 +96,4 @@ Whenever you find that you need a variable or a piece of information that
 you don't have access to in a template, consider rendering a controller.
 Controllers are fast to execute and promote good code organization and reuse.
 Of course, like all controllers, they should ideally be "skinny", meaning
-that as much code as possible lives in reusable :doc:`services </book/service_container>`.
+that as much code as possible lives in reusable :doc:`services </service_container>`.
diff --git a/templating/hinclude.rst b/templating/hinclude.rst
@@ -149,3 +149,5 @@ Or you can also specify a string to display as the default content:
                 'default'  => 'Loading...',
             )
         ) ?>
+
+.. _`hinclude.js`: http://mnot.github.io/hinclude/
diff --git a/templating/overriding.rst b/templating/overriding.rst
@@ -64,12 +64,12 @@ subdirectory.
 .. note::
 
     You can also override templates from within a bundle by using bundle
-    inheritance. For more information, see :doc:`/cookbook/bundles/inheritance`.
+    inheritance. For more information, see :doc:`/bundles/inheritance`.
 
 .. _templating-overriding-core-templates:
 
 .. index::
-single: Template; Overriding exception templates
+    single: Template; Overriding exception templates
 
 Overriding Core Templates
 ~~~~~~~~~~~~~~~~~~~~~~~~~
