diff --git a/components/dependency_injection/definitions.rst b/components/dependency_injection/definitions.rst index 6d5342a1b4d..af551df6a34 100644 --- 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/components/filesystem.rst b/components/filesystem.rst index 21d93946448..c3d113b8e7b 100644 --- a/components/filesystem.rst +++ b/components/filesystem.rst @@ -33,7 +33,7 @@ endpoint for filesystem operations:: try { $fs->mkdir('/tmp/random/dir/' . mt_rand()); } catch (IOException $e) { - echo "An error occured while creating your directory"; + echo "An error occurred while creating your directory"; } .. note:: diff --git a/components/http_foundation/sessions.rst b/components/http_foundation/sessions.rst index 4d7ded9bbbb..0c905674170 100644 --- a/components/http_foundation/sessions.rst +++ b/components/http_foundation/sessions.rst @@ -37,7 +37,7 @@ Quick example:: .. note:: - Symfony sessions are designed to replace several native PHP funtions. + Symfony sessions are designed to replace several native PHP functions. Applications should avoid using ``session_start()``, ``session_regenerate_id()``, ``session_id()``, ``session_name()``, and ``session_destroy()`` and instead use the APIs in the following section. diff --git a/cookbook/doctrine/file_uploads.rst b/cookbook/doctrine/file_uploads.rst index 421e64bdc08..4124d2153a1 100644 --- 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 index e5fb5680513..330d4a3de60 100644 --- 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 index 7da0e98254f..2eea3583f04 100644 --- 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` diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst index 7929b2ce176..42c3b7b28d3 100644 --- a/reference/configuration/doctrine.rst +++ b/reference/configuration/doctrine.rst @@ -40,7 +40,7 @@ Configuration Reference # True to use as persistent connection for the ibm_db2 driver persistent: ~ - # The protocol to use for the ibm_db2 driver (default to TCPIP if ommited) + # The protocol to use for the ibm_db2 driver (default to TCPIP if omitted) protocol: ~ # True to use dbname as service name instead of SID for Oracle @@ -85,7 +85,7 @@ Configuration Reference # True to use as persistent connection for the ibm_db2 driver persistent: ~ - # The protocol to use for the ibm_db2 driver (default to TCPIP if ommited) + # The protocol to use for the ibm_db2 driver (default to TCPIP if omitted) protocol: ~ # True to use dbname as service name instead of SID for Oracle