Skip to content

Commit 5435dcd

Browse files
Apply suggestions from code review
Add first batch of changes to be incorporated. Co-authored-by: Kate <[email protected]> Signed-off-by: Christian Wolf <[email protected]>
1 parent 17043e2 commit 5435dcd

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

developer_manual/basics/controllers.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ For ``OCSController`` classes and their methods, :ref:`responders <controller-re
478478
The ``OCSController`` class have however automatically two responders pre-installed:
479479
Both JSON (``application/json``) and XML (``text/xml``) are generated on-the-fly depending on the request by the browser/user.
480480
To select the output format, the ``?format=`` query parameter or the ``Accept`` header of the request work out of the box, no intervention is required.
481-
It is advised to prefer the header generally, as this is the more programmatic way.
481+
It is advised to prefer the header generally, as this is the more standardized way.
482482

483483
In order to make routing work for OCS routes you need to add :ref:`a separate 'ocs' entry<routes_ocs>` to the routing table in ``appinfo/routes.php`` of your app.
484484
Inside these, there are the same information as there are for normal routes.
@@ -883,7 +883,7 @@ Here is the example from :ref:`OCS controllers <ocscontroller>`:
883883
884884
}
885885
886-
The ``#[NoAdminRequired]`` is needed here as normal users should be able to access the data in fact.
886+
The ``#[NoAdminRequired]`` is needed here as normal users should be able to access the data.
887887
It can be left out in case only the admin user should be able to access the data.
888888
The CSRF check is still active.
889889
Thus, the client must obey the corresponding requirements.

developer_manual/basics/routing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Additionally, the route must be configured to be an OCS route in the router.
4444
To do so, you use the ``ocs`` key in the ``routes.php`` file instead of the key ``routes``.
4545
The rest of the structure is the same.
4646

47-
You can of course combine non-OCS with OCS routes.
47+
You can of course have both index.php and OCS routes.
4848

4949
.. code-block:: php
5050

0 commit comments

Comments
 (0)