Merge branch '2.1' into 2.2

weaverryan · weaverryan · commit cdbba467a9cd · 2013-09-24T22:00:54.000-05:00
Conflicts:
	reference/constraints/UniqueEntity.rst
diff --git a/book/translation.rst b/book/translation.rst
@@ -476,8 +476,7 @@ Symfony2 will discover these files and use them when translating either
                 'user.login' => 'Login',
             );
 
-.. index::
-   single: Translations; Message domains
+.. _translation-domains:
 
 
 .. _using-message-domains:
