http://git-wip-us.apache.org/repos/asf/camel/blob/24d2f4ae/components/camel-telegram/src/main/docs/telegram-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-telegram/src/main/docs/telegram-component.adoc 
b/components/camel-telegram/src/main/docs/telegram-component.adoc
index 12fb213..0e3ee61 100644
--- a/components/camel-telegram/src/main/docs/telegram-component.adoc
+++ b/components/camel-telegram/src/main/docs/telegram-component.adoc
@@ -47,11 +47,13 @@ The Telegram component supports 2 options which are listed 
below.
 
 
 
-[width="100%",cols="2,1,1m,1m,5",options="header"]
+[width="100%",cols="2,1m,1m,6",options="header"]
 |=======================================================================
-| Name | Group | Default | Java Type | Description
-| authorizationToken | security |  | String | The default Telegram 
authorization token to be used when the information is not provided in the 
endpoints.
-| resolvePropertyPlaceholders | advanced | true | boolean | Whether the 
component should resolve property placeholders on itself when starting. Only 
properties which are of String type can use property placeholders.
+| Name | Default | Java Type | Description
+ 4+^s| security
+| authorizationToken |  | String | The default Telegram authorization token to 
be used when the information is not provided in the endpoints.
+ 4+^s| advanced
+| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
 |=======================================================================
 // component options: END
 
@@ -75,31 +77,53 @@ with the following path and query parameters:
 
 #### Query Parameters (22 parameters):
 
-[width="100%",cols="2,1,1m,1m,5",options="header"]
+[width="100%",cols="2,1m,1m,6",options="header"]
 |=======================================================================
-| Name | Group | Default | Java Type | Description
-| bridgeErrorHandler | consumer | false | boolean | Allows for bridging the 
consumer to the Camel routing Error Handler which mean any exceptions occurred 
while the consumer is trying to pickup incoming messages or the likes will now 
be processed as a message and handled by the routing Error Handler. By default 
the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
-| limit | consumer | 100 | Integer | Limit on the number of updates that can 
be received in a single polling request.
-| sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling 
consumer did not poll any files you can enable this option to send an empty 
message (no body) instead.
-| timeout | consumer | 30 | Integer | Timeout in seconds for long polling. Put 
0 for short polling or a bigger number for long polling. Long polling produces 
shorter response time.
-| exceptionHandler | consumer (advanced) |  | ExceptionHandler | To let the 
consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler 
is enabled then this options is not in use. By default the consumer will deal 
with exceptions that will be logged at WARN or ERROR level and ignored.
-| exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the 
exchange pattern when the consumer creates an exchange.
-| pollStrategy | consumer (advanced) |  | PollingConsumerPollStrategy | A 
pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to 
provide your custom implementation to control error handling usually occurred 
during the poll operation before an Exchange have been created and being routed 
in Camel.
-| chatId | producer |  | String | The identifier of the chat that will receive 
the produced messages. Chat ids can be first obtained from incoming messages 
(eg. when a telegram user starts a conversation with a bot its client sends 
automatically a '/start' message containing the chat id). It is an optional 
parameter as the chat id can be set dynamically for each outgoing message 
(using body or headers).
-| synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
-| backoffErrorThreshold | scheduler |  | int | The number of subsequent error 
polls (failed due some error) that should happen before the backoffMultipler 
should kick-in.
-| backoffIdleThreshold | scheduler |  | int | The number of subsequent idle 
polls that should happen before the backoffMultipler should kick-in.
-| backoffMultiplier | scheduler |  | int | To let the scheduled polling 
consumer backoff if there has been a number of subsequent idles/errors in a 
row. The multiplier is then the number of polls that will be skipped before the 
next actual attempt is happening again. When this option is in use then 
backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
-| delay | scheduler | 500 | long | Milliseconds before the next poll. You can 
also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes 
and 30 seconds) and 1h (1 hour).
-| greedy | scheduler | false | boolean | If greedy is enabled then the 
ScheduledPollConsumer will run immediately again if the previous run polled 1 
or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll 
starts. You can also specify time values using units such as 60s (60 seconds) 
5m30s (5 minutes and 30 seconds) and 1h (1 hour).
-| runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a 
start/complete log line when it polls. This option allows you to configure the 
logging level for that.
-| scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows 
for configuring a custom/shared thread pool to use for the consumer. By default 
each consumer has its own single threaded thread pool.
-| scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a 
cron scheduler from either camel-spring or camel-quartz2 component
-| schedulerProperties | scheduler |  | Map | To configure additional 
properties when using a custom scheduler or any of the Quartz2 Spring based 
scheduler.
-| startScheduler | scheduler | true | boolean | Whether the scheduler should 
be auto started.
-| timeUnit | scheduler | MILLISECONDS | TimeUnit | Time unit for initialDelay 
and delay options.
-| useFixedDelay | scheduler | true | boolean | Controls if fixed delay or 
fixed rate is used. See ScheduledExecutorService in JDK for details.
+| Name | Default | Java Type | Description
+ 4+^s| consumer
+| bridgeErrorHandler | false | boolean | Allows for bridging the consumer to 
the Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
+
+| limit | 100 | Integer | Limit on the number of updates that can be received 
in a single polling request.
+
+| sendEmptyMessageWhenIdle | false | boolean | If the polling consumer did not 
poll any files you can enable this option to send an empty message (no body) 
instead.
+
+| timeout | 30 | Integer | Timeout in seconds for long polling. Put 0 for 
short polling or a bigger number for long polling. Long polling produces 
shorter response time.
+ 4+^s| consumer (advanced)
+| exceptionHandler |  | ExceptionHandler | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored.
+
+| exchangePattern |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
+
+| pollStrategy |  | PollingConsumerPollStrategy | A pluggable 
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your 
custom implementation to control error handling usually occurred during the 
poll operation before an Exchange have been created and being routed in Camel.
+ 4+^s| producer
+| chatId |  | String | The identifier of the chat that will receive the 
produced messages. Chat ids can be first obtained from incoming messages (eg. 
when a telegram user starts a conversation with a bot its client sends 
automatically a '/start' message containing the chat id). It is an optional 
parameter as the chat id can be set dynamically for each outgoing message 
(using body or headers).
+ 4+^s| advanced
+| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
+ 4+^s| scheduler
+| backoffErrorThreshold |  | int | The number of subsequent error polls 
(failed due some error) that should happen before the backoffMultipler should 
kick-in.
+
+| backoffIdleThreshold |  | int | The number of subsequent idle polls that 
should happen before the backoffMultipler should kick-in.
+
+| backoffMultiplier |  | int | To let the scheduled polling consumer backoff 
if there has been a number of subsequent idles/errors in a row. The multiplier 
is then the number of polls that will be skipped before the next actual attempt 
is happening again. When this option is in use then backoffIdleThreshold and/or 
backoffErrorThreshold must also be configured.
+
+| delay | 500 | long | Milliseconds before the next poll. You can also specify 
time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 
seconds) and 1h (1 hour).
+
+| greedy | false | boolean | If greedy is enabled then the 
ScheduledPollConsumer will run immediately again if the previous run polled 1 
or more messages.
+
+| initialDelay | 1000 | long | Milliseconds before the first poll starts. You 
can also specify time values using units such as 60s (60 seconds) 5m30s (5 
minutes and 30 seconds) and 1h (1 hour).
+
+| runLoggingLevel | TRACE | LoggingLevel | The consumer logs a start/complete 
log line when it polls. This option allows you to configure the logging level 
for that.
+
+| scheduledExecutorService |  | ScheduledExecutorService | Allows for 
configuring a custom/shared thread pool to use for the consumer. By default 
each consumer has its own single threaded thread pool.
+
+| scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler 
from either camel-spring or camel-quartz2 component
+
+| schedulerProperties |  | Map | To configure additional properties when using 
a custom scheduler or any of the Quartz2 Spring based scheduler.
+
+| startScheduler | true | boolean | Whether the scheduler should be auto 
started.
+
+| timeUnit | MILLISECONDS | TimeUnit | Time unit for initialDelay and delay 
options.
+
+| useFixedDelay | true | boolean | Controls if fixed delay or fixed rate is 
used. See ScheduledExecutorService in JDK for details.
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/24d2f4ae/components/camel-tika/src/main/docs/tika-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-tika/src/main/docs/tika-component.adoc 
b/components/camel-tika/src/main/docs/tika-component.adoc
index fdc7cad..4d14c5a 100644
--- a/components/camel-tika/src/main/docs/tika-component.adoc
+++ b/components/camel-tika/src/main/docs/tika-component.adoc
@@ -56,14 +56,19 @@ with the following path and query parameters:
 
 #### Query Parameters (5 parameters):
 
