Merge branch '2.0' into 2.1

Author: weaverryan

components/console/index.rst

@@ -6,3 +6,4 @@ Console
 
     introduction
     usage
+    single_command_tool

components/console/introduction.rst

@@ -401,3 +401,9 @@ returns the returned code from the command (return value from command's
     something and display feedback to the user. So, instead of calling a
     command from the Web, refactor your code and move the logic to a new
     class.
+
+Learn More!
+-----------
+
+* :doc:`/components/console/usage`
+* :doc:`/components/console/single_command_tool`

components/console/single_command_tool.rst

@@ -0,0 +1,49 @@
+.. index::
+   single: Console; Single command application
+
+How to build an Application that is a single Command
+====================================================
+
+When building a command line tool, you may not need to provide several commands.
+In such case, having to pass the command name each time is tedious. Fortunately,
+it is possible to remove this need by extending the application::
+
+    namespace Acme\Tool;
+
+    use Symfony\Component\Console\Application;
+    use Symfony\Component\Console\Input\InputInterface;
+
+    class MyApplication extends Application
+    {
+        /**
+         * Gets the name of the command based on input.
+         *
+         * @param InputInterface $input The input interface
+         *
+         * @return string The command name
+         */
+        protected function getCommandName(InputInterface $input)
+        {
+            // This should return the name of your command.
+            return 'my_command';
+        }
+
+        /**
+         * Gets the default commands that should always be available.
+         *
+         * @return array An array of default Command instances
+         */
+        protected function getDefaultCommands()
+        {
+            // Keep the core default commands to have the HelpCommand
+            // which is used when using the --help option
+            $defaultCommands = parent::getDefaultCommands()
+
+            $defaultCommands[] = new MyCommand();
+
+            return $defaultCommands;
+        }
+    }
+
+When calling your console script, the command `MyCommand` will then always
+be used, without having to pass its name.

components/console/usage.rst

@@ -1,8 +1,8 @@
 .. index::
     single: Console; Usage
 
-Console Usage
-=============
+Using Console Commands, Shortcuts and Built-in Commands
+=======================================================
 
 In addition to the options you specify for your commands, there are some
 built-in options as well as a couple of built-in commands for the console component.

components/dom_crawler.rst

@@ -192,17 +192,16 @@ instance with just the selected link(s). Calling ``link()`` gives us a special
 The :class:`Symfony\\Component\\DomCrawler\\Link` object has several useful
 methods to get more information about the selected link itself::
 
-    // return the raw href value
-    $href = $link->getRawUri();
-
     // return the proper URI that can be used to make another request
     $uri = $link->getUri();
 
-The ``getUri()`` is especially useful as it cleans the ``href`` value and
-transforms it into how it should really be processed. For example, for a
-link with ``href="#foo"``, this would return the full URI of the current
-page suffixed with ``#foo``. The return from ``getUri()`` is always a full
-URI that you can act on.
+.. note::
+
+    The ``getUri()`` is especially useful as it cleans the ``href`` value and
+    transforms it into how it should really be processed. For example, for a
+    link with ``href="#foo"``, this would return the full URI of the current
+    page suffixed with ``#foo``. The return from ``getUri()`` is always a full
+    URI that you can act on.
 
 Forms
 .....

components/map.rst.inc

@@ -13,6 +13,7 @@
 
   * :doc:`/components/console/introduction`
   * :doc:`/components/console/usage`
+  * :doc:`/components/console/single_command_tool`
 
 * **CSS Selector**
 

components/templating.rst

@@ -87,7 +87,7 @@ sub-template to set its parent template.
 To use template inheritance, the :class:`Symfony\\Component\\Templating\\Helper\\SlotsHelper`
 helper must be registered::
 
-    use Symfony\Templating\Helper\SlotsHelper;
+    use Symfony\Component\Templating\Helper\SlotsHelper;
 
     $view->set(new SlotsHelper());
 

cookbook/assetic/asset_management.rst

@@ -24,7 +24,7 @@ directly:
         <script src="<?php echo $view['assets']->getUrl('js/script.js') ?>" type="text/javascript" />
 
 But *with* Assetic, you can manipulate these assets however you want (or
-load them from anywhere) before serving them. These means you can:
+load them from anywhere) before serving them. This means you can:
 
 * Minify and combine all of your CSS and JS files