[symfony#1899] Refactoring the workflow document about components into the components documentation

weaverryan · weaverryan · commit 527615c65a4d · 2012-11-22T17:48:55.000-05:00
diff --git a/components/index.rst b/components/index.rst
@@ -4,6 +4,7 @@ The Components
 .. toctree::
     :hidden:
 
+    using_components
     class_loader
     config/index
     console/index
diff --git a/components/map.rst.inc b/components/map.rst.inc
@@ -1,3 +1,5 @@
+* :doc:`/components/using_components`
+
 * **Class Loader**
 
   * :doc:`/components/class_loader`
diff --git a/components/using_components.rst b/components/using_components.rst
@@ -1,22 +1,22 @@
 .. index::
-   single: Workflow; Components
+   single: Components; Installation
+   single: Components; Usage
 
-How to start a new project using the Symfony2 Components
-========================================================
+How to Install and Use the Symfony2 Components
+==============================================
 
-If you're starting a new project that uses one or more Symfony2 components
-(or adding the components to an existing project), the easiest way to integrate
-everything is with Composer. Composer is smart enough to download the component(s)
-that you need and take care of autoloading so that you can begin using the
-libraries immediately.
+If you're starting a new project (or already have a project) that will use
+one or more components, the easiest way to integrate everything is with Composer.
+Composer is smart enough to download the component(s) that you need and take
+care of autoloading so that you can begin using the libraries immediately.
 
 This article will take you through using the :doc:`/components/finder`, though
 this applies to using any component.
 
-Using Finder Component
-----------------------
+Using the Finder Component
+--------------------------
 
-**1.** Create a new empty directory for your project.
+**1.** If you're creating a new project, create a new empty directory for it.
 
 **2.** Create a new file called ``composer.json`` and paste the following into it:
 
@@ -31,15 +31,15 @@ Using Finder Component
 If you already have a ``composer.json`` file, just add this line to it. You
 may also need to adjust the version (e.g. ``2.1.1`` or ``2.2.*``).
 
-You can research the component names and versions at _packagist.org.
+You can research the component names and versions at `packagist.org`_.
 
 **3.** Download the vendor libraries and generate the ``vendor/autoload.php`` file:
 
 .. code-block:: bash
 
     $ php composer.phar install
 
-4. Write your code:
+**4.** Write your code:
 
 Once Composer has downloaded the component(s), all you need to do is include
 the ``vendor/autoload.php`` file that was generated by Composer. This file
@@ -69,7 +69,6 @@ immediately::
                     "symfony/finder": "2.1.*",
                     "symfony/dom-crawler": "2.1.*",
                     "symfony/css-selector": "2.1.*"
-                    ...
                 }
             }
 
@@ -86,4 +85,12 @@ immediately::
     This will include the Bundle and Bridge libraries, which you may not
     actually need.
 
+Now What?
+---------
+
+Now that the component is installed and autoloaded, read the specific component's
+documentation to find out more about how to use it.
+
+And have fun!
+
 .. _packagist.org: https://packagist.org/
diff --git a/cookbook/map.rst.inc b/cookbook/map.rst.inc
@@ -145,6 +145,5 @@
 
   * :doc:`/cookbook/workflow/new_project_git`
   * :doc:`/cookbook/workflow/new_project_svn`
-  * :doc:`/cookbook/workflow/new_project_components`
 
 * :doc:`/cookbook/deployment-tools`
diff --git a/cookbook/workflow/index.rst b/cookbook/workflow/index.rst
@@ -6,4 +6,3 @@ Workflow
 
     new_project_git
     new_project_svn
-    new_project_components

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	+* :doc:`/components/using_components`
	`2`	`+`
`1`	`3`	`* Class Loader`
`2`	`4`
`3`	`5`	* :doc:`/components/class_loader`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,3 @@ Workflow`
`6`	`6`
`7`	`7`	`new_project_git`
`8`	`8`	`new_project_svn`
`9`		`- new_project_components`