-[width="100%",cols="2,1,1m,1m,5",options="header"]
+[width="100%",cols="2,1m,1m,6",options="header"]
 |=======================================================================
-| Name | Group | Default | Java Type | Description
-| tikaConfig | producer |  | TikaConfig | Tika Config
-| tikaConfigUri | producer |  | String | Tika Config Uri: The URI of 
tika-config.xml
-| tikaParseOutputEncoding | producer |  | String | Tika Parse Output Encoding 
- Used to specify the character encoding of the parsed output. Defaults to 
Charset.defaultCharset() .
-| tikaParseOutputFormat | producer | xml | TikaParseOutputFormat | Tika Output 
Format. Supported output formats. xml: Returns Parsed Content as XML. html: 
Returns Parsed Content as HTML. text: Returns Parsed Content as Text. textMain: 
Uses the boilerpipe library to automatically extract the main content from a 
web page.
-| synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
+| Name | Default | Java Type | Description
+
+| tikaConfig |  | TikaConfig | Tika Config
+
+| tikaConfigUri |  | String | Tika Config Uri: The URI of tika-config.xml
+
+| tikaParseOutputEncoding |  | String | Tika Parse Output Encoding - Used to 
specify the character encoding of the parsed output. Defaults to 
Charset.defaultCharset() .
+
+| tikaParseOutputFormat | xml | TikaParseOutputFormat | Tika Output Format. 
Supported output formats. xml: Returns Parsed Content as XML. html: Returns 
Parsed Content as HTML. text: Returns Parsed Content as Text. textMain: Uses 
the boilerpipe library to automatically extract the main content from a web 
page.
+ 4+^s| advanced
+| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/24d2f4ae/components/camel-twitter/src/main/docs/twitter-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/docs/twitter-component.adoc 
b/components/camel-twitter/src/main/docs/twitter-component.adoc
index 2987fb7..fb9be54 100644
--- a/components/camel-twitter/src/main/docs/twitter-component.adoc
+++ b/components/camel-twitter/src/main/docs/twitter-component.adoc
@@ -47,18 +47,27 @@ The Twitter component supports 9 options which are listed 
below.
 
 
 
-[width="100%",cols="2,1,1m,1m,5",options="header"]
+[width="100%",cols="2,1m,1m,6",options="header"]
 |=======================================================================
-| Name | Group | Default | Java Type | Description
-| accessToken | security |  | String | The access token
-| accessTokenSecret | security |  | String | The access token secret
-| consumerKey | security |  | String | The consumer key
-| consumerSecret | security |  | String | The consumer secret
-| httpProxyHost | proxy |  | String | The http proxy host which can be used 
for the camel-twitter.
-| httpProxyUser | proxy |  | String | The http proxy user which can be used 
for the camel-twitter.
-| httpProxyPassword | proxy |  | String | The http proxy password which can be 
used for the camel-twitter.
-| httpProxyPort | proxy |  | int | The http proxy port which can be used for 
the camel-twitter.
-| resolvePropertyPlaceholders | advanced | true | boolean | Whether the 
component should resolve property placeholders on itself when starting. Only 
properties which are of String type can use property placeholders.
+| Name | Default | Java Type | Description
+ 4+^s| security
+| accessToken |  | String | The access token
+
+| accessTokenSecret |  | String | The access token secret
+
+| consumerKey |  | String | The consumer key
+
+| consumerSecret |  | String | The consumer secret
+ 4+^s| proxy
+| httpProxyHost |  | String | The http proxy host which can be used for the 
camel-twitter.
+
+| httpProxyUser |  | String | The http proxy user which can be used for the 
camel-twitter.
+
+| httpProxyPassword |  | String | The http proxy password which can be used 
for the camel-twitter.
+
+| httpProxyPort |  | int | The http proxy port which can be used for the 
camel-twitter.
+ 4+^s| advanced
+| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
 |=======================================================================
 // component options: END
 
@@ -146,51 +155,93 @@ with the following path and query parameters:
 
 #### Query Parameters (42 parameters):
 
-[width="100%",cols="2,1,1m,1m,5",options="header"]
+[width="100%",cols="2,1m,1m,6",options="header"]
 |=======================================================================
