Merge branch '2.0'

weaverryan · weaverryan · commit 2ae36f39f482 · 2012-01-22T13:10:41.000-06:00
diff --git a/components/dom_crawler.rst b/components/dom_crawler.rst
@@ -228,7 +228,7 @@ useful methods for working with forms:
 
 The :method:`Symfony\\Component\\DomCrawler\\Form::getUri` method does more
 than just return the ``action`` attribute of the form. If the form method
-is GET, then it mimics the browsers behavior and returns a the ``action``
+is GET, then it mimics the browser's behavior and returns the ``action``
 attribute followed by a query string of all of the form's values.
 
 You can virtually set and get values on the form::
diff --git a/components/finder.rst b/components/finder.rst
@@ -28,7 +28,12 @@ directories::
     $finder->files()->in(__DIR__);
 
     foreach ($finder as $file) {
+        // Print the absolute path
         print $file->getRealpath()."\n";
+        // Print the relative path to the file, omitting the filename
+        print $file->getRelativePath()."\n";
+        // Print the relative path to the file
+        print $file->getRelativePathname()."\n";
     }
 
 The ``$file`` is an instance of :class:`Symfony\\Component\\Finder\\SplFileInfo`
@@ -208,8 +213,9 @@ To restrict the matching file with your own strategy, use
     $finder->files()->filter($filter);
 
 The ``filter()`` method takes a Closure as an argument. For each matching file,
-it is called with the file as a :phpclass:`SplFileInfo` instance. The file is
-excluded from the result set if the Closure returns ``false``.
+it is called with the file as a :class:`Symfony\\Component\\Finder\\SplFileInfo`
+instance. The file is excluded from the result set if the Closure returns
+``false``.
 
 .. _strtotime:   http://www.php.net/manual/en/datetime.formats.php
 .. _Iterator:     http://www.php.net/manual/en/spl.iterators.php
diff --git a/components/routing.rst b/components/routing.rst
@@ -117,6 +117,14 @@ the POST method and a secure connection::
 
    $route = new Route('/foo', array('_method' => 'post', '_scheme' => 'https' ));
 
+.. tip::
+    
+    If you want to match all urls which start with a certain path and end in an
+    arbitrary suffix you can use the following route definition::
+        
+        $route = new Route('/start/{suffix}', array('suffix' => ''), array('suffix' => '.*'));
+    
+
 Using Prefixes
 ~~~~~~~~~~~~~~
 
@@ -292,4 +300,4 @@ automatically in the background if you want to use it. A basic example of the
 
     If you use caching, the Routing component will compile new classes which 
     are saved in the ``cache_dir``. This means your script must have write 
-    permissions for that location.
+    permissions for that location.
diff --git a/cookbook/security/voters.rst b/cookbook/security/voters.rst
@@ -88,7 +88,7 @@ and compare the IP address against a set of blacklisted IP addresses:
         function vote(TokenInterface $token, $object, array $attributes)
         {
             $request = $this->container->get('request');
-            if (in_array($this->request->getClientIp(), $this->blacklistedIp)) {
+            if (in_array($request->getClientIp(), $this->blacklistedIp)) {
                 return VoterInterface::ACCESS_DENIED;
             }
 
diff --git a/cookbook/web_services/php_soap_extension.rst b/cookbook/web_services/php_soap_extension.rst
@@ -12,15 +12,15 @@ create one from scratch or use a 3rd party generator.
 .. note::
 
     There are several SOAP server implementations available for use with 
-    PHP.  `Zend SOAP`_ and `NuSOAP`_ are two examples.  Although we use 
+    PHP. `Zend SOAP`_ and `NuSOAP`_ are two examples. Although we use 
     the PHP SOAP extension in our examples, the general idea should still 
     be applicable to other implementations.
 
 SOAP works by exposing the methods of a PHP object to an external entity
 (i.e. the person using the SOAP service). To start, create a class - ``HelloService`` -
 which represents the functionality that you'll expose in your SOAP service.
 In this case, the SOAP service will allow the client to call a method called
-``hello``, which happens to send an email address::
+``hello``, which happens to send an email::
 
     namespace Acme\SoapBundle;
 
@@ -46,7 +46,6 @@ In this case, the SOAP service will allow the client to call a method called
 
             return 'Hello, ' . $name;
         }
-
     }
 
 Next, you can train Symfony to be able to create an instance of this class.
@@ -112,7 +111,7 @@ into the content of the Response and clear the output buffer.  Finally, you're
 ready to return the ``Response``.
 
 Below is an example calling the service using `NuSOAP`_ client.  This example 
-assumes the ``indexAction`` in the controller above is accessible via the
+assumes that the ``indexAction`` in the controller above is accessible via the
 route ``/soap``::
 
     $client = new \soapclient('http://example.com/app.php/soap?wsdl', true);

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ and compare the IP address against a set of blacklisted IP addresses:`
`88`	`88`	`function vote(TokenInterface $token, $object, array $attributes)`
`89`	`89`	`{`
`90`	`90`	`$request = $this->container->get('request');`
`91`		`- if (in_array($this->request->getClientIp(), $this->blacklistedIp)) {`
	`91`	`+ if (in_array($request->getClientIp(), $this->blacklistedIp)) {`
`92`	`92`	`return VoterInterface::ACCESS_DENIED;`
`93`	`93`	`}`
`94`	`94`