Merge branch '2.1' into 2.2

weaverryan · weaverryan · commit d61c3c3b16ce · 2013-04-11T16:27:33.000-05:00
diff --git a/components/dependency_injection/parentservices.rst b/components/dependency_injection/parentservices.rst
@@ -312,26 +312,15 @@ to the ``NewsletterManager`` class, the config would look like this:
             mail_manager:
                 abstract:  true
                 calls:
-<<<<<<< HEAD
-                    - [ setMailer, [ @my_mailer ] ]
-                    - [ setEmailFormatter, [ @my_email_formatter] ]
-
-=======
                     - [setMailer, ["@my_mailer"]]
                     - [setEmailFormatter, ["@my_email_formatter"]]
-            
->>>>>>> e1ae126cb094754b7f4e72bbdb4388fed7f2d188
+
             newsletter_manager:
                 class:     "%newsletter_manager.class%"
                 parent: mail_manager
                 calls:
-<<<<<<< HEAD
-                    - [ setMailer, [ @my_alternative_mailer ] ]
-
-=======
                     - [setMailer, ["@my_alternative_mailer"]]
-            
->>>>>>> e1ae126cb094754b7f4e72bbdb4388fed7f2d188
+
             greeting_card_manager:
                 class:     "%greeting_card_manager.class%"
                 parent: mail_manager
@@ -450,24 +439,14 @@ If you had the following config:
             mail_manager:
                 abstract:  true
                 calls:
-<<<<<<< HEAD
-                    - [ setFilter, [ @my_filter ] ]
-
-=======
                     - [setFilter, ["@my_filter"]]
-                    
->>>>>>> e1ae126cb094754b7f4e72bbdb4388fed7f2d188
+
             newsletter_manager:
                 class:     "%newsletter_manager.class%"
                 parent: mail_manager
                 calls:
-<<<<<<< HEAD
-                    - [ setFilter, [ @another_filter ] ]
-
-=======
                     - [setFilter, ["@another_filter"]]
-            
->>>>>>> e1ae126cb094754b7f4e72bbdb4388fed7f2d188
+
     .. code-block:: xml
 
         <parameters>
diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst
@@ -200,7 +200,7 @@ a Request::
 The :method:`Symfony\\Component\\HttpFoundation\\Request::create` method
 creates a request based on a path info, a method and some parameters (the
 query parameters or the request ones depending on the HTTP method); and of
-course, you an also override all other variables as well (by default, Symfony
+course, you can also override all other variables as well (by default, Symfony
 creates sensible defaults for all the PHP global variables).
 
 Based on such a request, you can override the PHP global variables via
diff --git a/components/process.rst b/components/process.rst
@@ -26,7 +26,7 @@ a command in a sub-process::
     $process = new Process('ls -lsa');
     $process->run();
 
-    // executes after the the command finishes
+    // executes after the command finishes
     if (!$process->isSuccessful()) {
         throw new \RuntimeException($process->getErrorOutput());
     }
@@ -86,7 +86,7 @@ are done doing other stuff::
     $process = new Process('ls -lsa');
     $process->start();
     
-    // do other things
+    // ... do other things
     
     $process->wait(function ($type, $buffer) {
         if ('err' === $type) {
diff --git a/contributing/code/security.rst b/contributing/code/security.rst
@@ -75,5 +75,5 @@ releases, starting from Symfony 1.0.0:
 * June 25, 2007: `symfony 1.0.5 released (security fix) <http://symfony.com/blog/symfony-1-0-5-released-security-fix>`_
 
 .. _Git repository:      https://github.com/symfony/symfony
-.. _blog:                https://symfony.com/blog/
+.. _blog:                http://symfony.com/blog/
 .. _Security Advisories: http://symfony.com/blog/category/security-advisories
diff --git a/contributing/code/standards.rst b/contributing/code/standards.rst
@@ -72,6 +72,8 @@ example containing most features described below:
                 } else {
                     $dummy = ucwords($dummy);
                 }
+            } else {
+                throw new \RuntimeException(sprintf('Unrecognized dummy option "%s"', $dummy));
             }
 
             return $dummy;
@@ -100,10 +102,12 @@ Structure
 
 * Declare class properties before methods;
 
-* Declare public methods first, then protected ones and finally private ones.
+* Declare public methods first, then protected ones and finally private ones;
 
 * Use parentheses when instantiating classes regardless of the number of
-  arguments the constructor has.
+  arguments the constructor has;
+
+* Exception message strings should be concatenated using :phpfunction:`sprintf`.
 
 Naming Conventions
 ------------------