-| Name | Group | Default | Java Type | Description
-| user | common |  | String | Username used for user timeline consumption 
direct message production etc.
-| bridgeErrorHandler | consumer | false | boolean | Allows for bridging the 
consumer to the Camel routing Error Handler which mean any exceptions occurred 
while the consumer is trying to pickup incoming messages or the likes will now 
be processed as a message and handled by the routing Error Handler. By default 
the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
-| sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling 
consumer did not poll any files you can enable this option to send an empty 
message (no body) instead.
-| type | consumer | polling | EndpointType | Endpoint type to use. Only 
streaming supports event type.
-| distanceMetric | consumer (advanced) | km | String | Used by the non-stream 
geography search to search by radius using the configured metrics. The unit can 
either be mi for miles or km for kilometers. You need to configure all the 
following options: longitude latitude radius and distanceMetric.
-| exceptionHandler | consumer (advanced) |  | ExceptionHandler | To let the 
consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler 
is enabled then this options is not in use. By default the consumer will deal 
with exceptions that will be logged at WARN or ERROR level and ignored.
-| exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the 
exchange pattern when the consumer creates an exchange.
-| latitude | consumer (advanced) |  | Double | Used by the non-stream 
geography search to search by latitude. You need to configure all the following 
options: longitude latitude radius and distanceMetric.
-| locations | consumer (advanced) |  | String | Bounding boxes created by 
pairs of lat/lons. Can be used for streaming/filter. A pair is defined as 
latlon. And multiple paris can be separated by semi colon.
-| longitude | consumer (advanced) |  | Double | Used by the non-stream 
geography search to search by longitude. You need to configure all the 
following options: longitude latitude radius and distanceMetric.
-| pollStrategy | consumer (advanced) |  | PollingConsumerPollStrategy | A 
pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to 
provide your custom implementation to control error handling usually occurred 
during the poll operation before an Exchange have been created and being routed 
in Camel.
-| radius | consumer (advanced) |  | Double | Used by the non-stream geography 
search to search by radius. You need to configure all the following options: 
longitude latitude radius and distanceMetric.
-| twitterStream | consumer (advanced) |  | TwitterStream | To use a custom 
instance of TwitterStream
-| synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
-| count | filter |  | Integer | Limiting number of results per page.
-| filterOld | filter | true | boolean | Filter out old tweets that has 
previously been polled. This state is stored in memory only and based on last 
tweet id.
-| keywords | filter |  | String | Can be used for search and streaming/filter. 
Multiple values can be separated with comma.
-| lang | filter |  | String | The lang string ISO_639-1 which will be used for 
searching
-| numberOfPages | filter | 1 | Integer | The number of pages result which you 
want camel-twitter to consume.
-| sinceId | filter | 1 | long | The last tweet id which will be used for 
pulling the tweets. It is useful when the camel route is restarted after a long 
running.
-| userIds | filter |  | String | To filter by user ids for streaming/filter. 
Multiple values can be separated by comma.
-| backoffErrorThreshold | scheduler |  | int | The number of subsequent error 
polls (failed due some error) that should happen before the backoffMultipler 
should kick-in.
-| backoffIdleThreshold | scheduler |  | int | The number of subsequent idle 
polls that should happen before the backoffMultipler should kick-in.
-| backoffMultiplier | scheduler |  | int | To let the scheduled polling 
consumer backoff if there has been a number of subsequent idles/errors in a 
row. The multiplier is then the number of polls that will be skipped before the 
next actual attempt is happening again. When this option is in use then 
backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
-| delay | scheduler | 60000 | long | Milliseconds before the next poll.
-| greedy | scheduler | false | boolean | If greedy is enabled then the 
ScheduledPollConsumer will run immediately again if the previous run polled 1 
or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll 
starts. You can also specify time values using units such as 60s (60 seconds) 
5m30s (5 minutes and 30 seconds) and 1h (1 hour).
-| runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a 
start/complete log line when it polls. This option allows you to configure the 
logging level for that.
-| scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows 
for configuring a custom/shared thread pool to use for the consumer. By default 
each consumer has its own single threaded thread pool.
-| scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a 
cron scheduler from either camel-spring or camel-quartz2 component
-| schedulerProperties | scheduler |  | Map | To configure additional 
properties when using a custom scheduler or any of the Quartz2 Spring based 
scheduler.
-| startScheduler | scheduler | true | boolean | Whether the scheduler should 
be auto started.
-| timeUnit | scheduler | MILLISECONDS | TimeUnit | Time unit for initialDelay 
and delay options.
-| useFixedDelay | scheduler | true | boolean | Controls if fixed delay or 
fixed rate is used. See ScheduledExecutorService in JDK for details.
-| httpProxyHost | proxy |  | String | The http proxy host which can be used 
for the camel-twitter. Can also be configured on the TwitterComponent level 
instead.
-| httpProxyPassword | proxy |  | String | The http proxy password which can be 
used for the camel-twitter. Can also be configured on the TwitterComponent 
level instead.
-| httpProxyPort | proxy |  | Integer | The http proxy port which can be used 
for the camel-twitter. Can also be configured on the TwitterComponent level 
instead.
-| httpProxyUser | proxy |  | String | The http proxy user which can be used 
for the camel-twitter. Can also be configured on the TwitterComponent level 
instead.
-| accessToken | security |  | String | The access token. Can also be 
configured on the TwitterComponent level instead.
-| accessTokenSecret | security |  | String | The access secret. Can also be 
configured on the TwitterComponent level instead.
-| consumerKey | security |  | String | The consumer key. Can also be 
configured on the TwitterComponent level instead.
-| consumerSecret | security |  | String | The consumer secret. Can also be 
configured on the TwitterComponent level instead.
+| Name | Default | Java Type | Description
+
+| user |  | String | Username used for user timeline consumption direct 
message production etc.
+ 4+^s| consumer
+| bridgeErrorHandler | false | boolean | Allows for bridging the consumer to 
the Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
+
+| sendEmptyMessageWhenIdle | false | boolean | If the polling consumer did not 
poll any files you can enable this option to send an empty message (no body) 
instead.
+
+| type | polling | EndpointType | Endpoint type to use. Only streaming 
supports event type.
+ 4+^s| consumer (advanced)
+| distanceMetric | km | String | Used by the non-stream geography search to 
search by radius using the configured metrics. The unit can either be mi for 
miles or km for kilometers. You need to configure all the following options: 
longitude latitude radius and distanceMetric.
+
+| exceptionHandler |  | ExceptionHandler | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored.
+
+| exchangePattern |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
+
+| latitude |  | Double | Used by the non-stream geography search to search by 
latitude. You need to configure all the following options: longitude latitude 
radius and distanceMetric.
+
+| locations |  | String | Bounding boxes created by pairs of lat/lons. Can be 
used for streaming/filter. A pair is defined as latlon. And multiple paris can 
be separated by semi colon.
+
+| longitude |  | Double | Used by the non-stream geography search to search by 
longitude. You need to configure all the following options: longitude latitude 
radius and distanceMetric.
+
+| pollStrategy |  | PollingConsumerPollStrategy | A pluggable 
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your 
custom implementation to control error handling usually occurred during the 
poll operation before an Exchange have been created and being routed in Camel.
+
+| radius |  | Double | Used by the non-stream geography search to search by 
radius. You need to configure all the following options: longitude latitude 
radius and distanceMetric.
+
+| twitterStream |  | TwitterStream | To use a custom instance of TwitterStream
+ 4+^s| advanced
+| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
+ 4+^s| filter
+| count |  | Integer | Limiting number of results per page.
+
+| filterOld | true | boolean | Filter out old tweets that has previously been 
polled. This state is stored in memory only and based on last tweet id.
+
+| keywords |  | String | Can be used for search and streaming/filter. Multiple 
values can be separated with comma.
+
+| lang |  | String | The lang string ISO_639-1 which will be used for searching
+
+| numberOfPages | 1 | Integer | The number of pages result which you want 
camel-twitter to consume.
+
+| sinceId | 1 | long | The last tweet id which will be used for pulling the 
tweets. It is useful when the camel route is restarted after a long running.
+
+| userIds |  | String | To filter by user ids for streaming/filter. Multiple 
values can be separated by comma.
+ 4+^s| scheduler
+| backoffErrorThreshold |  | int | The number of subsequent error polls 
(failed due some error) that should happen before the backoffMultipler should 
kick-in.
+
+| backoffIdleThreshold |  | int | The number of subsequent idle polls that 
should happen before the backoffMultipler should kick-in.
+
+| backoffMultiplier |  | int | To let the scheduled polling consumer backoff 
if there has been a number of subsequent idles/errors in a row. The multiplier 
is then the number of polls that will be skipped before the next actual attempt 
is happening again. When this option is in use then backoffIdleThreshold and/or 
backoffErrorThreshold must also be configured.
+
+| delay | 60000 | long | Milliseconds before the next poll.
+
+| greedy | false | boolean | If greedy is enabled then the 
ScheduledPollConsumer will run immediately again if the previous run polled 1 
or more messages.
+
+| initialDelay | 1000 | long | Milliseconds before the first poll starts. You 
can also specify time values using units such as 60s (60 seconds) 5m30s (5 
minutes and 30 seconds) and 1h (1 hour).
+
+| runLoggingLevel | TRACE | LoggingLevel | The consumer logs a start/complete 
log line when it polls. This option allows you to configure the logging level 
for that.
+
+| scheduledExecutorService |  | ScheduledExecutorService | Allows for 
configuring a custom/shared thread pool to use for the consumer. By default 
each consumer has its own single threaded thread pool.
+
+| scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler 
from either camel-spring or camel-quartz2 component
+
+| schedulerProperties |  | Map | To configure additional properties when using 
a custom scheduler or any of the Quartz2 Spring based scheduler.
+
+| startScheduler | true | boolean | Whether the scheduler should be auto 
started.
+
+| timeUnit | MILLISECONDS | TimeUnit | Time unit for initialDelay and delay 
options.
+
+| useFixedDelay | true | boolean | Controls if fixed delay or fixed rate is 
used. See ScheduledExecutorService in JDK for details.
+ 4+^s| proxy
+| httpProxyHost |  | String | The http proxy host which can be used for the 
camel-twitter. Can also be configured on the TwitterComponent level instead.
+
+| httpProxyPassword |  | String | The http proxy password which can be used 
for the camel-twitter. Can also be configured on the TwitterComponent level 
instead.
+
+| httpProxyPort |  | Integer | The http proxy port which can be used for the 
camel-twitter. Can also be configured on the TwitterComponent level instead.
+
+| httpProxyUser |  | String | The http proxy user which can be used for the 
camel-twitter. Can also be configured on the TwitterComponent level instead.
+ 4+^s| security
+| accessToken |  | String | The access token. Can also be configured on the 
TwitterComponent level instead.
+
+| accessTokenSecret |  | String | The access secret. Can also be configured on 
the TwitterComponent level instead.
+
+| consumerKey |  | String | The consumer key. Can also be configured on the 
TwitterComponent level instead.
+
+| consumerSecret |  | String | The consumer secret. Can also be configured on 
the TwitterComponent level instead.
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/24d2f4ae/components/camel-undertow/src/main/docs/undertow-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-undertow/src/main/docs/undertow-component.adoc 
b/components/camel-undertow/src/main/docs/undertow-component.adoc
index 6c3ede5..baf7c50 100644
--- a/components/camel-undertow/src/main/docs/undertow-component.adoc
+++ b/components/camel-undertow/src/main/docs/undertow-component.adoc
@@ -42,12 +42,15 @@ The Undertow component supports 3 options which are listed 
below.
 
 
 
