From eed9bee07fc31cbb93745084d608829eaf31504e Mon Sep 17 00:00:00 2001 From: Attila Simon Date: Tue, 22 Nov 2016 19:46:40 +0100 Subject: [PATCH 1/2] Docfix: Remove Header Interceptor has malformed table in user guide Change-Id: I3a7264d9f670d2af0fb1f9aad74ceda54c2a3c5b --- flume-ng-doc/sphinx/FlumeUserGuide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst b/flume-ng-doc/sphinx/FlumeUserGuide.rst index c73496cb08..5b874379f7 100644 --- a/flume-ng-doc/sphinx/FlumeUserGuide.rst +++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst @@ -3920,7 +3920,7 @@ Property Name Default Description **type** -- The component type name has to be ``remove_header`` withName -- Name of the header to remove fromList -- List of headers to remove, separated with the separator specified with from.list.separator -fromListSeparator \s*,\s* Regular expression used to separate multiple header names in the list specified using from.list +fromListSeparator \s*,\s* Regular expression used to separate multiple header names in the list specified using from.list matching -- All the headers which names match this regular expression are removed ===================== =========== =============================================================== From 92eec5ac99c523c922d4b7b541075990dfbfb729 Mon Sep 17 00:00:00 2001 From: Attila Simon Date: Thu, 24 Nov 2016 15:40:20 +0100 Subject: [PATCH 2/2] Incorporate Denes' whitespace finding and caught misnamed reference to parameters. Change-Id: I35e90f085e4c7f97d987fac428835b3873d1f992 --- flume-ng-doc/sphinx/FlumeUserGuide.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst b/flume-ng-doc/sphinx/FlumeUserGuide.rst index 5b874379f7..b91b1ddf65 100644 --- a/flume-ng-doc/sphinx/FlumeUserGuide.rst +++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst @@ -3919,8 +3919,8 @@ Property Name Default Description ===================== =========== =============================================================== **type** -- The component type name has to be ``remove_header`` withName -- Name of the header to remove -fromList -- List of headers to remove, separated with the separator specified with from.list.separator -fromListSeparator \s*,\s* Regular expression used to separate multiple header names in the list specified using from.list +fromList -- List of headers to remove, separated with the separator specified by ``fromListSeparator`` +fromListSeparator \\s*,\\s* Regular expression used to separate multiple header names in the list specified by ``fromList``. Default is a comma surrounded by any number of whitespace characters matching -- All the headers which names match this regular expression are removed ===================== =========== ===============================================================