Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed build issues #691

Merged
merged 2 commits into from
Jan 8, 2016
Merged

Fixed build issues #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91af895
Fixed indent
yceruto Jan 8, 2016
cc8c1b7
Fixed typo
yceruto Jan 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Resources/doc/configuration.rst
View file
Open in desktop
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.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This error has also been fixed in #690 but using a different solution.

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
View file
Open in desktop
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