Merge branch '2.0'

weaverryan · weaverryan · commit 08cc9e11f1fa · 2012-03-13T22:51:53.000-05:00
diff --git a/reference/forms/types/language.rst b/reference/forms/types/language.rst
@@ -8,8 +8,8 @@ The ``language`` type is a subset of the ``ChoiceType`` that allows the user
 to select from a large list of languages. As an added bonus, the language names
 are displayed in the language of the user.
 
-The "value" for each locale is either the two letter ISO639-1 *language* code
-(e.g. ``fr``).
+The "value" for each language is the *Unicode language identifier*
+(e.g. ``fr`` or ``zh-Hant``).
 
 .. note::
 