-[width="100%",cols="2,1,1m,1m,5",options="header"]
+[width="100%",cols="2,1m,1m,6",options="header"]
 |=======================================================================
-| Name | Group | Default | Java Type | Description
-| undertowHttpBinding | advanced |  | UndertowHttpBinding | To use a custom 
HttpBinding to control the mapping between Camel message and HttpClient.
-| sslContextParameters | security |  | SSLContextParameters | To configure 
security using SSLContextParameters
-| resolvePropertyPlaceholders | advanced | true | boolean | Whether the 
component should resolve property placeholders on itself when starting. Only 
properties which are of String type can use property placeholders.
+| Name | Default | Java Type | Description
+ 4+^s| advanced
+| undertowHttpBinding |  | UndertowHttpBinding | To use a custom HttpBinding 
to control the mapping between Camel message and HttpClient.
+ 4+^s| security
+| sslContextParameters |  | SSLContextParameters | To configure security using 
SSLContextParameters
+ 4+^s| advanced
+| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
 |=======================================================================
 // component options: END
 
@@ -74,26 +77,43 @@ with the following path and query parameters:
 
 #### Query Parameters (17 parameters):
 
-[width="100%",cols="2,1,1m,1m,5",options="header"]
+[width="100%",cols="2,1m,1m,6",options="header"]
 |=======================================================================
-| Name | Group | Default | Java Type | Description
-| bridgeErrorHandler | consumer | false | boolean | Allows for bridging the 
consumer to the Camel routing Error Handler which mean any exceptions occurred 
while the consumer is trying to pickup incoming messages or the likes will now 
be processed as a message and handled by the routing Error Handler. By default 
the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
-| httpMethodRestrict | consumer |  | String | Used to only allow consuming if 
the HttpMethod matches such as GET/POST/PUT etc. Multiple methods can be 
specified separated by comma.
-| matchOnUriPrefix | consumer | true | Boolean | Whether or not the consumer 
should try to find a target consumer by matching the URI prefix if no exact 
match is found.
-| optionsEnabled | consumer | false | boolean | Specifies whether to enable 
HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.
-| exceptionHandler | consumer (advanced) |  | ExceptionHandler | To let the 
consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler 
is enabled then this options is not in use. By default the consumer will deal 
with exceptions that will be logged at WARN or ERROR level and ignored.
-| exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the 
exchange pattern when the consumer creates an exchange.
-| cookieHandler | producer |  | CookieHandler | Configure a cookie handler to 
maintain a HTTP session
-| keepAlive | producer | true | Boolean | Setting to ensure socket is not 
closed due to inactivity
-| options | producer |  | Map | Sets additional channel options. The options 
that can be used are defined in org.xnio.Options. To configure from endpoint 
uri then prefix each option with option. such as 
option.close-abort=true&option.send-buffer=8192
-| reuseAddresses | producer | true | Boolean | Setting to facilitate socket 
multiplexing
-| tcpNoDelay | producer | true | Boolean | Setting to improve TCP protocol 
performance
-| throwExceptionOnFailure | producer | true | Boolean | If the option is true 
HttpProducer will ignore the Exchange.HTTP_URI header and use the endpoint's 
URI for request. You may also set the option throwExceptionOnFailure to be 
false to let the producer send all the fault response back.
-| transferException | producer | false | Boolean | Option to disable throwing 
the HttpOperationFailedException in case of failed responses from the remote 
server. This allows you to get all responses regardless of the HTTP status code.
-| headerFilterStrategy | advanced |  | HeaderFilterStrategy | To use a custom 
HeaderFilterStrategy to filter header to and from Camel message.
-| synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
-| undertowHttpBinding | advanced |  | UndertowHttpBinding | To use a custom 
UndertowHttpBinding to control the mapping between Camel message and undertow.
-| sslContextParameters | security |  | SSLContextParameters | To configure 
security using SSLContextParameters
+| Name | Default | Java Type | Description
+ 4+^s| consumer
+| bridgeErrorHandler | false | boolean | Allows for bridging the consumer to 
the Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
+
+| httpMethodRestrict |  | String | Used to only allow consuming if the 
HttpMethod matches such as GET/POST/PUT etc. Multiple methods can be specified 
separated by comma.
+
+| matchOnUriPrefix | true | Boolean | Whether or not the consumer should try 
to find a target consumer by matching the URI prefix if no exact match is found.
+
+| optionsEnabled | false | boolean | Specifies whether to enable HTTP OPTIONS 
for this Servlet consumer. By default OPTIONS is turned off.
+ 4+^s| consumer (advanced)
+| exceptionHandler |  | ExceptionHandler | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored.
+
+| exchangePattern |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
+ 4+^s| producer
+| cookieHandler |  | CookieHandler | Configure a cookie handler to maintain a 
HTTP session
+
+| keepAlive | true | Boolean | Setting to ensure socket is not closed due to 
inactivity
+
+| options |  | Map | Sets additional channel options. The options that can be 
used are defined in org.xnio.Options. To configure from endpoint uri then 
prefix each option with option. such as 
option.close-abort=true&option.send-buffer=8192
+
+| reuseAddresses | true | Boolean | Setting to facilitate socket multiplexing
+
+| tcpNoDelay | true | Boolean | Setting to improve TCP protocol performance
+
+| throwExceptionOnFailure | true | Boolean | If the option is true 
HttpProducer will ignore the Exchange.HTTP_URI header and use the endpoint's 
URI for request. You may also set the option throwExceptionOnFailure to be 
false to let the producer send all the fault response back.
+
+| transferException | false | Boolean | Option to disable throwing the 
HttpOperationFailedException in case of failed responses from the remote 
server. This allows you to get all responses regardless of the HTTP status code.
+ 4+^s| advanced
+| headerFilterStrategy |  | HeaderFilterStrategy | To use a custom 
HeaderFilterStrategy to filter header to and from Camel message.
+
+| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
+
+| undertowHttpBinding |  | UndertowHttpBinding | To use a custom 
UndertowHttpBinding to control the mapping between Camel message and undertow.
+ 4+^s| security
+| sslContextParameters |  | SSLContextParameters | To configure security using 
SSLContextParameters
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/24d2f4ae/components/camel-velocity/src/main/docs/velocity-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-velocity/src/main/docs/velocity-component.adoc 
b/components/camel-velocity/src/main/docs/velocity-component.adoc
index d4fb768..6107b7d 100644
--- a/components/camel-velocity/src/main/docs/velocity-component.adoc
+++ b/components/camel-velocity/src/main/docs/velocity-component.adoc
@@ -43,11 +43,13 @@ The Velocity component supports 2 options which are listed 
below.
 
 
 
-[width="100%",cols="2,1,1m,1m,5",options="header"]
+[width="100%",cols="2,1m,1m,6",options="header"]
 |=======================================================================
