minor #3693 Tweak to Absolute URL generation (weaverryan)

weaverryan · weaverryan · commit 41b2eb88c10a · 2014-03-19T07:25:12.000-05:00
This PR was merged into the 2.3 branch. Discussion ---------- Tweak to Absolute URL generation | Q | A | |----------------|------| | Doc fix | yes | | New docs | no | | Applies to | 2.3 | | Fixed tickets | #3573 | This updates how we describe URL generation. After #3573, it occurs to me that if you're looking here for a reference, you'll look for the first spot where absolute URLs are discussed and try to use it. So why not put the controller/PHP version and template version of doing this in the same spot. Cheers! Commits ------- 007a54f Fixing typo thanks to @xabbuh 873706c Moved the section about generating absolute URLs down
diff --git a/book/routing.rst b/book/routing.rst
@@ -1192,29 +1192,6 @@ In an upcoming section, you'll learn how to generate URLs from inside templates.
 
     For more information, see the documentation for that bundle.
 
-.. index::
-   single: Routing; Absolute URLs
-
-Generating Absolute URLs
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-By default, the router will generate relative URLs (e.g. ``/blog``). To generate
-an absolute URL, simply pass ``true`` to the third argument of the ``generate()``
-method::
-
-    $this->get('router')->generate('blog_show', array('slug' => 'my-blog-post'), true);
-    // http://www.example.com/blog/my-blog-post
-
-.. note::
-
-    The host that's used when generating an absolute URL is the host of
-    the current ``Request`` object. This is detected automatically based
-    on server information supplied by PHP. When generating absolute URLs for
-    scripts run from the command line, you'll need to manually set the desired
-    host on the ``RequestContext`` object::
-
-        $this->get('router')->getContext()->setHost('www.example.com');
-
 .. index::
    single: Routing; Generating URLs in a template
 
@@ -1227,7 +1204,7 @@ But if you pass extra ones, they will be added to the URI as a query string::
     $this->get('router')->generate('blog', array('page' => 2, 'category' => 'Symfony'));
     // /blog/2?category=Symfony
 
-Generating URLs from a template
+Generating URLs from a Template
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The most common place to generate a URL is from within a template when linking
@@ -1250,7 +1227,20 @@ a template helper function:
             Read this blog post.
         </a>
 
-Absolute URLs can also be generated.
+.. index::
+   single: Routing; Absolute URLs
+
+Generating Absolute URLs
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+By default, the router will generate relative URLs (e.g. ``/blog``). From
+a controller, simply pass ``true`` to the third argument of the ``generateUrl()``
+method::
+
+    $this->generateUrl('blog_show', array('slug' => 'my-blog-post'), true);
+    // http://www.example.com/blog/my-blog-post
+
+From a template, it looks like this:
 
 .. configuration-block::
 
@@ -1268,6 +1258,14 @@ Absolute URLs can also be generated.
             Read this blog post.
         </a>
 
+.. note::
+
+    The host that's used when generating an absolute URL is the host of
+    the current ``Request`` object. This is detected automatically. But if
+    you generate absolute URLs for scripts run from the command line, this
+    won't work. But don't worry! Just see :doc:`/cookbook/console/sending_emails`
+    for details.
+
 Summary
 -------
 
