Merge pull request #85 from sensiolabs/index

weaverryan · web-flow · commit 47af5f80b186 · 2016-07-14T15:48:59.000-04:00
Update index.rst, fix build failures and move SOAP article
diff --git a/bundles.rst b/bundles.rst
@@ -172,4 +172,13 @@ create and validate forms, create translations for your application, write
 tests and much more. Each of these has their own place and role within the
 bundle.
 
+Learn More
+----------
+
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    bundles/*
+
 _`third-party bundles`: http://knpbundles.com
diff --git a/controller/soap_web_service b/controller/soap_web_service
diff --git a/index.rst b/index.rst
@@ -6,12 +6,7 @@ Symfony Documentation
 .. toctree::
     :hidden:
 
-    bundles/index
     changelog
-    page_creation
-    introduction/from_flat_php_to_symfony2
-    introduction/symfony1
-    web_services/index
 
 Quick Tour
 ----------
@@ -35,52 +30,44 @@ Getting Started
     :maxdepth: 1
 
     setup
-    http_fundamentals
+    page_creation
     routing
     controller
     templating
+    configuration
 
 Topics
 ------
 
 .. toctree::
     :maxdepth: 1
 
+    assetic
     bundles
     console
-    debug
     doctrine
+    debug
+    deployment
     email
     event_dispatcher
+    expressions
     forms
+    frontend
     http_cache
     logging
+    performance
+    profiler
+    request
     routing
     security
+    session
+    setup
     serializer
     service_container
     testing
     translation
     validation
 
-Advanced Topics
----------------
-
-.. toctree::
-    :maxdepth: 1
-
-    assetic
-    bundles
-    configuration
-    deployment
-    expressions
-    frontend
-    performance
-    profiler
-    request
-    session
-    setup
-
 Best Practices
 --------------
 
diff --git a/page_creation.rst b/page_creation.rst
@@ -80,7 +80,7 @@ to creating a page?
 
 #. *Create a controller*: The method below the route - ``numberAction()`` - is called
    the *controller*: this is a function where *you* build the page and ultimately
-   return a ``Response`` object. You'll learn more about :doc:`controllers </controllers>`
+   return a ``Response`` object. You'll learn more about :doc:`controllers </controller>`
    in their own section, including how to return JSON responses;
 
 The Web Debug Toolbar: Debugging Dream
diff --git a/routing.rst b/routing.rst
@@ -690,5 +690,3 @@ Learn more
     :glob:
 
     routing/*
-
-.. _`FOSJsRoutingBundle`: https://github.com/FriendsOfSymfony/FOSJsRoutingBundle
diff --git a/routing/generate_url_javascript.rst b/routing/generate_url_javascript.rst
@@ -31,3 +31,5 @@ the `FOSJsRoutingBundle`_. It makes the following possible:
     var url = Routing.generate('blog_show', {
         'slug': 'my-blog-post'
     });
+
+.. _`FOSJsRoutingBundle`: https://github.com/FriendsOfSymfony/FOSJsRoutingBundle
diff --git a/web_services/index.rst b/web_services/index.rst
