Skip to content

Commit

Permalink
Merge pull request #691 from yceruto/fixed-build-issues
Browse files Browse the repository at this point in the history
Fixed build issues
  • Loading branch information
makasim committed Jan 8, 2016
2 parents ae747e1 + cc8c1b7 commit f5341df
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Resources/doc/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ There are several configuration options available:
* ``data_loader`` - name of a custom data loader. Default value: ``filesystem``
(which means the standard filesystem loader is used).
* ``controller``
* ``filter_action`` - name of the controller action to use in the route loader.
Default value: ``liip_imagine.controller:filterAction``
* ``filter_runtime_action`` - name of the controller action to use in the route
loader for runtimeconfig images. Default value: ``liip_imagine.controller:filterRuntimeAction``
* ``filter_action`` - name of the controller action to use in the route loader.
Default value: ``liip_imagine.controller:filterAction``
* ``filter_runtime_action`` - name of the controller action to use in the route
loader for runtimeconfig images. Default value: ``liip_imagine.controller:filterRuntimeAction``
* ``driver`` - one of the three drivers: ``gd``, ``imagick``, ``gmagick``.
Default value: ``gd``
* ``filter_sets`` - specify the filter sets that you want to define and use.
Expand Down
4 changes: 2 additions & 2 deletions Resources/doc/filters.rst
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ To tell the bundle about your new filter loader, register it in the service
container and apply the ``liip_imagine.filter.loader`` tag to it (example here
in XML):

.. contiguration-block::
.. configuration-block::

.. code-block:: yaml
Expand Down Expand Up @@ -322,7 +322,7 @@ should return the ``BinaryInterface`` as well.
To tell the bundle about your post-processor, register it in the service
container and apply the ``liip_imagine.filter.post_processor`` tag to it:

.. contiguration-block::
.. configuration-block::

.. code-block:: yaml
Expand Down

0 comments on commit f5341df

Please sign in to comment.