symfony · weaverryan · Nov 26, 2012 · Nov 24, 2012 · Nov 24, 2012 · Nov 24, 2012
diff --git a/reference/constraints/Choice.rst b/reference/constraints/Choice.rst
@@ -279,7 +279,5 @@ strict
 **type**: ``Boolean`` **default**: ``false``
 
 If true, the validator will also check the type of the input value. Specifically,
-this value is passed to as the third argument to the PHP `in_array`_ method
-when checking to see if a value is in the valid choices array.
-
-.. _`in_array`: http://php.net/manual/en/function.in-array.php
+this value is passed to as the third argument to the PHP :phpfunction:`in_array` method
+when checking to see if a value is in the valid choices array.
diff --git a/reference/constraints/Max.rst b/reference/constraints/Max.rst
@@ -69,6 +69,4 @@ invalidMessage
 **type**: ``string`` **default**: ``This value should be a valid number``
 
 The message that will be shown if the underlying value is not a number (per
-the `is_numeric`_ PHP function).
-
-.. _`is_numeric`: http://www.php.net/manual/en/function.is-numeric.php
+the :phpfunction:`is_numeric` PHP function).
diff --git a/reference/constraints/MaxLength.rst b/reference/constraints/MaxLength.rst
@@ -76,8 +76,6 @@ charset
 
 **type**: ``charset`` **default**: ``UTF-8``
 
-If the PHP extension "mbstring" is installed, then the PHP function `mb_strlen`_
+If the PHP extension "mbstring" is installed, then the PHP function :phpfunction:`mb_strlen`
 will be used to calculate the length of the string. The value of the ``charset``
-option is passed as the second argument to that function.
-
-.. _`mb_strlen`: http://php.net/manual/en/function.mb-strlen.php
+option is passed as the second argument to that function.
diff --git a/reference/constraints/Min.rst b/reference/constraints/Min.rst
@@ -69,6 +69,4 @@ invalidMessage
 **type**: ``string`` **default**: ``This value should be a valid number``
 
 The message that will be shown if the underlying value is not a number (per
-the `is_numeric`_ PHP function).
-
-.. _`is_numeric`: http://www.php.net/manual/en/function.is-numeric.php
+the :phpfunction:`is_numeric` PHP function).
diff --git a/reference/constraints/MinLength.rst b/reference/constraints/MinLength.rst
@@ -80,8 +80,6 @@ charset
 
 **type**: ``charset`` **default**: ``UTF-8``
 
-If the PHP extension "mbstring" is installed, then the PHP function `mb_strlen`_
+If the PHP extension "mbstring" is installed, then the PHP function :phpfunction:`mb_strlen`
 will be used to calculate the length of the string. The value of the ``charset``
-option is passed as the second argument to that function.
-
-.. _`mb_strlen`: http://php.net/manual/en/function.mb-strlen.php
+option is passed as the second argument to that function.
diff --git a/reference/constraints/Regex.rst b/reference/constraints/Regex.rst
@@ -95,7 +95,7 @@ pattern
 
 This required option is the regular expression pattern that the input will
 be matched against. By default, this validator will fail if the input string
-does *not* match this regular expression (via the `preg_match`_ PHP function).
+does *not* match this regular expression (via the :phpfunction:`preg_match` PHP function).
 However, if `match`_ is set to false, then validation will fail if the input
 string *does* match this pattern.
 
@@ -114,6 +114,4 @@ message
 
 **type**: ``string`` **default**: ``This value is not valid``
 
-This is the message that will be shown if this validator fails.
-
-.. _`preg_match`: http://php.net/manual/en/function.preg-match.php
+This is the message that will be shown if this validator fails.
diff --git a/reference/forms/types/country.rst b/reference/forms/types/country.rst
@@ -12,7 +12,7 @@ The "value" for each country is the two-letter country code.
 
 .. note::
 
-   The locale of your user is guessed using `Locale::getDefault()`_
+   The locale of your user is guessed using :phpmethod:`Locale::getDefault()`
 
 Unlike the ``choice`` type, you don't need to specify a ``choices`` or
 ``choice_list`` option as the field type automatically uses all of the countries
@@ -57,6 +57,4 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
 
 .. include:: /reference/forms/types/options/label.rst.inc
 
-.. include:: /reference/forms/types/options/read_only.rst.inc
-
-.. _`Locale::getDefault()`: http://php.net/manual/en/locale.getdefault.php
+.. include:: /reference/forms/types/options/read_only.rst.inc
diff --git a/reference/forms/types/language.rst b/reference/forms/types/language.rst
@@ -13,7 +13,7 @@ The "value" for each language is the *Unicode language identifier*
 
 .. note::
 
-   The locale of your user is guessed using `Locale::getDefault()`_
+   The locale of your user is guessed using :phpmethod:`Locale::getDefault()`
 
 Unlike the ``choice`` type, you don't need to specify a ``choices`` or
 ``choice_list`` option as the field type automatically uses a large list
@@ -58,6 +58,4 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
 
 .. include:: /reference/forms/types/options/label.rst.inc
 
-.. include:: /reference/forms/types/options/read_only.rst.inc
-
-.. _`Locale::getDefault()`: http://php.net/manual/en/locale.getdefault.php
+.. include:: /reference/forms/types/options/read_only.rst.inc
diff --git a/reference/forms/types/locale.rst b/reference/forms/types/locale.rst
@@ -14,7 +14,7 @@ the ISO3166 *country* code (e.g. ``fr_FR`` for French/France).
 
 .. note::
 
-   The locale of your user is guessed using `Locale::getDefault()`_
+   The locale of your user is guessed using :phpmethod:`Locale::getDefault()`
 
 Unlike the ``choice`` type, you don't need to specify a ``choices`` or
 ``choice_list`` option as the field type automatically uses a large list
@@ -59,6 +59,4 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
 
 .. include:: /reference/forms/types/options/label.rst.inc
 
-.. include:: /reference/forms/types/options/read_only.rst.inc
-
-.. _`Locale::getDefault()`: http://php.net/manual/en/locale.getdefault.php
+.. include:: /reference/forms/types/options/read_only.rst.inc