Merge pull request symfony#1978 from WouterJ/add_phpmethod_links

weaverryan · weaverryan · commit 2b17e1b1d0ed · 2012-12-24T09:11:18.000-08:00
[Waiting code merge] Tweaked links to become phpmethod roles
diff --git a/contributing/documentation/format.rst b/contributing/documentation/format.rst
@@ -157,7 +157,7 @@ and to the PHP documentation:
 
     :phpclass:`SimpleXMLElement`
 
-    `DateTime::createFromFormat`_
+    :phpmethod:`DateTime::createFromFormat`
 
     :phpfunction:`iterator_to_array`
 
@@ -215,4 +215,3 @@ Installing the Sphinx extensions
 .. _Pygments website:        http://pygments.org/languages/
 .. _source:                  https://github.com/fabpot/sphinx-php
 .. _Sphinx quick setup:      http://sphinx-doc.org/tutorial.html#setting-up-the-documentation-sources
-.. _`DateTime::createFromFormat`: http://php.net/manual/en/datetime.createfromformat.php
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
@@ -58,5 +58,3 @@ 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
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
@@ -59,5 +59,3 @@ 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
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
@@ -60,5 +60,3 @@ 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