-| Name | Group | Default | Java Type | Description
-| velocityEngine | advanced |  | VelocityEngine | To use the VelocityEngine 
otherwise a new engine is created
-| resolvePropertyPlaceholders | advanced | true | boolean | Whether the 
component should resolve property placeholders on itself when starting. Only 
properties which are of String type can use property placeholders.
+| Name | Default | Java Type | Description
+ 4+^s| advanced
+| velocityEngine |  | VelocityEngine | To use the VelocityEngine otherwise a 
new engine is created
+
+| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
 |=======================================================================
 // component options: END
 
@@ -71,14 +73,19 @@ with the following path and query parameters:
 
 #### Query Parameters (5 parameters):
 
-[width="100%",cols="2,1,1m,1m,5",options="header"]
+[width="100%",cols="2,1m,1m,6",options="header"]
 |=======================================================================
-| Name | Group | Default | Java Type | Description
-| contentCache | producer | false | boolean | Sets whether to use resource 
content cache or not
-| encoding | producer |  | String | Character encoding of the resource content.
-| loaderCache | producer | true | boolean | Enables / disables the velocity 
resource loader cache which is enabled by default
-| propertiesFile | producer |  | String | The URI of the properties file which 
is used for VelocityEngine initialization.
-| synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
+| Name | Default | Java Type | Description
+
+| contentCache | false | boolean | Sets whether to use resource content cache 
or not
+
+| encoding |  | String | Character encoding of the resource content.
+
+| loaderCache | true | boolean | Enables / disables the velocity resource 
loader cache which is enabled by default
+
+| propertiesFile |  | String | The URI of the properties file which is used 
for VelocityEngine initialization.
+ 4+^s| advanced
+| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/24d2f4ae/components/camel-vertx/src/main/docs/vertx-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-vertx/src/main/docs/vertx-component.adoc 
b/components/camel-vertx/src/main/docs/vertx-component.adoc
index 3dae966..04122df 100644
--- a/components/camel-vertx/src/main/docs/vertx-component.adoc
+++ b/components/camel-vertx/src/main/docs/vertx-component.adoc
@@ -40,16 +40,23 @@ The Vert.x component supports 7 options which are listed 
below.
 
 
 
-[width="100%",cols="2,1,1m,1m,5",options="header"]
+[width="100%",cols="2,1m,1m,6",options="header"]
 |=======================================================================
-| Name | Group | Default | Java Type | Description
-| vertxFactory | advanced |  | VertxFactory | To use a custom VertxFactory 
implementation
-| host | common |  | String | Hostname for creating an embedded clustered 
EventBus
-| port | common |  | int | Port for creating an embedded clustered EventBus
-| vertxOptions | common |  | VertxOptions | Options to use for creating vertx
-| vertx | common |  | Vertx | To use the given vertx EventBus instead of 
creating a new embedded EventBus
-| timeout | common | 60 | int | Timeout in seconds to wait for clustered Vertx 
EventBus to be ready. The default value is 60.
-| resolvePropertyPlaceholders | advanced | true | boolean | Whether the 
component should resolve property placeholders on itself when starting. Only 
properties which are of String type can use property placeholders.
+| Name | Default | Java Type | Description
+ 4+^s| advanced
+| vertxFactory |  | VertxFactory | To use a custom VertxFactory implementation
+ 4+^s| common
+| host |  | String | Hostname for creating an embedded clustered EventBus
+
+| port |  | int | Port for creating an embedded clustered EventBus
+
+| vertxOptions |  | VertxOptions | Options to use for creating vertx
+
+| vertx |  | Vertx | To use the given vertx EventBus instead of creating a new 
embedded EventBus
+
+| timeout | 60 | int | Timeout in seconds to wait for clustered Vertx EventBus 
to be ready. The default value is 60.
+ 4+^s| advanced
+| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
 |=======================================================================
 // component options: END
 
@@ -73,14 +80,19 @@ with the following path and query parameters:
 
 #### Query Parameters (5 parameters):
 
-[width="100%",cols="2,1,1m,1m,5",options="header"]
+[width="100%",cols="2,1m,1m,6",options="header"]
 |=======================================================================
-| Name | Group | Default | Java Type | Description
-| pubSub | common |  | Boolean | Whether to use publish/subscribe instead of 
point to point when sending to a vertx endpoint.
-| bridgeErrorHandler | consumer | false | boolean | Allows for bridging the 
consumer to the Camel routing Error Handler which mean any exceptions occurred 
while the consumer is trying to pickup incoming messages or the likes will now 
be processed as a message and handled by the routing Error Handler. By default 
the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
-| exceptionHandler | consumer (advanced) |  | ExceptionHandler | To let the 
consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler 
is enabled then this options is not in use. By default the consumer will deal 
with exceptions that will be logged at WARN or ERROR level and ignored.
-| exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the 
exchange pattern when the consumer creates an exchange.
-| synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
+| Name | Default | Java Type | Description
+
+| pubSub |  | Boolean | Whether to use publish/subscribe instead of point to 
point when sending to a vertx endpoint.
+ 4+^s| consumer
+| bridgeErrorHandler | false | boolean | Allows for bridging the consumer to 
the Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
+ 4+^s| consumer (advanced)
+| exceptionHandler |  | ExceptionHandler | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored.
+
+| exchangePattern |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
+ 4+^s| advanced
+| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/24d2f4ae/components/camel-weather/src/main/docs/weather-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-weather/src/main/docs/weather-component.adoc 
b/components/camel-weather/src/main/docs/weather-component.adoc
index d85483d..157376c 100644
--- a/components/camel-weather/src/main/docs/weather-component.adoc
+++ b/components/camel-weather/src/main/docs/weather-component.adoc
@@ -63,52 +63,95 @@ with the following path and query parameters:
 
 #### Query Parameters (43 parameters):
 
-[width="100%",cols="2,1,1m,1m,5",options="header"]
+[width="100%",cols="2,1m,1m,6",options="header"]
 |=======================================================================
