Merge remote-tracking branch 'origin/2.0' into 2.0

weaverryan · weaverryan · commit 5f9b9e34f630 · 2012-07-14T18:57:55.000-05:00
diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst
@@ -25,7 +25,7 @@ then clone your fork:
 
     $ git clone git://github.com/YOURUSERNAME/symfony-docs.git
 
-Unless you're documenting a feature that's new to Symfony 2.1, you changes
+Unless you're documenting a feature that's new to Symfony 2.1, your changes
 should be based on the 2.0 branch instead of the master branch. To do this
 checkout the 2.0 branch before the next step:
 
diff --git a/cookbook/form/form_customization.rst b/cookbook/form/form_customization.rst
@@ -175,7 +175,7 @@ When rendering a form, you can choose which form theme(s) you want to apply.
 In Twig a theme is a single template file and the fragments are the blocks defined
 in this file.
 
-In PHP a theme is a folder and the the fragments are individual template files in
+In PHP a theme is a folder and the fragments are individual template files in
 this folder.
 
 .. _cookbook-form-customization-sidebar:
