merged branch hakre/patch-2 (PR #593)

This PR was merged into the master branch.

Commits
-------

5e0a609d Minor WS fixes in documentation

Discussion
----------

Minor WS fixes in documentation

Spaces at the end of line.

doc/providers/service_controller.rst

@@ -4,7 +4,7 @@ ServiceControllerServiceProvider
 As your Silex application grows, you may wish to begin organizing your
 controllers in a more formal fashion. Silex can use controller classes out of
 the box, but with a bit of work, your controllers can be created as services,
-giving you the full power of dependency injection and lazy loading. 
+giving you the full power of dependency injection and lazy loading.
 
 .. ::todo Link above to controller classes cookbook
 
@@ -25,7 +25,7 @@ Why would I want to do this?
   framework you are using. Carefully crafted, your controllers will become
   reusable with multiple frameworks. By keeping careful control of your
   dependencies, your controllers could easily become compatible with Silex,
-  Symfony (full stack) and Drupal, to name just a few. 
+  Symfony (full stack) and Drupal, to name just a few.
 
 Parameters
 ----------
@@ -67,7 +67,7 @@ In this slightly contrived example of a blog API, we're going to change the
     });
 
 Rewriting your controller as a service is pretty simple, create a Plain Ol' PHP
-Object with your ``PostRepository`` as a dependency, along with an 
+Object with your ``PostRepository`` as a dependency, along with an
 ``indexJsonAction`` method to handle the request. Although not shown in the
 example below, you can use type hinting and parameter naming to get the
 parameters you need, just like with standard Silex routes.

doc/usage.rst

@@ -100,7 +100,7 @@ A route pattern consists of:
   pattern can include variable parts and you are able to set RegExp
   requirements for them.
 
-* *Method*: One of the following HTTP methods: ``GET``, ``POST``, ``PUT`` or 
+* *Method*: One of the following HTTP methods: ``GET``, ``POST``, ``PUT`` or
   ``DELETE``. This describes the interaction with the resource. Commonly only
   ``GET`` and ``POST`` are used, but it is possible to use the others as well.