Merge branch '3.4' into 4.3

* 3.4:
  Fixed many spelling issues

Author: wouterj

bundles/best_practices.rst

@@ -26,7 +26,7 @@ A namespace becomes a bundle as soon as you add a bundle class to it. The
 bundle class name must follow these rules:
 
 * Use only alphanumeric characters and underscores;
-* Use a StudlyCaps name (i.e. camelCase with the first letter uppercased);
+* Use a StudlyCaps name (i.e. camelCase with an uppercase first letter);
 * Use a descriptive and short name (no more than two words);
 * Prefix the name with the concatenation of the vendor (and optionally the
   category namespaces);

components/asset.rst

@@ -119,8 +119,9 @@ suffix to any asset path::
     echo $package->getUrl('image.png');
     // result: image.png?v1
 
-In case you want to modify the version format, pass a sprintf-compatible format
-string as the second argument of the ``StaticVersionStrategy`` constructor::
+In case you want to modify the version format, pass a ``sprintf``-compatible
+format string as the second argument of the ``StaticVersionStrategy``
+constructor::
 
     // puts the 'version' word before the version value
     $package = new Package(new StaticVersionStrategy('v1', '%s?version=%s'));

components/config.rst

@@ -6,7 +6,7 @@ The Config Component
 ====================
 
     The Config component provides several classes to help you find, load,
-    combine, autofill and validate configuration values of any kind, whatever
+    combine, fill and validate configuration values of any kind, whatever
     their source may be (YAML, XML, INI files, or for instance a database).
 
 Installation

components/console/helpers/processhelper.rst

@@ -9,7 +9,7 @@ useful information about process status.
 
 To display process details, use the :class:`Symfony\\Component\\Console\\Helper\\ProcessHelper`
 and run your command with verbosity. For example, running the following code with
-a very verbose verbosity (e.g. -vv)::
+a very verbose verbosity (e.g. ``-vv``)::
 
     use Symfony\Component\Process\Process;
 

components/console/helpers/progressbar.rst

@@ -272,7 +272,7 @@ the example above.
 Bar Settings
 ~~~~~~~~~~~~
 
-Amongst the placeholders, ``bar`` is a bit special as all the characters used
+Among the placeholders, ``bar`` is a bit special as all the characters used
 to display it can be customized::
 
     // the finished part of the bar

components/console/helpers/questionhelper.rst

@@ -242,7 +242,7 @@ convenient for passwords::
 .. caution::
 
     When you ask for a hidden response, Symfony will use either a binary, change
-    stty mode or use another trick to hide the response. If none is available,
+    ``stty`` mode or use another trick to hide the response. If none is available,
     it will fallback and allow the response to be visible unless you set this
     behavior to ``false`` using
     :method:`Symfony\\Component\\Console\\Question\\Question::setHiddenFallback`

components/console/usage.rst

@@ -10,7 +10,7 @@ built-in options as well as a couple of built-in commands for the Console compon
 .. note::
 
     These examples assume you have added a file ``application.php`` to run at
-    the cli::
+    the CLI::
 
         #!/usr/bin/env php
         <?php

components/debug.rst

@@ -58,7 +58,7 @@ Enabling the Exception Handler
 
 The :class:`Symfony\\Component\\Debug\\ExceptionHandler` class catches
 uncaught PHP exceptions and converts them to a nice PHP response. It is useful
-in debug mode to replace the default PHP/XDebug output with something prettier
+in debug mode to replace the default PHP/Xdebug output with something prettier
 and more useful::
 
     use Symfony\Component\Debug\ExceptionHandler;

components/dependency_injection/compilation.rst

@@ -78,7 +78,7 @@ A very simple extension may just load configuration files into the container::
 
 This does not gain very much compared to loading the file directly into
 the overall container being built. It just allows the files to be split
-up amongst the modules/bundles. Being able to affect the configuration
+up among the modules/bundles. Being able to affect the configuration
 of a module from configuration files outside of the module/bundle is needed
 to make a complex application configurable. This can be done by specifying
 sections of config files loaded directly into the container as being for

components/dom_crawler.rst

@@ -157,7 +157,7 @@ and :method:`Symfony\\Component\\DomCrawler\\Crawler::filter`::
     method.
 
     The default namespace is removed when loading the content if it's the only
-    namespace in the document. It's done to simplify the xpath queries.
+    namespace in the document. It's done to simplify the XPath queries.
 
 Namespaces can be explicitly registered with the
 :method:`Symfony\\Component\\DomCrawler\\Crawler::registerNamespace` method::