-| Name | Group | Default | Java Type | Description
-| appid | common |  | String | *Required* APPID ID used to authenticate the 
user connected to the API Server
-| headerName | common |  | String | To store the weather result in this header 
instead of the message body. This is useable if you want to keep current 
message body as-is.
-| language | common | en | WeatherLanguage | Language of the response.
-| mode | common | JSON | WeatherMode | The output format of the weather data.
-| period | common |  | String | If null the current weather will be returned 
else use values of 5 7 14 days. Only the numeric value for the forecast period 
is actually parsed so spelling capitalisation of the time period is up to you 
(its ignored)
-| units | common |  | WeatherUnits | The units for temperature measurement.
-| weatherApi | common |  | WeatherApi | The API to be use (current forecast/3 
hour forecast daily station)
-| bridgeErrorHandler | consumer | false | boolean | Allows for bridging the 
consumer to the Camel routing Error Handler which mean any exceptions occurred 
while the consumer is trying to pickup incoming messages or the likes will now 
be processed as a message and handled by the routing Error Handler. By default 
the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
-| sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling 
consumer did not poll any files you can enable this option to send an empty 
message (no body) instead.
-| exceptionHandler | consumer (advanced) |  | ExceptionHandler | To let the 
consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler 
is enabled then this options is not in use. By default the consumer will deal 
with exceptions that will be logged at WARN or ERROR level and ignored.
-| exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the 
exchange pattern when the consumer creates an exchange.
-| pollStrategy | consumer (advanced) |  | PollingConsumerPollStrategy | A 
pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to 
provide your custom implementation to control error handling usually occurred 
during the poll operation before an Exchange have been created and being routed 
in Camel.
-| httpConnectionManager | advanced |  | HttpConnectionManager | To use a 
custom HttpConnectionManager to manage connections
-| synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
-| backoffErrorThreshold | scheduler |  | int | The number of subsequent error 
polls (failed due some error) that should happen before the backoffMultipler 
should kick-in.
-| backoffIdleThreshold | scheduler |  | int | The number of subsequent idle 
polls that should happen before the backoffMultipler should kick-in.
-| backoffMultiplier | scheduler |  | int | To let the scheduled polling 
consumer backoff if there has been a number of subsequent idles/errors in a 
row. The multiplier is then the number of polls that will be skipped before the 
next actual attempt is happening again. When this option is in use then 
backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
-| delay | scheduler | 500 | long | Milliseconds before the next poll. You can 
also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes 
and 30 seconds) and 1h (1 hour).
-| greedy | scheduler | false | boolean | If greedy is enabled then the 
ScheduledPollConsumer will run immediately again if the previous run polled 1 
or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll 
starts. You can also specify time values using units such as 60s (60 seconds) 
5m30s (5 minutes and 30 seconds) and 1h (1 hour).
-| runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a 
start/complete log line when it polls. This option allows you to configure the 
logging level for that.
-| scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows 
for configuring a custom/shared thread pool to use for the consumer. By default 
each consumer has its own single threaded thread pool.
-| scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a 
cron scheduler from either camel-spring or camel-quartz2 component
-| schedulerProperties | scheduler |  | Map | To configure additional 
properties when using a custom scheduler or any of the Quartz2 Spring based 
scheduler.
-| startScheduler | scheduler | true | boolean | Whether the scheduler should 
be auto started.
-| timeUnit | scheduler | MILLISECONDS | TimeUnit | Time unit for initialDelay 
and delay options.
-| useFixedDelay | scheduler | true | boolean | Controls if fixed delay or 
fixed rate is used. See ScheduledExecutorService in JDK for details.
-| cnt | filter |  | Integer | Number of results to be found
-| ids | filter |  | String | List of id's of city/stations. You can separate 
multiple ids by comma.
-| lat | filter |  | String | Latitude of location. You can use lat and lon 
options instead of location. For boxed queries this is the bottom latitude.
-| location | filter |  | String | If null Camel will try and determine your 
current location using the geolocation of your ip address else specify the 
citycountry. For well known city names Open Weather Map will determine the best 
fit but multiple results may be returned. Hence specifying and country as well 
will return more accurate data. If you specify current as the location then the 
component will try to get the current latitude and longitude and use that to 
get the weather details. You can use lat and lon options instead of location.
-| lon | filter |  | String | Longitude of location. You can use lat and lon 
options instead of location. For boxed queries this is the left longtitude.
-| rightLon | filter |  | String | For boxed queries this is the right 
longtitude. Needs to be used in combination with topLat and zoom.
-| topLat | filter |  | String | For boxed queries this is the top latitude. 
Needs to be used in combination with rightLon and zoom.
-| zip | filter |  | String | Zip-code e.g. 94040us
-| zoom | filter |  | Integer | For boxed queries this is the zoom. Needs to be 
used in combination with rightLon and topLat.
-| proxyAuthDomain | proxy |  | String | Domain for proxy NTLM authentication
-| proxyAuthHost | proxy |  | String | Optional host for proxy NTLM 
authentication
-| proxyAuthMethod | proxy |  | String | Authentication method for proxy either 
as Basic Digest or NTLM.
-| proxyAuthPassword | proxy |  | String | Password for proxy authentication
-| proxyAuthUsername | proxy |  | String | Username for proxy authentication
-| proxyHost | proxy |  | String | The proxy host name
-| proxyPort | proxy |  | Integer | The proxy port number
+| Name | Default | Java Type | Description
+
+| appid |  | String | *Required* APPID ID used to authenticate the user 
connected to the API Server
+
+| headerName |  | String | To store the weather result in this header instead 
of the message body. This is useable if you want to keep current message body 
as-is.
+
+| language | en | WeatherLanguage | Language of the response.
+
+| mode | JSON | WeatherMode | The output format of the weather data.
+
+| period |  | String | If null the current weather will be returned else use 
values of 5 7 14 days. Only the numeric value for the forecast period is 
actually parsed so spelling capitalisation of the time period is up to you (its 
ignored)
+
+| units |  | WeatherUnits | The units for temperature measurement.
+
+| weatherApi |  | WeatherApi | The API to be use (current forecast/3 hour 
forecast daily station)
+ 4+^s| consumer
+| bridgeErrorHandler | false | boolean | Allows for bridging the consumer to 
the Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
+
+| sendEmptyMessageWhenIdle | false | boolean | If the polling consumer did not 
poll any files you can enable this option to send an empty message (no body) 
instead.
+ 4+^s| consumer (advanced)
+| exceptionHandler |  | ExceptionHandler | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored.
+
+| exchangePattern |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
+
+| pollStrategy |  | PollingConsumerPollStrategy | A pluggable 
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your 
custom implementation to control error handling usually occurred during the 
poll operation before an Exchange have been created and being routed in Camel.
+ 4+^s| advanced
+| httpConnectionManager |  | HttpConnectionManager | To use a custom 
HttpConnectionManager to manage connections
+
+| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
+ 4+^s| scheduler
+| backoffErrorThreshold |  | int | The number of subsequent error polls 
(failed due some error) that should happen before the backoffMultipler should 
kick-in.
+
+| backoffIdleThreshold |  | int | The number of subsequent idle polls that 
should happen before the backoffMultipler should kick-in.
+
+| backoffMultiplier |  | int | To let the scheduled polling consumer backoff 
if there has been a number of subsequent idles/errors in a row. The multiplier 
is then the number of polls that will be skipped before the next actual attempt 
is happening again. When this option is in use then backoffIdleThreshold and/or 
backoffErrorThreshold must also be configured.
+
+| delay | 500 | long | Milliseconds before the next poll. You can also specify 
time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 
seconds) and 1h (1 hour).
+
+| greedy | false | boolean | If greedy is enabled then the 
ScheduledPollConsumer will run immediately again if the previous run polled 1 
or more messages.
+
+| initialDelay | 1000 | long | Milliseconds before the first poll starts. You 
can also specify time values using units such as 60s (60 seconds) 5m30s (5 
minutes and 30 seconds) and 1h (1 hour).
+
+| runLoggingLevel | TRACE | LoggingLevel | The consumer logs a start/complete 
log line when it polls. This option allows you to configure the logging level 
for that.
+
+| scheduledExecutorService |  | ScheduledExecutorService | Allows for 
configuring a custom/shared thread pool to use for the consumer. By default 
each consumer has its own single threaded thread pool.
+
+| scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler 
from either camel-spring or camel-quartz2 component
+
+| schedulerProperties |  | Map | To configure additional properties when using 
a custom scheduler or any of the Quartz2 Spring based scheduler.
+
+| startScheduler | true | boolean | Whether the scheduler should be auto 
started.
+
+| timeUnit | MILLISECONDS | TimeUnit | Time unit for initialDelay and delay 
options.
+
+| useFixedDelay | true | boolean | Controls if fixed delay or fixed rate is 
used. See ScheduledExecutorService in JDK for details.
+ 4+^s| filter
+| cnt |  | Integer | Number of results to be found
+
+| ids |  | String | List of id's of city/stations. You can separate multiple 
ids by comma.
+
+| lat |  | String | Latitude of location. You can use lat and lon options 
instead of location. For boxed queries this is the bottom latitude.
+
+| location |  | String | If null Camel will try and determine your current 
location using the geolocation of your ip address else specify the citycountry. 
For well known city names Open Weather Map will determine the best fit but 
multiple results may be returned. Hence specifying and country as well will 
return more accurate data. If you specify current as the location then the 
component will try to get the current latitude and longitude and use that to 
get the weather details. You can use lat and lon options instead of location.
+
+| lon |  | String | Longitude of location. You can use lat and lon options 
instead of location. For boxed queries this is the left longtitude.
+
+| rightLon |  | String | For boxed queries this is the right longtitude. Needs 
to be used in combination with topLat and zoom.
+
+| topLat |  | String | For boxed queries this is the top latitude. Needs to be 
used in combination with rightLon and zoom.
+
+| zip |  | String | Zip-code e.g. 94040us
+
+| zoom |  | Integer | For boxed queries this is the zoom. Needs to be used in 
combination with rightLon and topLat.
+ 4+^s| proxy
+| proxyAuthDomain |  | String | Domain for proxy NTLM authentication
+
+| proxyAuthHost |  | String | Optional host for proxy NTLM authentication
+
+| proxyAuthMethod |  | String | Authentication method for proxy either as 
Basic Digest or NTLM.
+
+| proxyAuthPassword |  | String | Password for proxy authentication
+
+| proxyAuthUsername |  | String | Username for proxy authentication
+
+| proxyHost |  | String | The proxy host name
+
+| proxyPort |  | Integer | The proxy port number
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/24d2f4ae/components/camel-websocket/src/main/docs/websocket-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/docs/websocket-component.adoc 
b/components/camel-websocket/src/main/docs/websocket-component.adoc
index f01cf37..53e84ba 100644
--- a/components/camel-websocket/src/main/docs/websocket-component.adoc
+++ b/components/camel-websocket/src/main/docs/websocket-component.adoc
@@ -36,22 +36,35 @@ The Jetty Websocket component supports 13 options which are 
listed below.
 
 
 
