diff --git a/CHANGES/1017.doc b/CHANGES/1017.doc deleted file mode 100644 index 2f292a13..00000000 --- a/CHANGES/1017.doc +++ /dev/null @@ -1 +0,0 @@ -Fix UA translations in index.po \ No newline at end of file diff --git a/CHANGES/1017.doc.rst b/CHANGES/1017.doc.rst new file mode 100644 index 00000000..50ab706e --- /dev/null +++ b/CHANGES/1017.doc.rst @@ -0,0 +1 @@ +Fix UA translations in index.po diff --git a/CHANGES/1018.feature.rst b/CHANGES/1018.feature.rst new file mode 100644 index 00000000..00c244cf --- /dev/null +++ b/CHANGES/1018.feature.rst @@ -0,0 +1,3 @@ +(again) Added possibility to combine filters with an *and*/*or* operations. + +Read more in ":ref:`Combining filters `" documentation section diff --git a/docs/dispatcher/filters/index.rst b/docs/dispatcher/filters/index.rst index 01006774..ea5d9403 100644 --- a/docs/dispatcher/filters/index.rst +++ b/docs/dispatcher/filters/index.rst @@ -54,6 +54,8 @@ For example if you need to make simple text filter: .. literalinclude:: ../../../examples/own_filter.py +.. _combining-filters: + Combining Filters =================