@@ -203,7 +203,7 @@ Get all the direct child nodes matching a CSS selector::
 Accessing Node Values
 ~~~~~~~~~~~~~~~~~~~~~
 
-Access the node name (HTML tag name) of the first node of the current selection (eg. "p" or "div")::
+Access the node name (HTML tag name) of the first node of the current selection (e.g. "p" or "div")::
 
     // returns the node name (HTML tag name) of the first child element under <body>
     $tag = $crawler->filterXPath('//body/*')->nodeName();

components/expression_language.rst

@@ -102,9 +102,9 @@ PHP type (including objects)::
         [
             'fruit' => $apple,
         ]
-    ));
+    )); // displays "Honeycrisp"
 
-This will print "Honeycrisp". For more information, see the :doc:`/components/expression_language/syntax`
+For more information, see the :doc:`/components/expression_language/syntax`
 entry, especially :ref:`component-expression-objects` and :ref:`component-expression-arrays`.
 
 Caching

components/filesystem.rst

@@ -44,8 +44,8 @@ endpoint for filesystem operations::
     string, an array or any object implementing :phpclass:`Traversable` as
     the target argument.
 
-mkdir
-~~~~~
+``mkdir``
+~~~~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::mkdir` creates a directory recursively.
 On POSIX filesystems, directories are created with a default mode value
@@ -65,12 +65,12 @@ On POSIX filesystems, directories are created with a default mode value
 .. note::
 
     The directory permissions are affected by the current `umask`_.
-    Set the umask for your webserver, use PHP's :phpfunction:`umask`
+    Set the ``umask`` for your webserver, use PHP's :phpfunction:`umask`
     function or use the :phpfunction:`chmod` function after the
     directory has been created.
 
-exists
-~~~~~~
+``exists``
+~~~~~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::exists` checks for the
 presence of one or more files or directories and returns ``false`` if any of
@@ -88,8 +88,8 @@ them is missing::
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-copy
-~~~~
+``copy``
+~~~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::copy` makes a copy of a
 single file (use :method:`Symfony\\Component\\Filesystem\\Filesystem::mirror` to
@@ -103,8 +103,8 @@ by the third boolean argument::
     // image.jpg will be overridden
     $filesystem->copy('image-ICC.jpg', 'image.jpg', true);
 
-touch
-~~~~~
+``touch``
+~~~~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::touch` sets access and
 modification time for a file. The current time is used by default. You can set
@@ -122,8 +122,8 @@ your own with the second argument. The third argument is the access time::
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-chown
-~~~~~
+``chown``
+~~~~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::chown` changes the owner of
 a file. The third argument is a boolean recursive option::
@@ -138,8 +138,8 @@ a file. The third argument is a boolean recursive option::
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-chgrp
-~~~~~
+``chgrp``
+~~~~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::chgrp` changes the group of
 a file. The third argument is a boolean recursive option::
@@ -154,8 +154,8 @@ a file. The third argument is a boolean recursive option::
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-chmod
-~~~~~
+``chmod``
+~~~~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::chmod` changes the mode or
 permissions of a file. The fourth argument is a boolean recursive option::
@@ -170,8 +170,8 @@ permissions of a file. The fourth argument is a boolean recursive option::
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-remove
-~~~~~~
+``remove``
+~~~~~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::remove` deletes files,
 directories and symlinks::
@@ -183,8 +183,8 @@ directories and symlinks::
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-rename
-~~~~~~
+``rename``
+~~~~~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::rename` changes the name
 of a single file or directory::
@@ -194,8 +194,8 @@ of a single file or directory::
     // renames a directory
     $filesystem->rename('/tmp/files', '/path/to/store/files');
 
-symlink
-~~~~~~~
+``symlink``
+~~~~~~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::symlink` creates a
 symbolic link from the target to the destination. If the filesystem does not
@@ -207,8 +207,8 @@ support symbolic links, a third boolean argument is available::
     // does not support symbolic links
     $filesystem->symlink('/path/to/source', '/path/to/destination', true);
 
-readlink
-~~~~~~~~
+``readlink``
+~~~~~~~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::readlink` read links targets.
 
@@ -238,8 +238,8 @@ Its behavior is the following::
     * if ``$path`` does not exist, it returns null.
     * if ``$path`` exists, it returns its absolute fully resolved final version.
 
-makePathRelative
-~~~~~~~~~~~~~~~~
+``makePathRelative``
+~~~~~~~~~~~~~~~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::makePathRelative` takes two
 absolute paths and returns the relative path from the second path to the first one::