-[width="100%",cols="2,1,1m,1m,5",options="header"]
+[width="100%",cols="2,1m,1m,6",options="header"]
 |=======================================================================
-| Name | Group | Default | Java Type | Description
-| staticResources | consumer |  | String | Set a resource path for static 
resources (such as .html files etc). The resources can be loaded from classpath 
if you prefix with classpath: otherwise the resources is loaded from file 
system or from JAR files. For example to load from root classpath use 
classpath:. or classpath:WEB-INF/static If not configured (eg null) then no 
static resource is in use.
-| host | common | 0.0.0.0 | String | The hostname. The default value is 0.0.0.0
-| port | common | 9292 | Integer | The port number. The default value is 9292
-| sslKeyPassword | security |  | String | The password for the keystore when 
using SSL.
-| sslPassword | security |  | String | The password when using SSL.
-| sslKeystore | security |  | String | The path to the keystore.
-| enableJmx | advanced | false | boolean | If this option is true Jetty JMX 
support will be enabled for this endpoint. See Jetty JMX support for more 
details.
-| minThreads | advanced |  | Integer | To set a value for minimum number of 
threads in server thread pool. MaxThreads/minThreads or threadPool fields are 
required due to switch to Jetty9. The default values for minThreads is 1.
-| maxThreads | advanced |  | Integer | To set a value for maximum number of 
threads in server thread pool. MaxThreads/minThreads or threadPool fields are 
required due to switch to Jetty9. The default values for maxThreads is 1 2 
noCores.
-| threadPool | advanced |  | ThreadPool | To use a custom thread pool for the 
server. MaxThreads/minThreads or threadPool fields are required due to switch 
to Jetty9.
-| sslContextParameters | security |  | SSLContextParameters | To configure 
security using SSLContextParameters
-| socketFactory | common |  | Map | To configure a map which contains custom 
WebSocketFactory for sub protocols. The key in the map is the sub protocol. The 
default key is reserved for the default implementation.
-| resolvePropertyPlaceholders | advanced | true | boolean | Whether the 
component should resolve property placeholders on itself when starting. Only 
properties which are of String type can use property placeholders.
+| Name | Default | Java Type | Description
+ 4+^s| consumer
+| staticResources |  | String | Set a resource path for static resources (such 
as .html files etc). The resources can be loaded from classpath if you prefix 
with classpath: otherwise the resources is loaded from file system or from JAR 
files. For example to load from root classpath use classpath:. or 
classpath:WEB-INF/static If not configured (eg null) then no static resource is 
in use.
+ 4+^s| common
+| host | 0.0.0.0 | String | The hostname. The default value is 0.0.0.0
+
+| port | 9292 | Integer | The port number. The default value is 9292
+ 4+^s| security
+| sslKeyPassword |  | String | The password for the keystore when using SSL.
+
+| sslPassword |  | String | The password when using SSL.
+
+| sslKeystore |  | String | The path to the keystore.
+ 4+^s| advanced
+| enableJmx | false | boolean | If this option is true Jetty JMX support will 
be enabled for this endpoint. See Jetty JMX support for more details.
+
+| minThreads |  | Integer | To set a value for minimum number of threads in 
server thread pool. MaxThreads/minThreads or threadPool fields are required due 
to switch to Jetty9. The default values for minThreads is 1.
+
+| maxThreads |  | Integer | To set a value for maximum number of threads in 
server thread pool. MaxThreads/minThreads or threadPool fields are required due 
to switch to Jetty9. The default values for maxThreads is 1 2 noCores.
+
+| threadPool |  | ThreadPool | To use a custom thread pool for the server. 
MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9.
+ 4+^s| security
+| sslContextParameters |  | SSLContextParameters | To configure security using 
SSLContextParameters
+ 4+^s| common
+| socketFactory |  | Map | To configure a map which contains custom 
WebSocketFactory for sub protocols. The key in the map is the sub protocol. The 
default key is reserved for the default implementation.
+ 4+^s| advanced
+| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
 |=======================================================================
 // component options: END
 
@@ -83,27 +96,45 @@ with the following path and query parameters:
 
 #### Query Parameters (18 parameters):
 
-[width="100%",cols="2,1,1m,1m,5",options="header"]
+[width="100%",cols="2,1m,1m,6",options="header"]
 |=======================================================================
