소스 검색

Merge pull request #1965 from kix/doc-fixes

Fixed hyperlinks in the doc
Thomas 11 년 전
부모
커밋
4f721ac8e0

+ 1 - 1
Resources/doc/cookbook/recipe_sortable_listing.rst

@@ -6,7 +6,7 @@ This is a full working example of how to implement a sortable feature in your So
 Background
 ----------
 
-A sortable behavior is already available for one-to-many relationships (http://sonata-project.org/bundles/doctrine-orm-admin/master/doc/reference/form_field_definition.html#advanced-usage-one-to-many). 
+A sortable behavior is already available for one-to-many relationships (`http://sonata-project.org/bundles/doctrine-orm-admin/master/doc/reference/form_field_definition.html#advanced-usage-one-to-many <http://sonata-project.org/bundles/doctrine-orm-admin/master/doc/reference/form_field_definition.html#advanced-usage-one-to-many>`_). 
 However there is no packaged solution to have some up and down arrows to sort your records such as showed in the following screen
 
 .. figure:: ../images/admin_sortable_listing.png

+ 3 - 1
Resources/doc/reference/batch_actions.rst

@@ -82,7 +82,7 @@ And add this:
         return 'SonataAdminBundle';
     }
 
-See the [Symfony bundle overriding mechanism](http://symfony.com/doc/current/cookbook/bundles/inheritance.html) 
+See the `Symfony bundle overriding mechanism`_
 for further explanation of overriding bundle templates.
 
 
@@ -196,3 +196,5 @@ granularity), the passed query is ``null``.
           $this->admin->generateUrl('list',$this->admin->getFilterParameters())
         );
     }
+
+.. _Symfony bundle overriding mechanism: http://symfony.com/doc/current/cookbook/bundles/inheritance.html

+ 2 - 2
Resources/doc/reference/field_types.rst

@@ -28,10 +28,10 @@ This is currently limited to scalar types (text, integer, url...).
     will be changed to use localized information.
 
     Option for currency type must be an official ISO code, example : EUR for "euros".
-    List of iso code : http://en.wikipedia.org/wiki/List_of_circulating_currencies
+    List of ISO codes : `http://en.wikipedia.org/wiki/List_of_circulating_currencies <http://en.wikipedia.org/wiki/List_of_circulating_currencies>`_
 
     In ``date`` and ``datetime`` field types, ``format`` pattern must match twig's
-    ``date`` filter specification, available at: http://twig.sensiolabs.org/doc/filters/date.html
+    ``date`` filter specification, available at: `http://twig.sensiolabs.org/doc/filters/date.html <http://twig.sensiolabs.org/doc/filters/date.html>`_
     
 More types might be provided based on the persistency layer defined. Please refer to their
 related documentations.

+ 2 - 1
Resources/doc/reference/saving_hooks.rst

@@ -31,7 +31,8 @@ Example used with the FOS/UserBundle
 
 The ``FOSUserBundle`` provides authentication features for your Symfony2 Project,
 and is compatible with Doctrine ORM, Doctrine ODM and Propel. See
-https://github.com/FriendsOfSymfony/FOSUserBundle/ for more information.
+`FOSUserBundle on GitHub 
+<https://github.com/FriendsOfSymfony/FOSUserBundle/>`_ for more information.
 
 The user management system requires to perform specific call when the user
 password or username are updated. This is how the Admin bundle can be used to

+ 6 - 5
Resources/doc/reference/security.rst

@@ -224,9 +224,9 @@ ACL and FriendsOfSymfony/UserBundle
 
 If you want an easy way to handle users, please use:
 
-- https://github.com/FriendsOfSymfony/FOSUserBundle: handle users and groups
+- `FOSUserBundle <https://github.com/FriendsOfSymfony/FOSUserBundle>`_: handle users and groups
   stored in RDMS or MongoDB
-- https://github.com/sonata-project/SonataUserBundle: integrates the
+- `SonataUserBundle <https://github.com/sonata-project/SonataUserBundle>`_: integrates the
   ``FriendsOfSymfony/UserBundle`` with the ``AdminBundle``
 
 The security integration is a work in progress and has some known issues:
@@ -459,9 +459,10 @@ Vocabulary used for Access Control Lists:
   There can be many voters that may have different permission maps. However,
   prevent that multiple voters vote on the same class with overlapping bitmasks.
 
-See the cookbook article "Advanced ACL concepts" for the meaning of the different
-permissions:
-http://symfony.com/doc/current/cookbook/security/acl_advanced.html#pre-authorization-decisions.
+See the cookbook article "`Advanced ACL concepts 
+<http://symfony.com/doc/current/cookbook/security/acl_advanced.html#pre-authorization-decisions.>`_" 
+for the meaning of the different permissions.
+
 
 How is access granted?
 ~~~~~~~~~~~~~~~~~~~~~~

+ 2 - 2
Resources/doc/reference/troubleshooting.rst

@@ -31,11 +31,11 @@ So in order to avoid any fatal error, you must return an empty string (or anythi
 
 
 Large filters and long urls problem
--------------------
+-----------------------------------
 
 If you will try to add hundreds filters to single admin class, you will get a problem - very long filter form url generated.
 In most cases you will get server response like *Error 400 Bad Request* OR *Error 414 Request-URI Too Long*. According to 
-http://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-a-url-in-different-browsers
+`a StackOverflow discussion <http://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-a-url-in-different-browsers>`_
 "safe" url length is just around 2000 characters.
 You can fix this issue by adding simple JQuery code on your edit template