githubfromgui
diff --git a/‎controller/soap_web_service.rst
Lines changed: 2 additions & 2 deletions b/‎controller/soap_web_service.rst
Lines changed: 2 additions & 2 deletions
diff --git a/‎controller/upload_file.rst
Lines changed: 11 additions & 2 deletions b/‎controller/upload_file.rst
Lines changed: 11 additions & 2 deletions
diff --git a/‎introduction/from_flat_php_to_symfony2.rst
Lines changed: 9 additions & 9 deletions b/‎introduction/from_flat_php_to_symfony2.rst
Lines changed: 9 additions & 9 deletions
@@ -40,8 +40,8 @@ In this case, the SOAP service will allow the client to call a method called
         {
 
             $message = new \Swift_Message('Hello Service')
-                                    ->setTo('me@example.com')
-                                    ->setBody($name . ' says hi!');
+                ->setTo('me@example.com')
+                ->setBody($name.' says hi!');
 
             $this->mailer->send($message);
 
 
@@ -132,8 +132,7 @@ Finally, you need to update the code of the controller that handles the form::
                 /** @var Symfony\Component\HttpFoundation\File\UploadedFile $file */
                 $file = $product->getBrochure();
 
-                // Generate a unique name for the file before saving it
-                $fileName = md5(uniqid()).'.'.$file->guessExtension();
+                $fileName = $this->generateUniqueFileName().'.'.$file->guessExtension();
 
                 // Move the file to the directory where brochures are stored
                 $file->move(
@@ -154,6 +153,16 @@ Finally, you need to update the code of the controller that handles the form::
                 'form' => $form->createView(),
             ));
         }
+        
+        /**
+         * @return string
+         */
+        private function generateUniqueFileName()
+        {
+            // md5() reduces the similarity of the file names generated by
+            // uniqid(), which is based on timestamps
+            return md5(uniqid());
+        }
     }
 
 Now, create the ``brochures_directory`` parameter that was used in the
 
@@ -581,7 +581,7 @@ nice way to group related pages. The controller functions are also sometimes cal
 The two controllers (or actions) are still lightweight. Each uses the
 :doc:`Doctrine ORM library </doctrine>` to retrieve objects from the
 database and the Templating component to render a template and return a
-``Response`` object. The list ``list.php`` template is now quite a bit simpler:
+``Response`` object. The ``list.php`` template is now quite a bit simpler:
 
 .. code-block:: html+php
 
@@ -624,7 +624,7 @@ The ``layout.php`` file is nearly identical:
 
 .. note::
 
-    The show ``show.php`` template is left as an exercise: updating it should be
+    The ``show.php`` template is left as an exercise: updating it should be
     really similar to updating the ``list.php`` template.
 
 When Symfony's engine (called the Kernel) boots up, it needs a map so
@@ -674,10 +674,10 @@ It's a beautiful thing.
 Better Templates
 ~~~~~~~~~~~~~~~~
 
-If you choose to use it, Symfony comes standard with a templating engine
+If you choose to use it, Symfony comes with a templating engine
 called `Twig`_ that makes templates faster to write and easier to read.
-It means that the sample application could contain even less code! Take,
-for example, rewriting ``list.html.php`` template in Twig would look like
+It means that the sample application could contain even less code! For
+example, rewriting the ``list.html.php`` template in Twig would look like
 this:
 
 .. code-block:: html+twig
@@ -700,7 +700,7 @@ this:
         </ul>
     {% endblock %}
 
-And rewriting ``layout.html.php`` template in Twig would look like this:
+And rewriting the ``layout.html.php`` template in Twig would look like this:
 
 .. code-block:: html+twig
 
@@ -722,9 +722,9 @@ be discussed. For more information, see the :doc:`templating article </templatin
 Where Symfony Delivers
 ----------------------
 
-In the rest of documentation articles, you'll learn more about how each piece of
-Symfony works and how you can organize your project. For now, celebrate at how
-migrating the blog from flat PHP to Symfony has improved life:
+In the rest of the documentation articles, you'll learn more about how each piece of
+Symfony works and how you can organize your project. For now, celebrate how
+migrating the blog from flat PHP to Symfony has improved your life:
 
 * Your application now has **clear and consistently organized code** (though
   Symfony doesn't force you into this). This promotes **reusability** and
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ In this case, the SOAP service will allow the client to call a method called`
`40`	`40`	`{`
`41`	`41`
`42`	`42`	`$message = new \Swift_Message('Hello Service')`
`43`		`- ->setTo('me@example.com')`
`44`		`- ->setBody($name . ' says hi!');`
	`43`	`+ ->setTo('me@example.com')`
	`44`	`+ ->setBody($name.' says hi!');`
`45`	`45`
`46`	`46`	`$this->mailer->send($message);`
`47`	`47`