This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new f8f2b0c CAMEL-13917: camel3 - Deprecate and remove consumer.xxx
syntax for delay options
f8f2b0c is described below
commit f8f2b0cd01ba88842c23b4f0ab2dfa89fcf20c67
Author: Pascal Schumacher <[email protected]>
AuthorDate: Fri Apr 24 22:46:59 2020 +0200
CAMEL-13917: camel3 - Deprecate and remove consumer.xxx syntax for delay
options
Remove some mentions of the consumer.xxx syntax from the documentation.
---
components/camel-atom/src/main/docs/atom-component.adoc | 2 +-
.../java/org/apache/camel/component/feed/FeedEndpoint.java | 4 ++--
.../camel-beanstalk/src/main/docs/beanstalk-component.adoc | 6 +++---
.../camel-braintree/src/main/docs/braintree-component.adoc | 6 +++---
.../src/main/docs/google-drive-component.adoc | 4 ++--
.../src/main/docs/google-mail-component.adoc | 4 ++--
.../src/main/docs/google-sheets-component.adoc | 4 ++--
components/camel-jpa/src/main/docs/jpa-component.adoc | 12 ++++++------
components/camel-mail/src/main/docs/mail-component.adoc | 2 --
components/camel-twilio/src/main/docs/twilio-component.adoc | 4 ++--
.../camel-zendesk/src/main/docs/zendesk-component.adoc | 4 ++--
docs/components/modules/ROOT/pages/beanstalk-component.adoc | 6 +++---
docs/components/modules/ROOT/pages/braintree-component.adoc | 6 +++---
.../modules/ROOT/pages/google-calendar-component.adoc | 4 ++--
.../modules/ROOT/pages/google-drive-component.adoc | 4 ++--
.../modules/ROOT/pages/google-sheets-component.adoc | 4 ++--
docs/components/modules/ROOT/pages/jpa-component.adoc | 12 ++++++------
docs/components/modules/ROOT/pages/mail-component.adoc | 2 --
docs/components/modules/ROOT/pages/twilio-component.adoc | 4 ++--
docs/components/modules/ROOT/pages/zendesk-component.adoc | 4 ++--
docs/user-manual/modules/ROOT/pages/rest-dsl.adoc | 4 +---
...-i-let-the-file-consumer-use-the-camel-error-handler.adoc | 2 +-
22 files changed, 49 insertions(+), 55 deletions(-)
diff --git a/components/camel-atom/src/main/docs/atom-component.adoc
b/components/camel-atom/src/main/docs/atom-component.adoc
index 34452c0..f47782d 100644
--- a/components/camel-atom/src/main/docs/atom-component.adoc
+++ b/components/camel-atom/src/main/docs/atom-component.adoc
@@ -90,7 +90,7 @@ with the following path and query parameters:
| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll
any files, you can enable this option to send an empty message (no body)
instead. | false | boolean
| *sortEntries* (consumer) | Sets whether to sort entries by published date.
Only works when splitEntries = true. | false | boolean
| *splitEntries* (consumer) | Sets whether or not entries should be sent
individually or whether the entire feed should be sent as a single message |
true | boolean
-| *throttleEntries* (consumer) | Sets whether all entries identified in a
single feed poll should be delivered immediately. If true, only one entry is
processed per consumer.delay. Only applicable when splitEntries = true. | true
| boolean
+| *throttleEntries* (consumer) | Sets whether all entries identified in a
single feed poll should be delivered immediately. If true, only one entry is
processed per delay. Only applicable when splitEntries = true. | true | boolean
| *username* (consumer) | Sets the username to be used for basic
authentication when polling from a HTTP feed. | | String
| *exceptionHandler* (consumer) | To let the consumer use a custom
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this
option is not in use. By default the consumer will deal with exceptions, that
will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer
creates an exchange. The value can be one of: InOnly, InOut, InOptionalOut | |
ExchangePattern
diff --git
a/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEndpoint.java
b/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEndpoint.java
index 687c69b..7783f57 100644
---
a/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEndpoint.java
+++
b/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEndpoint.java
@@ -49,7 +49,7 @@ public abstract class FeedEndpoint extends
DefaultPollingEndpoint {
private boolean sortEntries;
@UriParam(defaultValue = "true", description = "Sets whether all entries
identified in a "
+ "single feed poll should be delivered immediately. If true, only
one entry is processed "
- + "per consumer.delay. Only applicable when splitEntries = true.")
+ + "per delay. Only applicable when splitEntries = true.")
private boolean throttleEntries = true;
@UriParam(description = "Sets the username to be used for basic
authentication when polling from a HTTP feed.")
private String username;
@@ -206,7 +206,7 @@ public abstract class FeedEndpoint extends
DefaultPollingEndpoint {
/**
* Sets whether all entries identified in a single feed poll should be
delivered immediately. If true, only one
- * entry is processed per consumer.delay. Only applicable when
splitEntries = true.
+ * entry is processed per delay. Only applicable when splitEntries = true.
*/
public void setThrottleEntries(boolean throttleEntries) {
this.throttleEntries = throttleEntries;
diff --git a/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
b/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
index 3501c5f..f79cb4e 100644
--- a/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
+++ b/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
@@ -147,16 +147,16 @@ what to do with the job, it can be
The consumer may delete the job immediately after reserving it or wait
until Camel routes process it. While the first scenario is more like a
“message queue”, the second is similar to “job queue”. This behavior is
-controlled by `consumer.awaitJob` parameter, which equals `true` by
+controlled by `awaitJob` parameter, which equals `true` by
default (following Beanstalkd nature).
When synchronous, the consumer calls `delete` on successful job
completion and calls `bury` on failure. You can choose which command to
execute in the case of failure by
-specifying `consumer.onFailure` parameter in the URI. It can take values
+specifying `onFailure` parameter in the URI. It can take values
of `bury`, `delete` or `release`.
-There is a boolean parameter `consumer.useBlockIO` which corresponds to
+There is a boolean parameter `useBlockIO` which corresponds to
the same parameter in JavaBeanstalkClient library. By default it
is `true`.
diff --git a/components/camel-braintree/src/main/docs/braintree-component.adoc
b/components/camel-braintree/src/main/docs/braintree-component.adoc
index 9a56b51..0a30c39 100644
--- a/components/camel-braintree/src/main/docs/braintree-component.adoc
+++ b/components/camel-braintree/src/main/docs/braintree-component.adoc
@@ -810,11 +810,11 @@ URI Options for _webhookNotification_
Any of the producer endpoints can be used as a consumer endpoint.
Consumer endpoints can
use
http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
-Poll Consumer Options] with a *consumer.* prefix to schedule endpoint
-invocation. By default Consumer endpoints that return an array or
+Poll Consumer Options] to schedule endpoint invocation.
+By default Consumer endpoints that return an array or
collection will generate one exchange per element, and their routes will
be executed once for each exchange. To change this behavior use the
-property *consumer.splitResults=true* to return a single exchange for
+property *splitResults=true* to return a single exchange for
the entire list or array.
== Message Headers
diff --git
a/components/camel-google-drive/src/main/docs/google-drive-component.adoc
b/components/camel-google-drive/src/main/docs/google-drive-component.adoc
index 2005785..2182163 100644
--- a/components/camel-google-drive/src/main/docs/google-drive-component.adoc
+++ b/components/camel-google-drive/src/main/docs/google-drive-component.adoc
@@ -188,8 +188,8 @@ at:
https://developers.google.com/drive/v2/reference/[https://developers.google.
Any of the producer endpoints can be used as a consumer endpoint.
Consumer endpoints can use
http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
-Poll Consumer Options] with a `consumer.` prefix to schedule endpoint
-invocation. Consumer endpoints that return an array or collection will
+Poll Consumer Options] to schedule endpoint invocation.
+Consumer endpoints that return an array or collection will
generate one exchange per element, and their routes will be executed
once for each exchange.
diff --git
a/components/camel-google-mail/src/main/docs/google-mail-component.adoc
b/components/camel-google-mail/src/main/docs/google-mail-component.adoc
index 7d25443..ccc3d20 100644
--- a/components/camel-google-mail/src/main/docs/google-mail-component.adoc
+++ b/components/camel-google-mail/src/main/docs/google-mail-component.adoc
@@ -176,8 +176,8 @@ at:
https://developers.google.com/gmail/api/v1/reference/[https://developers.goo
Any of the producer endpoints can be used as a consumer endpoint.
Consumer endpoints can use
http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
-Poll Consumer Options] with a `consumer.` prefix to schedule endpoint
-invocation. Consumer endpoints that return an array or collection will
+Poll Consumer Options] to schedule endpoint invocation.
+Consumer endpoints that return an array or collection will
generate one exchange per element, and their routes will be executed
once for each exchange.
diff --git
a/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
b/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
index e30c658..1d741b3 100644
--- a/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
+++ b/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
@@ -172,8 +172,8 @@ at:
https://developers.google.com/sheets/api/reference/rest/[https://developers.
Any of the producer endpoints can be used as a consumer endpoint.
Consumer endpoints can use
http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
-Poll Consumer Options] with a `consumer.` prefix to schedule endpoint
-invocation. Consumer endpoints that return an array or collection will
+Poll Consumer Options] to schedule endpoint invocation.
+Consumer endpoints that return an array or collection will
generate one exchange per element, and their routes will be executed
once for each exchange.
diff --git a/components/camel-jpa/src/main/docs/jpa-component.adoc
b/components/camel-jpa/src/main/docs/jpa-component.adoc
index 2b44ec9..cf9b60e 100644
--- a/components/camel-jpa/src/main/docs/jpa-component.adoc
+++ b/components/camel-jpa/src/main/docs/jpa-component.adoc
@@ -270,7 +270,7 @@ explicitly configure a JPA component that references the
== Using a consumer with a named query
For consuming only selected entities, you can use the
-`consumer.namedQuery` URI query option. First, you have to define the
+`namedQuery` URI query option. First, you have to define the
named query in the JPA Entity class:
[source,java]
@@ -286,30 +286,30 @@ After that you can define a consumer uri like this one:
[source,java]
----------------------------------------------------------------------------
-from("jpa://org.apache.camel.examples.MultiSteps?consumer.namedQuery=step1")
+from("jpa://org.apache.camel.examples.MultiSteps?namedQuery=step1")
.to("bean:myBusinessLogic");
----------------------------------------------------------------------------
== Using a consumer with a query
-For consuming only selected entities, you can use the `consumer.query`
+For consuming only selected entities, you can use the `query`
URI query option. You only have to define the query option:
[source,java]
---------------------------------------------------------------------------------------------------------------------------------------
-from("jpa://org.apache.camel.examples.MultiSteps?consumer.query=select o from
org.apache.camel.examples.MultiSteps o where o.step = 1")
+from("jpa://org.apache.camel.examples.MultiSteps?query=select o from
org.apache.camel.examples.MultiSteps o where o.step = 1")
.to("bean:myBusinessLogic");
---------------------------------------------------------------------------------------------------------------------------------------
== Using a consumer with a native query
For consuming only selected entities, you can use the
-`consumer.nativeQuery` URI query option. You only have to define the
+`nativeQuery` URI query option. You only have to define the
native query option:
[source,java]
---------------------------------------------------------------------------------------------------------------
-from("jpa://org.apache.camel.examples.MultiSteps?consumer.nativeQuery=select *
from MultiSteps where step = 1")
+from("jpa://org.apache.camel.examples.MultiSteps?nativeQuery=select * from
MultiSteps where step = 1")
.to("bean:myBusinessLogic");
---------------------------------------------------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/docs/mail-component.adoc
b/components/camel-mail/src/main/docs/mail-component.adoc
index cee01d7..617a25b 100644
--- a/components/camel-mail/src/main/docs/mail-component.adoc
+++ b/components/camel-mail/src/main/docs/mail-component.adoc
@@ -467,8 +467,6 @@
from("jms://queue:subscription").to("smtp://[email protected]?password=secr
-------------------------------------------------------------------------------------
In the next sample, we poll a mailbox for new emails once every minute.
-Notice that we use the special `consumer` option for setting the poll
-interval, `consumer.delay`, as 60000 milliseconds = 60 seconds.
[source,java]
-------------------------------------------------------
diff --git a/components/camel-twilio/src/main/docs/twilio-component.adoc
b/components/camel-twilio/src/main/docs/twilio-component.adoc
index f56fa99..8b962f0 100644
--- a/components/camel-twilio/src/main/docs/twilio-component.adoc
+++ b/components/camel-twilio/src/main/docs/twilio-component.adoc
@@ -204,8 +204,8 @@
https://www.twilio.com/docs/libraries/reference/twilio-java/index.html
Any of the producer endpoints can be used as a consumer endpoint.
Consumer endpoints can use
http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
-Poll Consumer Options] with a `consumer.` prefix to schedule endpoint
-invocation. Consumer endpoints that return an array or collection will
+Poll Consumer Options] to schedule endpoint invocation.
+Consumer endpoints that return an array or collection will
generate one exchange per element, and their routes will be executed
once for each exchange.
diff --git a/components/camel-zendesk/src/main/docs/zendesk-component.adoc
b/components/camel-zendesk/src/main/docs/zendesk-component.adoc
index e7fe17f..b77958e 100644
--- a/components/camel-zendesk/src/main/docs/zendesk-component.adoc
+++ b/components/camel-zendesk/src/main/docs/zendesk-component.adoc
@@ -120,8 +120,8 @@ Producer endpoints can use endpoint names and associated
options described next.
Any of the producer endpoints can be used as a consumer endpoint.
Consumer endpoints can use
http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
-Poll Consumer Options] with a `consumer.` prefix to schedule endpoint
-invocation. Consumer endpoints that return an array or collection will
+Poll Consumer Options] to schedule endpoint invocation.
+Consumer endpoints that return an array or collection will
generate one exchange per element, and their routes will be executed
once for each exchange.
diff --git a/docs/components/modules/ROOT/pages/beanstalk-component.adoc
b/docs/components/modules/ROOT/pages/beanstalk-component.adoc
index 89f38a8..a182bd2 100644
--- a/docs/components/modules/ROOT/pages/beanstalk-component.adoc
+++ b/docs/components/modules/ROOT/pages/beanstalk-component.adoc
@@ -149,16 +149,16 @@ what to do with the job, it can be
The consumer may delete the job immediately after reserving it or wait
until Camel routes process it. While the first scenario is more like a
“message queue”, the second is similar to “job queue”. This behavior is
-controlled by `consumer.awaitJob` parameter, which equals `true` by
+controlled by `awaitJob` parameter, which equals `true` by
default (following Beanstalkd nature).
When synchronous, the consumer calls `delete` on successful job
completion and calls `bury` on failure. You can choose which command to
execute in the case of failure by
-specifying `consumer.onFailure` parameter in the URI. It can take values
+specifying `onFailure` parameter in the URI. It can take values
of `bury`, `delete` or `release`.
-There is a boolean parameter `consumer.useBlockIO` which corresponds to
+There is a boolean parameter `useBlockIO` which corresponds to
the same parameter in JavaBeanstalkClient library. By default it
is `true`.
diff --git a/docs/components/modules/ROOT/pages/braintree-component.adoc
b/docs/components/modules/ROOT/pages/braintree-component.adoc
index b1c27ca..ebd5e46 100644
--- a/docs/components/modules/ROOT/pages/braintree-component.adoc
+++ b/docs/components/modules/ROOT/pages/braintree-component.adoc
@@ -812,11 +812,11 @@ URI Options for _webhookNotification_
Any of the producer endpoints can be used as a consumer endpoint.
Consumer endpoints can
use
http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
-Poll Consumer Options] with a *consumer.* prefix to schedule endpoint
-invocation. By default Consumer endpoints that return an array or
+Poll Consumer Options] to schedule endpoint invocation.
+By default Consumer endpoints that return an array or
collection will generate one exchange per element, and their routes will
be executed once for each exchange. To change this behavior use the
-property *consumer.splitResults=true* to return a single exchange for
+property *splitResults=true* to return a single exchange for
the entire list or array.
== Message Headers
diff --git a/docs/components/modules/ROOT/pages/google-calendar-component.adoc
b/docs/components/modules/ROOT/pages/google-calendar-component.adoc
index b6c300c..c2f93e6 100644
--- a/docs/components/modules/ROOT/pages/google-calendar-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-calendar-component.adoc
@@ -185,8 +185,8 @@ override a `CamelGoogleCalendar.option` header.
Any of the producer endpoints can be used as a consumer endpoint.
Consumer endpoints can use
http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
-Poll Consumer Options] with a `consumer.` prefix to schedule endpoint
-invocation. Consumer endpoints that return an array or collection will
+Poll Consumer Options] to schedule endpoint invocation.
+Consumer endpoints that return an array or collection will
generate one exchange per element, and their routes will be executed
once for each exchange.
diff --git a/docs/components/modules/ROOT/pages/google-drive-component.adoc
b/docs/components/modules/ROOT/pages/google-drive-component.adoc
index 05e7a9f..8e6f759 100644
--- a/docs/components/modules/ROOT/pages/google-drive-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-drive-component.adoc
@@ -190,8 +190,8 @@ at:
https://developers.google.com/drive/v2/reference/[https://developers.google.
Any of the producer endpoints can be used as a consumer endpoint.
Consumer endpoints can use
http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
-Poll Consumer Options] with a `consumer.` prefix to schedule endpoint
-invocation. Consumer endpoints that return an array or collection will
+Poll Consumer Options] to schedule endpoint invocation.
+Consumer endpoints that return an array or collection will
generate one exchange per element, and their routes will be executed
once for each exchange.
diff --git a/docs/components/modules/ROOT/pages/google-sheets-component.adoc
b/docs/components/modules/ROOT/pages/google-sheets-component.adoc
index 1b953ad..528aa36 100644
--- a/docs/components/modules/ROOT/pages/google-sheets-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-sheets-component.adoc
@@ -174,8 +174,8 @@ at:
https://developers.google.com/sheets/api/reference/rest/[https://developers.
Any of the producer endpoints can be used as a consumer endpoint.
Consumer endpoints can use
http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
-Poll Consumer Options] with a `consumer.` prefix to schedule endpoint
-invocation. Consumer endpoints that return an array or collection will
+Poll Consumer Options] to schedule endpoint invocation.
+Consumer endpoints that return an array or collection will
generate one exchange per element, and their routes will be executed
once for each exchange.
diff --git a/docs/components/modules/ROOT/pages/jpa-component.adoc
b/docs/components/modules/ROOT/pages/jpa-component.adoc
index 3944610..d291b45 100644
--- a/docs/components/modules/ROOT/pages/jpa-component.adoc
+++ b/docs/components/modules/ROOT/pages/jpa-component.adoc
@@ -272,7 +272,7 @@ explicitly configure a JPA component that references the
== Using a consumer with a named query
For consuming only selected entities, you can use the
-`consumer.namedQuery` URI query option. First, you have to define the
+`namedQuery` URI query option. First, you have to define the
named query in the JPA Entity class:
[source,java]
@@ -288,30 +288,30 @@ After that you can define a consumer uri like this one:
[source,java]
----------------------------------------------------------------------------
-from("jpa://org.apache.camel.examples.MultiSteps?consumer.namedQuery=step1")
+from("jpa://org.apache.camel.examples.MultiSteps?namedQuery=step1")
.to("bean:myBusinessLogic");
----------------------------------------------------------------------------
== Using a consumer with a query
-For consuming only selected entities, you can use the `consumer.query`
+For consuming only selected entities, you can use the `query`
URI query option. You only have to define the query option:
[source,java]
---------------------------------------------------------------------------------------------------------------------------------------
-from("jpa://org.apache.camel.examples.MultiSteps?consumer.query=select o from
org.apache.camel.examples.MultiSteps o where o.step = 1")
+from("jpa://org.apache.camel.examples.MultiSteps?query=select o from
org.apache.camel.examples.MultiSteps o where o.step = 1")
.to("bean:myBusinessLogic");
---------------------------------------------------------------------------------------------------------------------------------------
== Using a consumer with a native query
For consuming only selected entities, you can use the
-`consumer.nativeQuery` URI query option. You only have to define the
+`nativeQuery` URI query option. You only have to define the
native query option:
[source,java]
---------------------------------------------------------------------------------------------------------------
-from("jpa://org.apache.camel.examples.MultiSteps?consumer.nativeQuery=select *
from MultiSteps where step = 1")
+from("jpa://org.apache.camel.examples.MultiSteps?nativeQuery=select * from
MultiSteps where step = 1")
.to("bean:myBusinessLogic");
---------------------------------------------------------------------------------------------------------------
diff --git a/docs/components/modules/ROOT/pages/mail-component.adoc
b/docs/components/modules/ROOT/pages/mail-component.adoc
index 2cb5cea..4d9f6ef 100644
--- a/docs/components/modules/ROOT/pages/mail-component.adoc
+++ b/docs/components/modules/ROOT/pages/mail-component.adoc
@@ -469,8 +469,6 @@
from("jms://queue:subscription").to("smtp://[email protected]?password=secr
-------------------------------------------------------------------------------------
In the next sample, we poll a mailbox for new emails once every minute.
-Notice that we use the special `consumer` option for setting the poll
-interval, `consumer.delay`, as 60000 milliseconds = 60 seconds.
[source,java]
-------------------------------------------------------
diff --git a/docs/components/modules/ROOT/pages/twilio-component.adoc
b/docs/components/modules/ROOT/pages/twilio-component.adoc
index cd3477b..699e9bf 100644
--- a/docs/components/modules/ROOT/pages/twilio-component.adoc
+++ b/docs/components/modules/ROOT/pages/twilio-component.adoc
@@ -206,8 +206,8 @@
https://www.twilio.com/docs/libraries/reference/twilio-java/index.html
Any of the producer endpoints can be used as a consumer endpoint.
Consumer endpoints can use
http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
-Poll Consumer Options] with a `consumer.` prefix to schedule endpoint
-invocation. Consumer endpoints that return an array or collection will
+Poll Consumer Options] to schedule endpoint invocation.
+Consumer endpoints that return an array or collection will
generate one exchange per element, and their routes will be executed
once for each exchange.
diff --git a/docs/components/modules/ROOT/pages/zendesk-component.adoc
b/docs/components/modules/ROOT/pages/zendesk-component.adoc
index 5d23855..6638f64 100644
--- a/docs/components/modules/ROOT/pages/zendesk-component.adoc
+++ b/docs/components/modules/ROOT/pages/zendesk-component.adoc
@@ -122,8 +122,8 @@ Producer endpoints can use endpoint names and associated
options described next.
Any of the producer endpoints can be used as a consumer endpoint.
Consumer endpoints can use
http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
-Poll Consumer Options] with a `consumer.` prefix to schedule endpoint
-invocation. Consumer endpoints that return an array or collection will
+Poll Consumer Options] to schedule endpoint invocation.
+Consumer endpoints that return an array or collection will
generate one exchange per element, and their routes will be executed
once for each exchange.
diff --git a/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc
b/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc
index b4170f3..d9442e3 100644
--- a/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc
+++ b/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc
@@ -620,9 +620,7 @@ You can configure properties on these levels.
also configure these directly on the component.
* endpoint - Is used set any option on the endpoint level. Many of the
Camel components has many options you can set on endpoint level.
-* consumer - Is used to set any option on the consumer level. Some
-components has consumer options, which you can also configure from
-endpoint level by prefixing the option with "consumer."
+* consumer - Is used to set any option on the consumer level.
* data format - Is used to set any option on the data formats. For
example to enable pretty print in the json data format.
* cors headers - If cors is enabled, then custom CORS headers can be
diff --git
a/docs/user-manual/modules/faq/pages/why-does-my-file-consumer-not-pick-up-the-file-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc
b/docs/user-manual/modules/faq/pages/why-does-my-file-consumer-not-pick-up-the-file-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc
index 8163788..cdb0a04 100644
---
a/docs/user-manual/modules/faq/pages/why-does-my-file-consumer-not-pick-up-the-file-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc
+++
b/docs/user-manual/modules/faq/pages/why-does-my-file-consumer-not-pick-up-the-file-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc
@@ -31,7 +31,7 @@ xref:ROOT:component.adoc[component]-specific.
From Camel 2.10 onwards the file and ftp consumers can now bridge to the
Camel routing engine's error handler. See more details at the
-`consumer.bridgeErrorHandler` option on the
xref:components::file-component.adoc[File]
+`bridgeErrorHandler` option on the xref:components::file-component.adoc[File]
documentation.
====
