[symfony#1930] Backporting changes made by @pborreli

weaverryan · weaverryan · commit 600b5e7808d2 · 2012-11-23T09:42:59.000-05:00
diff --git a/components/dependency_injection/definitions.rst b/components/dependency_injection/definitions.rst
@@ -91,7 +91,7 @@ You can add a new argument to the end of the arguments array using::
 
     $definition->addArgument($argument);
 
-The argument can be a string, an array, a service parameter by using ``%paramater_name%``
+The argument can be a string, an array, a service parameter by using ``%parameter_name%``
 or a service id by using ::
 
     use Symfony\Component\DependencyInjection\Reference;
diff --git a/cookbook/doctrine/file_uploads.rst b/cookbook/doctrine/file_uploads.rst
@@ -216,7 +216,7 @@ object, which is what's returned after a ``file`` field is submitted::
         // move takes the target directory and then the target filename to move to
         $this->file->move($this->getUploadRootDir(), $this->file->getClientOriginalName());
 
-        // set the path property to the filename where you'ved saved the file
+        // set the path property to the filename where you've saved the file
         $this->path = $this->file->getClientOriginalName();
 
         // clean up the file property as you won't need it anymore
diff --git a/cookbook/logging/monolog_email.rst b/cookbook/logging/monolog_email.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Logging; Emailling errors
+   single: Logging; Emailing errors
 
 How to Configure Monolog to Email Errors
 ========================================
diff --git a/cookbook/service_container/scopes.rst b/cookbook/service_container/scopes.rst
@@ -35,7 +35,7 @@ when compiling the container. Read the sidebar below for more details.
 
     Imagine you've configured a `my_mailer` service. You haven't configured
     the scope of the service, so it defaults to `container`. In other words,
-    everytime you ask the container for the `my_mailer` service, you get
+    every time you ask the container for the `my_mailer` service, you get
     the same object back. This is usually how you want your services to work.
 
     Imagine, however, that you need the `request` service in your `my_mailer`