-| Name | Group | Default | Java Type | Description
-| maxBinaryMessageSize | common | -1 | Integer | Can be used to set the size 
in bytes that the websocket created by the websocketServlet may be accept 
before closing. (Default is -1 - or unlimited)
-| bridgeErrorHandler | consumer | false | boolean | Allows for bridging the 
consumer to the Camel routing Error Handler which mean any exceptions occurred 
while the consumer is trying to pickup incoming messages or the likes will now 
be processed as a message and handled by the routing Error Handler. By default 
the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
-| sessionSupport | consumer | false | boolean | Whether to enable session 
support which enables HttpSession for each http request.
-| staticResources | consumer |  | String | Set a resource path for static 
resources (such as .html files etc). The resources can be loaded from classpath 
if you prefix with classpath: otherwise the resources is loaded from file 
system or from JAR files. For example to load from root classpath use 
classpath:. or classpath:WEB-INF/static If not configured (eg null) then no 
static resource is in use.
-| exceptionHandler | consumer (advanced) |  | ExceptionHandler | To let the 
consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler 
is enabled then this options is not in use. By default the consumer will deal 
with exceptions that will be logged at WARN or ERROR level and ignored.
-| exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the 
exchange pattern when the consumer creates an exchange.
-| sendTimeout | producer | 30000 | Integer | Timeout in millis when sending to 
a websocket channel. The default timeout is 30000 (30 seconds).
-| sendToAll | producer |  | Boolean | To send to all websocket subscribers. 
Can be used to configure on endpoint level instead of having to use the 
WebsocketConstants.SEND_TO_ALL header on the message.
-| bufferSize | advanced | 8192 | Integer | Set the buffer size of the 
websocketServlet which is also the max frame byte size (default 8192)
-| maxIdleTime | advanced | 300000 | Integer | Set the time in ms that the 
websocket created by the websocketServlet may be idle before closing. (default 
is 300000)
-| maxTextMessageSize | advanced |  | Integer | Can be used to set the size in 
characters that the websocket created by the websocketServlet may be accept 
before closing.
-| minVersion | advanced | 13 | Integer | Can be used to set the minimum 
protocol version accepted for the websocketServlet. (Default 13 - the RFC6455 
version)
-| synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
-| allowedOrigins | cors |  | String | The CORS allowed origins. Use to allow 
all.
-| crossOriginFilterOn | cors | false | boolean | Whether to enable CORS
-| filterPath | cors |  | String | Context path for filtering CORS
-| enableJmx | monitoring | false | boolean | If this option is true Jetty JMX 
support will be enabled for this endpoint. See Jetty JMX support for more 
details.
-| sslContextParameters | security |  | SSLContextParameters | To configure 
security using SSLContextParameters
+| Name | Default | Java Type | Description
+
+| maxBinaryMessageSize | -1 | Integer | Can be used to set the size in bytes 
that the websocket created by the websocketServlet may be accept before 
closing. (Default is -1 - or unlimited)
+ 4+^s| consumer
+| bridgeErrorHandler | false | boolean | Allows for bridging the consumer to 
the Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
+
+| sessionSupport | false | boolean | Whether to enable session support which 
enables HttpSession for each http request.
+
+| staticResources |  | String | Set a resource path for static resources (such 
as .html files etc). The resources can be loaded from classpath if you prefix 
with classpath: otherwise the resources is loaded from file system or from JAR 
files. For example to load from root classpath use classpath:. or 
classpath:WEB-INF/static If not configured (eg null) then no static resource is 
in use.
+ 4+^s| consumer (advanced)
+| exceptionHandler |  | ExceptionHandler | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored.
+
+| exchangePattern |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
+ 4+^s| producer
+| sendTimeout | 30000 | Integer | Timeout in millis when sending to a 
websocket channel. The default timeout is 30000 (30 seconds).
+
+| sendToAll |  | Boolean | To send to all websocket subscribers. Can be used 
to configure on endpoint level instead of having to use the 
WebsocketConstants.SEND_TO_ALL header on the message.
+ 4+^s| advanced
+| bufferSize | 8192 | Integer | Set the buffer size of the websocketServlet 
which is also the max frame byte size (default 8192)
+
+| maxIdleTime | 300000 | Integer | Set the time in ms that the websocket 
created by the websocketServlet may be idle before closing. (default is 300000)
+
+| maxTextMessageSize |  | Integer | Can be used to set the size in characters 
that the websocket created by the websocketServlet may be accept before closing.
+
+| minVersion | 13 | Integer | Can be used to set the minimum protocol version 
accepted for the websocketServlet. (Default 13 - the RFC6455 version)
+
+| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
+ 4+^s| cors
+| allowedOrigins |  | String | The CORS allowed origins. Use to allow all.
+
+| crossOriginFilterOn | false | boolean | Whether to enable CORS
+
+| filterPath |  | String | Context path for filtering CORS
+ 4+^s| monitoring
+| enableJmx | false | boolean | If this option is true Jetty JMX support will 
be enabled for this endpoint. See Jetty JMX support for more details.
+ 4+^s| security
+| sslContextParameters |  | SSLContextParameters | To configure security using 
SSLContextParameters
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/24d2f4ae/components/camel-xmlrpc/src/main/docs/xmlrpc-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-xmlrpc/src/main/docs/xmlrpc-component.adoc 
b/components/camel-xmlrpc/src/main/docs/xmlrpc-component.adoc
index 538ebed..30bf428 100644
--- a/components/camel-xmlrpc/src/main/docs/xmlrpc-component.adoc
+++ b/components/camel-xmlrpc/src/main/docs/xmlrpc-component.adoc
@@ -117,27 +117,45 @@ with the following path and query parameters:
 
 #### Query Parameters (18 parameters):
 
-[width="100%",cols="2,1,1m,1m,5",options="header"]
+[width="100%",cols="2,1m,1m,6",options="header"]
 |=======================================================================
-| Name | Group | Default | Java Type | Description
-| basicEncoding | producer |  | String | Sets the encoding for basic 
authentication null means UTF-8 is chosen.
-| connectionTimeout | producer |  | int | Set the connection timeout in 
milliseconds 0 is to disable it
-| contentLengthOptional | producer | false | boolean | Whether a 
Content-Length header may be omitted. The XML-RPC specification demands that 
such a header be present.
-| defaultMethodName | producer |  | String | The method name which would be 
used for the xmlrpc requests by default if the Message header 
CamelXmlRpcMethodName is not set.
-| enabledForExceptions | producer | false | boolean | Whether the response 
should contain a faultCause element in case of errors. The faultCause is an 
exception which the server has trapped and written into a byte stream as a 
serializable object.
-| enabledForExtensions | producer | false | boolean | Whether extensions are 
enabled. By default the client or server is strictly compliant to the XML-RPC 
specification and extensions are disabled.
-| encoding | producer |  | String | Sets the requests encoding null means 
UTF-8 is chosen.
-| gzipCompressing | producer | false | boolean | Whether gzip compression is 
being used for transmitting the request.
-| gzipRequesting | producer | false | boolean | Whether gzip compression is 
being used for transmitting the request.
-| replyTimeout | producer |  | int | Set the reply timeout in milliseconds 0 
is to disable it.
-| clientConfig | advanced |  | XmlRpcClientConfigImpl | To use the given 
XmlRpcClientConfigImpl as configuration for the client.
-| clientConfigurer | advanced |  | XmlRpcClientConfigurer | To use a custom 
XmlRpcClientConfigurer to configure the client
-| synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
-| timeZone | advanced |  | TimeZone | The timezone which is used to interpret 
date/time. Defaults to link TimeZonegetDefault().
-| userAgent | advanced |  | String | The http user agent header to set when 
doing xmlrpc requests
-| xmlRpcServer | advanced |  | XmlRpcRequestProcessor | To use a custom 
XmlRpcRequestProcessor as server.
-| basicPassword | security |  | String | The password for basic authentication.
-| basicUserName | security |  | String | The user name for basic 
authentication.
+| Name | Default | Java Type | Description
+
+| basicEncoding |  | String | Sets the encoding for basic authentication null 
means UTF-8 is chosen.
+
+| connectionTimeout |  | int | Set the connection timeout in milliseconds 0 is 
to disable it
+
+| contentLengthOptional | false | boolean | Whether a Content-Length header 
may be omitted. The XML-RPC specification demands that such a header be present.
+
+| defaultMethodName |  | String | The method name which would be used for the 
xmlrpc requests by default if the Message header CamelXmlRpcMethodName is not 
set.
+
+| enabledForExceptions | false | boolean | Whether the response should contain 
a faultCause element in case of errors. The faultCause is an exception which 
the server has trapped and written into a byte stream as a serializable object.
+
+| enabledForExtensions | false | boolean | Whether extensions are enabled. By 
default the client or server is strictly compliant to the XML-RPC specification 
and extensions are disabled.
+
+| encoding |  | String | Sets the requests encoding null means UTF-8 is chosen.
+
+| gzipCompressing | false | boolean | Whether gzip compression is being used 
for transmitting the request.
+
+| gzipRequesting | false | boolean | Whether gzip compression is being used 
for transmitting the request.
+
+| replyTimeout |  | int | Set the reply timeout in milliseconds 0 is to 
disable it.
+ 4+^s| advanced
+| clientConfig |  | XmlRpcClientConfigImpl | To use the given 
XmlRpcClientConfigImpl as configuration for the client.
+
+| clientConfigurer |  | XmlRpcClientConfigurer | To use a custom 
XmlRpcClientConfigurer to configure the client
+
+| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
+
+| timeZone |  | TimeZone | The timezone which is used to interpret date/time. 
Defaults to link TimeZonegetDefault().
+
+| userAgent |  | String | The http user agent header to set when doing xmlrpc 
requests
+
+| xmlRpcServer |  | XmlRpcRequestProcessor | To use a custom 
XmlRpcRequestProcessor as server.
+ 4+^s| security
+| basicPassword |  | String | The password for basic authentication.
+
+| basicUserName |  | String | The user name for basic authentication.
 |=======================================================================
 // endpoint options: END
 

Reply via email to