Skip to content

Commit 185c829

Browse files
committed
Merge pull request #939 from javiereguiluz/finish_rst_doc
Fixed some minor issues with the new RST doc
2 parents 6bcb435 + 94a6675 commit 185c829

File tree

4 files changed

+25
-12
lines changed

4 files changed

+25
-12
lines changed

Resources/doc/1-setting_up_the_bundle.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ following command to download the latest stable version of this bundle:
99

1010
.. code-block:: bash
1111
12-
$ composer require friendsofsymfony/rest-bundle "~1.4"
12+
$ composer require friendsofsymfony/rest-bundle
1313
1414
This command requires you to have Composer installed globally, as explained
1515
in the `installation chapter`_ of the Composer documentation.

Resources/doc/3-listener-support.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ various events from decoding the request content in the request (body listener),
66
determining the correct response format (format listener), reading parameters
77
from the request (parameter fetcher listener), to formatting the response either
88
with a template engine like twig or to f.e. xml or json using a serializer (view
9-
response listener)) as well as automatically setting the accepted http methods
9+
response listener)) as well as automatically setting the accepted HTTP methods
1010
in the response (accept listener).
1111

1212
With this in mind we now turn to explain each one of them.

Resources/doc/5-automatic-route-generation_single-restful-controller.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ Changing pluralization in generated routes
322322
------------------------------------------
323323

324324
If you want to change pluralization in generated routes, you can do this by
325-
replacing "fos_rest.inflector.doctrine" service with your own implementation.
325+
replacing ``fos_rest.inflector.doctrine`` service with your own implementation.
326326
Create a new class that implements ``FOS\RestBundle\Util\Inflector\InflectorInterface``.
327327

328328
The example below will remove pluralization by implementing the interface and

Resources/doc/index.rst

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,25 @@
11
Getting Started With FOSRestBundle
22
=====================================
33

4+
.. toctree::
5+
:hidden:
6+
7+
1-setting_up_the_bundle
8+
2-the-view-layer
9+
3-listener-support
10+
4-exception-controller-support
11+
5-automatic-route-generation_single-restful-controller
12+
6-automatic-route-generation_multiple-restful-controllers
13+
7-manual-route-definition
14+
annotations-reference
15+
configuration-reference
16+
417
Installation
518
------------
619

720
Installation is a quick (I promise!) one-step process:
821

9-
1. :doc:`Setting up the bundle <1-setting_up_the_bundle>`_
22+
1. :doc:`Setting up the bundle <1-setting_up_the_bundle>`
1023

1124
Bundle usage
1225
------------
@@ -18,19 +31,19 @@ tool to help you in the job of creating a REST API with Symfony2.
1831

1932
FOSRestBundle provides several tools to assist in building REST applications:
2033

21-
- :doc:`The view layer <2-the-view-layer>`_
22-
- :doc:`Listener support <3-listener-support>`_
23-
- :doc:`ExceptionController support <4-exception-controller-support>`_
24-
- :doc:`Automatic route generation: single RESTful controller <5-automatic-route-generation_single-restful-controller>`_ (for simple resources)
25-
- :doc:`Automatic route generation: multiple RESTful controllers <6-automatic-route-generation_multiple-restful-controllers>`_ (for resources with child/subresources)
26-
- :doc:`Manual definition of routes <7-manual-route-definition>`_
34+
- :doc:`The view layer <2-the-view-layer>`
35+
- :doc:`Listener support <3-listener-support>`
36+
- :doc:`ExceptionController support <4-exception-controller-support>`
37+
- :doc:`Automatic route generation: single RESTful controller <5-automatic-route-generation_single-restful-controller>` (for simple resources)
38+
- :doc:`Automatic route generation: multiple RESTful controllers <6-automatic-route-generation_multiple-restful-controllers>` (for resources with child/subresources)
39+
- :doc:`Manual definition of routes <7-manual-route-definition>`
2740

2841
Config reference
2942
----------------
3043

31-
- :doc:`Configuration reference <configuration-reference>`_ for a reference on
44+
- :doc:`Configuration reference <configuration-reference>` for a reference on
3245
the available configuration options
33-
- :doc:`Annotations reference <annotations-reference>`_ for a reference on
46+
- :doc:`Annotations reference <annotations-reference>` for a reference on
3447
the available configurations through annotations
3548

3649
Example applications

0 commit comments

Comments
 (0)