@@ -252,8 +252,8 @@ absolute paths and returns the relative path from the second path to the first o
     // returns 'videos/'
     $filesystem->makePathRelative('/tmp/videos', '/tmp')
 
-mirror
-~~~~~~
+``mirror``
+~~~~~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::mirror` copies all the
 contents of the source directory into the target one (use the
@@ -262,8 +262,8 @@ files)::
 
     $filesystem->mirror('/path/to/source', '/path/to/target');
 
-isAbsolutePath
-~~~~~~~~~~~~~~
+``isAbsolutePath``
+~~~~~~~~~~~~~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::isAbsolutePath` returns
 ``true`` if the given path is absolute, ``false`` otherwise::
@@ -277,16 +277,18 @@ isAbsolutePath
     // returns false
     $filesystem->isAbsolutePath('../dir');
 
-tempnam
-~~~~~~~
+``tempnam``
+~~~~~~~~~~~
 
-:method:`Symfony\\Component\\Filesystem\\Filesystem::tempnam` creates a temporary file with a unique filename, and returns its path, or throw an exception on failure::
+:method:`Symfony\\Component\\Filesystem\\Filesystem::tempnam` creates a
+temporary file with a unique filename, and returns its path, or throw an
+exception on failure::
 
     // returns a path like : /tmp/prefix_wyjgtF
     $filesystem->tempnam('/tmp', 'prefix_');
 
-dumpFile
-~~~~~~~~
+``dumpFile``
+~~~~~~~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::dumpFile` saves the given
 contents into a file. It does this in an atomic manner: it writes a temporary
@@ -298,8 +300,8 @@ complete new file (but never a partially-written file)::
 
 The ``file.txt`` file contains ``Hello World`` now.
 
-appendToFile
-~~~~~~~~~~~~
+``appendToFile``
+~~~~~~~~~~~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::appendToFile` adds new
 contents at the end of some file::

components/process.rst

@@ -51,7 +51,7 @@ the contents of the output and
 the contents of the error output.
 
 You can also use the :class:`Symfony\\Component\\Process\\Process` class with the
-foreach construct to get the output while it is generated. By default, the loop waits
+for each construct to get the output while it is generated. By default, the loop waits
 for new output before going to the next iteration::
 
     $process = new Process(['ls', '-lsa']);
@@ -152,7 +152,7 @@ env vars you want to remove::
 Getting real-time Process Output
 --------------------------------
 
-When executing a long running command (like rsync-ing files to a remote
+When executing a long running command (like ``rsync`` to a remote
 server), you can give feedback to the end user in real-time by passing an
 anonymous function to the
 :method:`Symfony\\Component\\Process\\Process::run` method::
@@ -269,7 +269,7 @@ Streaming to the Standard Input of a Process
 Before a process is started, you can specify its standard input using either the
 :method:`Symfony\\Component\\Process\\Process::setInput` method or the 4th argument
 of the constructor. The provided input can be a string, a stream resource or a
-Traversable object::
+``Traversable`` object::
 
     $process = new Process(['cat']);
     $process->setInput('foobar');
@@ -299,7 +299,7 @@ provides the :class:`Symfony\\Component\\Process\\InputStream` class::
     echo $process->getOutput();
 
 The :method:`Symfony\\Component\\Process\\InputStream::write` method accepts scalars,
-stream resources or Traversable objects as argument. As shown in the above example,
+stream resources or ``Traversable`` objects as argument. As shown in the above example,
 you need to explicitly call the :method:`Symfony\\Component\\Process\\InputStream::close`
 method when you are done writing to the standard input of the subprocess.
 

components/property_access.rst

@@ -112,9 +112,9 @@ Using Getters
 ~~~~~~~~~~~~~
 
 The ``getValue()`` method also supports reading using getters. The method will
-be created using common naming conventions for getters. It camelizes the
-property name (``first_name`` becomes ``FirstName``) and prefixes it with
-``get``. So the actual method becomes ``getFirstName()``::
+be created using common naming conventions for getters. It transform the
+property name to camelCase (``first_name`` becomes ``FirstName``) and prefixes
+it with ``get``. So the actual method becomes ``getFirstName()``::
 
     // ...
     class Person